diff --git a/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTest.java b/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTestCase.java
similarity index 98%
rename from base/src/test/java/org/apache/commons/chain2/base/CopyCommandTest.java
rename to base/src/test/java/org/apache/commons/chain2/base/CopyCommandTestCase.java
index fbbd190..928cdc7 100644
--- a/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTest.java
+++ b/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTestCase.java
@@ -31,7 +31,7 @@
 /**
  * @version $Id$
  */
-public class CopyCommandTest {
+public class CopyCommandTestCase {
 
     private CopyCommand<String, Object, Map<String, Object>> command;
     private Map<String, Object> context;
diff --git a/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasCommandCountTest.java b/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasCommandCountTestCase.java
similarity index 96%
rename from test-utils/src/test/java/org/apache/commons/chain2/testutils/HasCommandCountTest.java
rename to test-utils/src/test/java/org/apache/commons/chain2/testutils/HasCommandCountTestCase.java
index 1fda58e..7e04a2d 100644
--- a/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasCommandCountTest.java
+++ b/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasCommandCountTestCase.java
@@ -15,7 +15,7 @@
 /**
  * @version $Id$
  */
-public class HasCommandCountTest {
+public class HasCommandCountTestCase {
 
     private Catalog<String, Object, Context<String, Object>> catalog;
     private HasCommandCount matcher;
diff --git a/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasLogTest.java b/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasLogTestCase.java
similarity index 98%
rename from test-utils/src/test/java/org/apache/commons/chain2/testutils/HasLogTest.java
rename to test-utils/src/test/java/org/apache/commons/chain2/testutils/HasLogTestCase.java
index 10d5551..b3ac9ae 100644
--- a/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasLogTest.java
+++ b/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasLogTestCase.java
@@ -32,7 +32,7 @@
 /**
  * @version $Id$
  */
-public class HasLogTest {
+public class HasLogTestCase {
 
     private Context<String, Object> context;
     private HasLog matcher;