````
diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java
index 21c382c..035f36c 100644
--- a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java
+++ b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java
@@ -31,11 +31,15 @@ import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
+
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageHeaders;
 import org.springframework.integration.core.PollableChannel;
@@ -59,7 +63,7 @@ import org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter;
 @RunWith(SpringJUnit4ClassRunner.class)
 public class HttpProxyScenarioTests {
 
-	private HandlerAdapter handlerAdapter = new HttpRequestHandlerAdapter();
+	private final HandlerAdapter handlerAdapter = new HttpRequestHandlerAdapter();
 
 	@Autowired
 	private HandlerMapping handlerMapping;
@@ -71,7 +75,6 @@ public class HttpProxyScenarioTests {
 	@Autowired
 	private PollableChannel checkHeadersChannel;
 
-	@SuppressWarnings("unchecked")
 	@Test
 	public void testHttpProxyScenario() throws Exception {
 		DateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
@@ -99,16 +102,16 @@ public class HttpProxyScenarioTests {
 
 		RestTemplate template = Mockito.spy(new RestTemplate());
 
-		Mockito.doAnswer(new Answer<ResponseEntity>() {
+		Mockito.doAnswer(new Answer<ResponseEntity<?>>() {
 			@Override
-			public ResponseEntity answer(InvocationOnMock invocation) throws Throwable {
+			public ResponseEntity<?> answer(InvocationOnMock invocation) throws Throwable {
 				URI uri = (URI) invocation.getArguments()[0];
 				assertEquals(new URI("http://testServer/test?foo=bar&FOO=BAR"), uri);
-				HttpEntity httpEntity = (HttpEntity) invocation.getArguments()[2];
+				HttpEntity<?> httpEntity = (HttpEntity<?>) invocation.getArguments()[2];
 				HttpHeaders httpHeaders = httpEntity.getHeaders();
 				assertEquals(ifModifiedSince, httpHeaders.getIfNotModifiedSince());
 				assertEquals(ifUnmodifiedSinceValue, httpHeaders.getFirst("If-Unmodified-Since"));
-				return new ResponseEntity(httpEntity.getHeaders(), HttpStatus.OK);
+				return new ResponseEntity<Object>(httpEntity.getHeaders(), HttpStatus.OK);
 			}
 		}).when(template).exchange(Mockito.any(URI.class), Mockito.any(HttpMethod.class),
 				Mockito.any(HttpEntity.class), Mockito.eq((Class<?>) null));
````