diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
index e6f859e810..360bf33c25 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
@@ -173,8 +173,8 @@ public final class MockMvc {
 			}
 
 			@Override
-			public ResultActions andDo(ResultHandler printer) throws Exception {
-				printer.handle(mvcResult);
+			public ResultActions andDo(ResultHandler handler) throws Exception {
+				handler.handle(mvcResult);
 				return this;
 			}
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
index 221f33b4de..70e49dc333 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
@@ -119,7 +119,6 @@ public class JavaConfigTests {
 		assertNotNull(parent);
 		assertTrue(parent instanceof WebApplicationContext);
 		WebApplicationContext root = (WebApplicationContext) parent;
-		assertFalse(root.getBeansOfType(String.class).containsKey("bar"));
 
 		ServletContext childServletContext = wac.getServletContext();
 		assertNotNull(childServletContext);