diff --git a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueXmlConfigurationByIdIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIdIntegrationTests.java
similarity index 96%
rename from src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueXmlConfigurationByIdIntegrationTests.java
rename to src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIdIntegrationTests.java
index b31a00df..41c4c671 100644
--- a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueXmlConfigurationByIdIntegrationTests.java
+++ b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIdIntegrationTests.java
@@ -64,9 +64,9 @@ import org.springframework.test.context.junit4.SpringRunner;
  * @since 2.2.0
  */
 @RunWith(SpringRunner.class)
-@ContextConfiguration(locations = "AsyncEventQueueXmlConfigurationByIdIntegrationTests-context.xml")
+@ContextConfiguration(locations = "AsyncEventQueueByIdXmlConfigurationIdIntegrationTests-context.xml")
 @SuppressWarnings("unused")
-public class AsyncEventQueueXmlConfigurationByIdIntegrationTests extends ClientServerIntegrationTestsSupport {
+public class AsyncEventQueueByIdXmlConfigurationIdIntegrationTests extends ClientServerIntegrationTestsSupport {
 
 	private static final String GEMFIRE_LOG_LEVEL = "error";
 
diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderXmlConfigurationByIdIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIdIntegrationTests.java
similarity index 96%
rename from src/test/java/org/springframework/data/gemfire/wan/GatewaySenderXmlConfigurationByIdIntegrationTests.java
rename to src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIdIntegrationTests.java
index efb0aeff..a27a10ac 100644
--- a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderXmlConfigurationByIdIntegrationTests.java
+++ b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIdIntegrationTests.java
@@ -62,9 +62,9 @@ import org.springframework.test.context.junit4.SpringRunner;
  * @since 2.2.0
  */
 @RunWith(SpringRunner.class)
-@ContextConfiguration(locations = "GatewaySenderXmlConfigurationByIdIntegrationTests-context.xml")
+@ContextConfiguration(locations = "GatewaySenderByIdXmlConfigurationIdIntegrationTests-context.xml")
 @SuppressWarnings("unused")
-public class GatewaySenderXmlConfigurationByIdIntegrationTests extends ClientServerIntegrationTestsSupport {
+public class GatewaySenderByIdXmlConfigurationIdIntegrationTests extends ClientServerIntegrationTestsSupport {
 
 	private static ProcessWrapper geodeServer;
 
diff --git a/src/test/resources/org/springframework/data/gemfire/wan/AsyncEventQueueXmlConfigurationByIdIntegrationTests-context.xml b/src/test/resources/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests-context.xml
similarity index 100%
rename from src/test/resources/org/springframework/data/gemfire/wan/AsyncEventQueueXmlConfigurationByIdIntegrationTests-context.xml
rename to src/test/resources/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests-context.xml
diff --git a/src/test/resources/org/springframework/data/gemfire/wan/GatewaySenderXmlConfigurationByIdIntegrationTests-context.xml b/src/test/resources/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests-context.xml
similarity index 100%
rename from src/test/resources/org/springframework/data/gemfire/wan/GatewaySenderXmlConfigurationByIdIntegrationTests-context.xml
rename to src/test/resources/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests-context.xml