diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java
index 16355085175..fa40789c15e 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,13 +26,19 @@ import org.springframework.mock.web.test.MockAsyncContext;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-import static org.mockito.BDDMockito.*;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.mock;
+import static org.mockito.BDDMockito.verify;
 
 /**
  * A test fixture with a {@link StandardServletAsyncWebRequest}.
- *
  * @author Rossen Stoyanchev
  */
 public class StandardServletAsyncWebRequestTests {
@@ -43,6 +49,7 @@ public class StandardServletAsyncWebRequestTests {
 
 	private MockHttpServletResponse response;
 
+
 	@Before
 	public void setup() {
 		this.request = new MockHttpServletRequest();
@@ -52,10 +59,10 @@ public class StandardServletAsyncWebRequestTests {
 		this.asyncRequest.setTimeout(44*1000L);
 	}
 
+
 	@Test
 	public void isAsyncStarted() throws Exception {
 		assertFalse(this.asyncRequest.isAsyncStarted());
-
 		this.asyncRequest.startAsync();
 		assertTrue(this.asyncRequest.isAsyncStarted());
 	}
@@ -64,12 +71,11 @@ public class StandardServletAsyncWebRequestTests {
 	public void startAsync() throws Exception {
 		this.asyncRequest.startAsync();
 
-		MockAsyncContext asyncContext = (MockAsyncContext) this.request.getAsyncContext();
-
-		assertNotNull(asyncContext);
-		assertEquals("Timeout value not set", 44 * 1000, asyncContext.getTimeout());
-		assertEquals(1, asyncContext.getListeners().size());
-		assertSame(this.asyncRequest, asyncContext.getListeners().get(0));
+		MockAsyncContext context = (MockAsyncContext) this.request.getAsyncContext();
+		assertNotNull(context);
+		assertEquals("Timeout value not set", 44 * 1000, context.getTimeout());
+		assertEquals(1, context.getListeners().size());
+		assertSame(this.asyncRequest, context.getListeners().get(0));
 	}
 
 	@Test
@@ -79,10 +85,9 @@ public class StandardServletAsyncWebRequestTests {
 		this.asyncRequest.startAsync();
 		this.asyncRequest.startAsync();	// idempotent
 
-		MockAsyncContext asyncContext = (MockAsyncContext) this.request.getAsyncContext();
-
-		assertNotNull(asyncContext);
-		assertEquals(1, asyncContext.getListeners().size());
+		MockAsyncContext context = (MockAsyncContext) this.request.getAsyncContext();
+		assertNotNull(context);
+		assertEquals(1, context.getListeners().size());
 	}
 
 	@Test
@@ -118,10 +123,8 @@ public class StandardServletAsyncWebRequestTests {
 	@Test
 	public void onTimeoutTimeoutHandler() throws Exception {
 		Runnable timeoutHandler = mock(Runnable.class);
-
 		this.asyncRequest.addTimeoutHandler(timeoutHandler);
 		this.asyncRequest.onTimeout(new AsyncEvent(null));
-
 		verify(timeoutHandler).run();
 	}