diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
index c67dc79eb6..9506223a72 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
@@ -370,13 +370,11 @@ class StubWebApplicationContext implements WebApplicationContext {
 		}
 
 		@Override
-		@SuppressWarnings("rawtypes")
 		public Object createBean(Class<?> beanClass, int autowireMode, boolean dependencyCheck) {
 			return BeanUtils.instantiate(beanClass);
 		}
 
 		@Override
-		@SuppressWarnings("rawtypes")
 		public Object autowire(Class<?> beanClass, int autowireMode, boolean dependencyCheck) {
 			return BeanUtils.instantiate(beanClass);
 		}
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
index 094c1799b9..04f8be9f1e 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
@@ -83,7 +83,6 @@ public class FileUploadControllerTests {
 	}
 
 
-	@SuppressWarnings("unused")
 	@Controller
 	private static class MultipartController {
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
index 1021641249..41595c3785 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
@@ -23,8 +23,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.ser.impl.UnknownSerializer;
 import org.junit.Test;
 
 import org.springframework.http.converter.json.SpringHandlerInstantiator;
@@ -38,6 +36,9 @@ import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ser.impl.UnknownSerializer;
+
 import static org.junit.Assert.*;
 
 /**
@@ -100,6 +101,7 @@ public class StandaloneMockMvcBuilderTests {
 	}
 
 	@Test  // SPR-13375
+	@SuppressWarnings("rawtypes")
 	public void springHandlerInstantiator() {
 		TestStandaloneMockMvcBuilder builder = new TestStandaloneMockMvcBuilder(new PersonController());
 		builder.build();