diff --git a/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParser2TestCase.java b/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/XmlConfigParser2TestCase.java
similarity index 97%
rename from configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParser2TestCase.java
rename to configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/XmlConfigParser2TestCase.java
index e13f804..b301e97 100644
--- a/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParser2TestCase.java
+++ b/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/XmlConfigParser2TestCase.java
@@ -20,8 +20,6 @@
 import org.apache.commons.chain2.Catalog;
 import org.apache.commons.chain2.CatalogFactory;
 import org.apache.commons.chain2.Context;
-import org.apache.commons.chain2.config.xml.ConfigRuleSet;
-import org.apache.commons.chain2.config.xml.XmlConfigParser;
 import org.apache.commons.chain2.impl.*;
 import org.apache.commons.digester3.Digester;
 import org.junit.After;
@@ -34,12 +32,12 @@
 
 
 /**
- * <p>Test case identical to {@link ConfigParserTestCase} except
+ * <p>Test case identical to {@link XmlConfigParserTestCase} except
  * that it uses the <code>define</code> rule to define aliases
  * for the commands and chains used in the test.</p>
  */
 
-public class ConfigParser2TestCase {
+public class XmlConfigParser2TestCase {
 
 
     private static final String DEFAULT_XML =
diff --git a/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParserTestCase.java b/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/XmlConfigParserTestCase.java
similarity index 99%
rename from configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParserTestCase.java
rename to configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/XmlConfigParserTestCase.java
index 42d33d9..aae9d2e 100644
--- a/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParserTestCase.java
+++ b/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/XmlConfigParserTestCase.java
@@ -38,7 +38,7 @@
  * <p>Test Case for <code>org.apache.commons.chain2.config.ConfigParser</code>.</p>
  */
 
-public class ConfigParserTestCase {
+public class XmlConfigParserTestCase {
 
 
     private static final String DEFAULT_XML =