diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests-context.xml b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests-context.xml
similarity index 100%
rename from org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests-context.xml
rename to org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests-context.xml
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java
similarity index 98%
rename from org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests.java
rename to org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java
index d7d1012d0b..df23d4ca54 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests.java
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java
@@ -38,7 +38,7 @@ import org.springframework.xml.transform.StringResult;
  * @author Jonas Partner
  * @author Mark Fisher
  */
-public class XmlMarshallingTransformerParserTests  {
+public class MarshallingTransformerParserTests  {
 
 	private ApplicationContext appContext;
 
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests-context.xml b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests-context.xml
similarity index 100%
rename from org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests-context.xml
rename to org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests-context.xml
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests.java
similarity index 98%
rename from org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java
rename to org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests.java
index d69795abc8..c7960546aa 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests.java
@@ -38,7 +38,7 @@ import org.springframework.xml.transform.StringSource;
  * @author Jonas Partner
  * @author Mark Fisher
  */
-public class XmlUnmarshallingTransformerParserTests {
+public class UnmarshallingTransformerParserTests {
 
 	private ApplicationContext appContext;