diff --git a/src/test/org/apache/commons/collections/TestArrayList.java b/src/test/org/apache/commons/collections/AbstractTestArrayList.java
similarity index 93%
rename from src/test/org/apache/commons/collections/TestArrayList.java
rename to src/test/org/apache/commons/collections/AbstractTestArrayList.java
index 2e0cc905b..7c12442d9 100644
--- a/src/test/org/apache/commons/collections/TestArrayList.java
+++ b/src/test/org/apache/commons/collections/AbstractTestArrayList.java
@@ -27,9 +27,9 @@ import org.apache.commons.collections.list.AbstractTestList;
  *
  * @author Jason van Zyl
  */
-public abstract class TestArrayList<E> extends AbstractTestList<E> {
+public abstract class AbstractTestArrayList<E> extends AbstractTestList<E> {
 
-    public TestArrayList(String testName) {
+    public AbstractTestArrayList(String testName) {
         super(testName);
     }
 
diff --git a/src/test/org/apache/commons/collections/TestLinkedList.java b/src/test/org/apache/commons/collections/AbstractTestLinkedList.java
similarity index 97%
rename from src/test/org/apache/commons/collections/TestLinkedList.java
rename to src/test/org/apache/commons/collections/AbstractTestLinkedList.java
index 05f103af2..b7908397f 100644
--- a/src/test/org/apache/commons/collections/TestLinkedList.java
+++ b/src/test/org/apache/commons/collections/AbstractTestLinkedList.java
@@ -38,9 +38,9 @@ import org.apache.commons.collections.list.AbstractTestList;
  *
  * @author Rich Dougherty
  */
-public abstract class TestLinkedList<T> extends AbstractTestList<T> {
+public abstract class AbstractTestLinkedList<T> extends AbstractTestList<T> {
 
-    public TestLinkedList(String testName) {
+    public AbstractTestLinkedList(String testName) {
         super(testName);
     }
 
diff --git a/src/test/org/apache/commons/collections/TestTreeMap.java b/src/test/org/apache/commons/collections/AbstractTestTreeMap.java
similarity index 93%
rename from src/test/org/apache/commons/collections/TestTreeMap.java
rename to src/test/org/apache/commons/collections/AbstractTestTreeMap.java
index 10335d21d..951366746 100644
--- a/src/test/org/apache/commons/collections/TestTreeMap.java
+++ b/src/test/org/apache/commons/collections/AbstractTestTreeMap.java
@@ -27,9 +27,9 @@ import org.apache.commons.collections.map.AbstractTestMap;
  *
  * @author Jason van Zyl
  */
-public abstract class TestTreeMap<K, V> extends AbstractTestMap<K, V> {
+public abstract class AbstractTestTreeMap<K, V> extends AbstractTestMap<K, V> {
 
-    public TestTreeMap(String testName) {
+    public AbstractTestTreeMap(String testName) {
         super(testName);
     }
 
diff --git a/src/test/org/apache/commons/collections/TestTypedCollection.java b/src/test/org/apache/commons/collections/AbstractTestTypedCollection.java
similarity index 95%
rename from src/test/org/apache/commons/collections/TestTypedCollection.java
rename to src/test/org/apache/commons/collections/AbstractTestTypedCollection.java
index 167f666c2..5efb2e3b4 100644
--- a/src/test/org/apache/commons/collections/TestTypedCollection.java
+++ b/src/test/org/apache/commons/collections/AbstractTestTypedCollection.java
@@ -27,9 +27,9 @@ import java.util.List;
  *
  * @author Stephen Colebourne
  */
-public abstract class TestTypedCollection<T> extends BulkTest {
+public abstract class AbstractTestTypedCollection<T> extends BulkTest {
 
-    public TestTypedCollection(String name) {
+    public AbstractTestTypedCollection(String name) {
         super(name);
     }
 
diff --git a/src/test/org/apache/commons/collections/TestArrayStack.java b/src/test/org/apache/commons/collections/TestArrayStack.java
index d6df5644f..9a1a15f0c 100644
--- a/src/test/org/apache/commons/collections/TestArrayStack.java
+++ b/src/test/org/apache/commons/collections/TestArrayStack.java
@@ -27,7 +27,7 @@ import junit.framework.Test;
  *
  * @author Craig McClanahan
  */
-public class TestArrayStack<E> extends TestArrayList<E> {
+public class TestArrayStack<E> extends AbstractTestArrayList<E> {
     
     public TestArrayStack(String testName) {
         super(testName);
diff --git a/src/test/org/apache/commons/collections/comparators/TestNullComparator.java b/src/test/org/apache/commons/collections/comparators/AbstractTestNullComparator.java
similarity index 88%
rename from src/test/org/apache/commons/collections/comparators/TestNullComparator.java
rename to src/test/org/apache/commons/collections/comparators/AbstractTestNullComparator.java
index 204ed2ab1..5c5ad1d5e 100644
--- a/src/test/org/apache/commons/collections/comparators/TestNullComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/AbstractTestNullComparator.java
@@ -30,14 +30,14 @@ import junit.framework.TestSuite;
  *
  * @author Michael A. Smith
  */
-public abstract class TestNullComparator extends AbstractTestComparator<Integer> {
+public abstract class AbstractTestNullComparator extends AbstractTestComparator<Integer> {
 
-    public TestNullComparator(String testName) {
+    public AbstractTestNullComparator(String testName) {
         super(testName);
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite(TestNullComparator.class.getName());
+        TestSuite suite = new TestSuite(AbstractTestNullComparator.class.getName());
         suite.addTest(new TestSuite(TestNullComparator1.class));
         suite.addTest(new TestSuite(TestNullComparator2.class));
         return suite;
@@ -46,7 +46,7 @@ public abstract class TestNullComparator extends AbstractTestComparator<Integer>
     /**
      *  Test the NullComparator with nulls high, using comparable comparator
      **/
-    public static class TestNullComparator1 extends TestNullComparator {
+    public static class TestNullComparator1 extends AbstractTestNullComparator {
 
         public TestNullComparator1(String testName) {
             super(testName);
@@ -78,7 +78,7 @@ public abstract class TestNullComparator extends AbstractTestComparator<Integer>
     /**
      *  Test the NullComparator with nulls low using the comparable comparator
      **/
-    public static class TestNullComparator2 extends TestNullComparator {
+    public static class TestNullComparator2 extends AbstractTestNullComparator {
 
         public TestNullComparator2(String testName) {
             super(testName);
diff --git a/src/test/org/apache/commons/collections/functors/TestAnyAllOnePredicate.java b/src/test/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java
similarity index 94%
rename from src/test/org/apache/commons/collections/functors/TestAnyAllOnePredicate.java
rename to src/test/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java
index 5e2f8bf54..3be4a6124 100644
--- a/src/test/org/apache/commons/collections/functors/TestAnyAllOnePredicate.java
+++ b/src/test/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java
@@ -32,14 +32,14 @@ import java.util.Collections;
  *
  * @author Edwin Tellman
  */
-public abstract class TestAnyAllOnePredicate<T> extends TestCompositePredicate<T> {
+public abstract class AbstractTestAnyAllOnePredicate<T> extends AbstractTestCompositePredicate<T> {
 
     /**
      * Creates a new <code>TestCompositePredicate</code>.
      *
      * @param testValue the value which the mock predicates should expect to see (may be null).
      */
-    protected TestAnyAllOnePredicate(final T testValue) {
+    protected AbstractTestAnyAllOnePredicate(final T testValue) {
         super(testValue);
     }
 
diff --git a/src/test/org/apache/commons/collections/functors/TestCompositePredicate.java b/src/test/org/apache/commons/collections/functors/AbstractTestCompositePredicate.java
similarity index 97%
rename from src/test/org/apache/commons/collections/functors/TestCompositePredicate.java
rename to src/test/org/apache/commons/collections/functors/AbstractTestCompositePredicate.java
index dde2dcdfc..45a343977 100644
--- a/src/test/org/apache/commons/collections/functors/TestCompositePredicate.java
+++ b/src/test/org/apache/commons/collections/functors/AbstractTestCompositePredicate.java
@@ -34,14 +34,14 @@ import java.util.List;
  *
  * @author Edwin Tellman
  */
-public abstract class TestCompositePredicate<T> extends MockPredicateTestBase<T> {
+public abstract class AbstractTestCompositePredicate<T> extends MockPredicateTestBase<T> {
 
     /**
      * Creates a new <code>TestCompositePredicate</code>.
      *
      * @param testValue the value which the mock predicates should expect to see (may be null).
      */
-    protected TestCompositePredicate(final T testValue) {
+    protected AbstractTestCompositePredicate(final T testValue) {
         super(testValue);
     }
 
diff --git a/src/test/org/apache/commons/collections/functors/TestAllPredicate.java b/src/test/org/apache/commons/collections/functors/TestAllPredicate.java
index ad94df732..4ad33da8e 100644
--- a/src/test/org/apache/commons/collections/functors/TestAllPredicate.java
+++ b/src/test/org/apache/commons/collections/functors/TestAllPredicate.java
@@ -18,7 +18,7 @@ import java.util.Collections;
  *
  * @author Edwin Tellman
  */
-public class TestAllPredicate extends TestAnyAllOnePredicate<Integer> {
+public class TestAllPredicate extends AbstractTestAnyAllOnePredicate<Integer> {
 
     /**
      * Creates a new <code>TestAllPredicate</code>.
diff --git a/src/test/org/apache/commons/collections/list/TestAbstractLinkedList.java b/src/test/org/apache/commons/collections/list/AbstractTestLinkedList.java
similarity index 98%
rename from src/test/org/apache/commons/collections/list/TestAbstractLinkedList.java
rename to src/test/org/apache/commons/collections/list/AbstractTestLinkedList.java
index ee12658b7..ee108daa1 100644
--- a/src/test/org/apache/commons/collections/list/TestAbstractLinkedList.java
+++ b/src/test/org/apache/commons/collections/list/AbstractTestLinkedList.java
@@ -27,9 +27,9 @@ import java.util.Arrays;
  * @author David Hay
  * @author Phil Steitz
  */
-public abstract class TestAbstractLinkedList<E> extends AbstractTestList<E> {
+public abstract class AbstractTestLinkedList<E> extends AbstractTestList<E> {
 
-    public TestAbstractLinkedList(String testName) {
+    public AbstractTestLinkedList(String testName) {
         super(testName);
     }
 
diff --git a/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java b/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java
index 8bc5000ed..99ec926f9 100644
--- a/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java
+++ b/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.BulkTest;
  * @author Rodney Waldhoff
  * @author Simon Kitching
  */
-public class TestCursorableLinkedList<E> extends TestAbstractLinkedList<E> {
+public class TestCursorableLinkedList<E> extends AbstractTestLinkedList<E> {
     public TestCursorableLinkedList(String testName) {
         super(testName);
     }
diff --git a/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java b/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java
index e50263bde..3bd2fa7fb 100644
--- a/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java
+++ b/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.BulkTest;
  * @author Jeff Varszegi
  * @author Phil Steitz
  */
-public class TestNodeCachingLinkedList<E> extends TestAbstractLinkedList<E> {
+public class TestNodeCachingLinkedList<E> extends AbstractTestLinkedList<E> {
 
     public TestNodeCachingLinkedList(String testName) {
         super(testName);