diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MockHandlerTest-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MockHandlerTests-context.xml
similarity index 95%
rename from org.springframework.integration/src/test/java/org/springframework/integration/handler/MockHandlerTest-context.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/MockHandlerTests-context.xml
index 14759ad07d..0348da8ca7 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MockHandlerTest-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MockHandlerTests-context.xml
@@ -10,7 +10,7 @@
 	<si:service-activator input-channel="input" ref="mock" method="test" />
 
 	<bean id="mock" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.springframework.integration.handler.MockHandlerTest$TestInterface" />
+		<constructor-arg value="org.springframework.integration.handler.MockHandlerTests$TestInterface" />
 	</bean>
 
 </beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MockHandlerTest.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MockHandlerTests.java
similarity index 98%
rename from org.springframework.integration/src/test/java/org/springframework/integration/handler/MockHandlerTest.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/MockHandlerTests.java
index 182b6e8431..ac0104551a 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MockHandlerTest.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MockHandlerTests.java
@@ -38,7 +38,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-public class MockHandlerTest {
+public class MockHandlerTests {
 
 	@Autowired
 	@Qualifier("input")