diff --git a/src/test/java/org/apache/commons/collections/keyvalue/AbstractTestMapEntry.java b/src/test/java/org/apache/commons/collections/keyvalue/AbstractMapEntryTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/keyvalue/AbstractTestMapEntry.java
rename to src/test/java/org/apache/commons/collections/keyvalue/AbstractMapEntryTest.java
index ce77e21c2..8f5ee0750 100644
--- a/src/test/java/org/apache/commons/collections/keyvalue/AbstractTestMapEntry.java
+++ b/src/test/java/org/apache/commons/collections/keyvalue/AbstractMapEntryTest.java
@@ -28,12 +28,10 @@ import junit.framework.TestCase;
  * {@link #testConstructors()} to test the constructors of the Map.Entry
  * type being tested.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Neil O'Toole
+ * @since 3.0
+ * @version $Id$
  */
-public abstract class AbstractTestMapEntry<K, V> extends TestCase {
+public abstract class AbstractMapEntryTest<K, V> extends TestCase {
     
     protected final String key = "name";
     protected final String value = "duke";
@@ -43,7 +41,7 @@ public abstract class AbstractTestMapEntry<K, V> extends TestCase {
      * 
      * @param testName  the test name
      */
-    public AbstractTestMapEntry(String testName) {
+    public AbstractMapEntryTest(String testName) {
         super(testName);
     }
 
diff --git a/src/test/java/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java b/src/test/java/org/apache/commons/collections/keyvalue/DefaultKeyValueTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java
rename to src/test/java/org/apache/commons/collections/keyvalue/DefaultKeyValueTest.java
index 884f28de9..c6c709d97 100644
--- a/src/test/java/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java
+++ b/src/test/java/org/apache/commons/collections/keyvalue/DefaultKeyValueTest.java
@@ -24,12 +24,10 @@ import junit.framework.TestCase;
 /**
  * Test the DefaultKeyValue class.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Neil O'Toole
+ * @since 3.0
+ * @version $Id$
  */
-public class TestDefaultKeyValue<K, V> extends TestCase {
+public class DefaultKeyValueTest<K, V> extends TestCase {
     
     private final String key = "name";
     private final String value = "duke";
@@ -39,7 +37,7 @@ public class TestDefaultKeyValue<K, V> extends TestCase {
      * 
      * @param testName  the test name
      */
-    public TestDefaultKeyValue(String testName) {
+    public DefaultKeyValueTest(String testName) {
         super(testName);
 
     }
diff --git a/src/test/java/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java b/src/test/java/org/apache/commons/collections/keyvalue/DefaultMapEntryTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java
rename to src/test/java/org/apache/commons/collections/keyvalue/DefaultMapEntryTest.java
index 317553ca0..d25c7ace6 100644
--- a/src/test/java/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java
+++ b/src/test/java/org/apache/commons/collections/keyvalue/DefaultMapEntryTest.java
@@ -23,14 +23,12 @@ import org.apache.commons.collections.KeyValue;
 /**
  * Test the DefaultMapEntry class.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Neil O'Toole
+ * @since 3.0
+ * @version $Id$
  */
-public class TestDefaultMapEntry<K, V> extends AbstractTestMapEntry<K, V> {
+public class DefaultMapEntryTest<K, V> extends AbstractMapEntryTest<K, V> {
 
-    public TestDefaultMapEntry(String testName) {
+    public DefaultMapEntryTest(String testName) {
         super(testName);
     }
 
diff --git a/src/test/java/org/apache/commons/collections/keyvalue/TestMultiKey.java b/src/test/java/org/apache/commons/collections/keyvalue/MultiKeyTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/keyvalue/TestMultiKey.java
rename to src/test/java/org/apache/commons/collections/keyvalue/MultiKeyTest.java
index 40be24efd..ff1dd7047 100644
--- a/src/test/java/org/apache/commons/collections/keyvalue/TestMultiKey.java
+++ b/src/test/java/org/apache/commons/collections/keyvalue/MultiKeyTest.java
@@ -32,11 +32,9 @@ import junit.framework.TestCase;
 /**
  * Unit tests for {@link org.apache.commons.collections.keyvalue.MultiKey}.
  *
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
-public class TestMultiKey extends TestCase {
+public class MultiKeyTest extends TestCase {
 
     Integer ONE = new Integer(1);
     Integer TWO = new Integer(2);
@@ -44,7 +42,7 @@ public class TestMultiKey extends TestCase {
     Integer FOUR = new Integer(4);
     Integer FIVE = new Integer(5);
 
-    public TestMultiKey(String name) {
+    public MultiKeyTest(String name) {
         super(name);
     }
 
diff --git a/src/test/java/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java b/src/test/java/org/apache/commons/collections/keyvalue/TiedMapEntryTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java
rename to src/test/java/org/apache/commons/collections/keyvalue/TiedMapEntryTest.java
index f89181982..dba56d3b6 100644
--- a/src/test/java/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java
+++ b/src/test/java/org/apache/commons/collections/keyvalue/TiedMapEntryTest.java
@@ -22,14 +22,12 @@ import java.util.Map;
 /**
  * Test the TiedMapEntry class.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @since 3.0
+ * @version $Id$
  */
-public class TestTiedMapEntry<K, V> extends AbstractTestMapEntry<K, V> {
+public class TiedMapEntryTest<K, V> extends AbstractMapEntryTest<K, V> {
 
-    public TestTiedMapEntry(String testName) {
+    public TiedMapEntryTest(String testName) {
         super(testName);
     }
 
diff --git a/src/test/java/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java b/src/test/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntryTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java
rename to src/test/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntryTest.java
index 5da142d26..ab329dca6 100644
--- a/src/test/java/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java
+++ b/src/test/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntryTest.java
@@ -24,14 +24,12 @@ import org.apache.commons.collections.Unmodifiable;
 /**
  * Test the UnmodifiableMapEntry class.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Neil O'Toole
+ * @since 3.0
+ * @version $Id$
  */
-public class TestUnmodifiableMapEntry<K, V> extends AbstractTestMapEntry<K, V> {
+public class UnmodifiableMapEntryTest<K, V> extends AbstractMapEntryTest<K, V> {
 
-    public TestUnmodifiableMapEntry(String testName) {
+    public UnmodifiableMapEntryTest(String testName) {
         super(testName);
     }