diff --git a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIdIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java
similarity index 97%
rename from src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIdIntegrationTests.java
rename to src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java
index ae5cced1..69003570 100644
--- a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIdIntegrationTests.java
+++ b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java
@@ -66,7 +66,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @ContextConfiguration(locations = "AsyncEventQueueByIdXmlConfigurationIntegrationTests-context.xml")
 @SuppressWarnings("unused")
-public class AsyncEventQueueByIdXmlConfigurationIdIntegrationTests extends ClientServerIntegrationTestsSupport {
+public class AsyncEventQueueByIdXmlConfigurationIntegrationTests extends ClientServerIntegrationTestsSupport {
 
 	private static final String GEMFIRE_LOG_LEVEL = "error";
 
diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIdIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java
similarity index 98%
rename from src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIdIntegrationTests.java
rename to src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java
index 1d6d8fdd..4d1a08cc 100644
--- a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIdIntegrationTests.java
+++ b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java
@@ -64,7 +64,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @ContextConfiguration(locations = "GatewaySenderByIdXmlConfigurationIntegrationTests-context.xml")
 @SuppressWarnings("unused")
-public class GatewaySenderByIdXmlConfigurationIdIntegrationTests extends ClientServerIntegrationTestsSupport {
+public class GatewaySenderByIdXmlConfigurationIntegrationTests extends ClientServerIntegrationTestsSupport {
 
 	private static ProcessWrapper geodeServer;