diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java b/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java
index b01168f63..caff28110 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java
@@ -25,7 +25,7 @@ import java.util.Set;
 import org.apache.commons.collections.BidiMap;
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.iterators.AbstractTestMapIterator;
+import org.apache.commons.collections.iterators.AbstractMapIteratorTest;
 import org.apache.commons.collections.map.AbstractTestIterableMap;
 
 /**
@@ -475,7 +475,7 @@ public abstract class AbstractBidiMapTest<K, V> extends AbstractTestIterableMap<
         return new TestBidiMapIterator();
     }
 
-    public class TestBidiMapIterator extends AbstractTestMapIterator<K, V> {
+    public class TestBidiMapIterator extends AbstractMapIteratorTest<K, V> {
         public TestBidiMapIterator() {
             super("TestBidiMapIterator");
         }
diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java b/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java
index a9206ef74..4de1b0721 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java
@@ -26,7 +26,7 @@ import java.util.NoSuchElementException;
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.MapIterator;
 import org.apache.commons.collections.OrderedBidiMap;
-import org.apache.commons.collections.iterators.AbstractTestMapIterator;
+import org.apache.commons.collections.iterators.AbstractMapIteratorTest;
 
 /**
  * Abstract test class for {@link OrderedBidiMap} methods and contracts.
@@ -157,7 +157,7 @@ public abstract class AbstractOrderedBidiMapTest<K, V> extends AbstractBidiMapTe
         return (OrderedBidiMap<K, V>) super.getMap();
     }
 
-    public class TestBidiOrderedMapIterator extends AbstractTestMapIterator<K, V> {
+    public class TestBidiOrderedMapIterator extends AbstractMapIteratorTest<K, V> {
         public TestBidiOrderedMapIterator() {
             super("TestBidiOrderedMapIterator");
         }
diff --git a/src/test/java/org/apache/commons/collections/list/AbstractListTest.java b/src/test/java/org/apache/commons/collections/list/AbstractListTest.java
index 21cd884ae..bc96f473e 100644
--- a/src/test/java/org/apache/commons/collections/list/AbstractListTest.java
+++ b/src/test/java/org/apache/commons/collections/list/AbstractListTest.java
@@ -33,7 +33,7 @@ import java.util.NoSuchElementException;
 
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.collection.AbstractCollectionTest;
-import org.apache.commons.collections.iterators.AbstractTestListIterator;
+import org.apache.commons.collections.iterators.AbstractListIteratorTest;
 
 /**
  * Abstract test class for {@link java.util.List} methods and contracts.
@@ -1315,7 +1315,7 @@ public abstract class AbstractListTest<E> extends AbstractCollectionTest<E> {
        return new TestListIterator();
    }
 
-   public class TestListIterator extends AbstractTestListIterator<E> {
+   public class TestListIterator extends AbstractListIteratorTest<E> {
        public TestListIterator() {
            super("TestListIterator");
        }
diff --git a/src/test/java/org/apache/commons/collections/map/AbstractTestIterableMap.java b/src/test/java/org/apache/commons/collections/map/AbstractTestIterableMap.java
index e3446d71b..a88afbadb 100644
--- a/src/test/java/org/apache/commons/collections/map/AbstractTestIterableMap.java
+++ b/src/test/java/org/apache/commons/collections/map/AbstractTestIterableMap.java
@@ -23,7 +23,7 @@ import java.util.Map;
 import org.apache.commons.collections.IterableMap;
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.iterators.AbstractTestMapIterator;
+import org.apache.commons.collections.iterators.AbstractMapIteratorTest;
 
 /**
  * Abstract test class for {@link IterableMap} methods and contracts.
@@ -129,7 +129,7 @@ public abstract class AbstractTestIterableMap<K, V> extends AbstractTestMap<K, V
         return new InnerTestMapIterator();
     }
 
-    public class InnerTestMapIterator extends AbstractTestMapIterator<K, V> {
+    public class InnerTestMapIterator extends AbstractMapIteratorTest<K, V> {
         public InnerTestMapIterator() {
             super("InnerTestMapIterator");
         }
diff --git a/src/test/java/org/apache/commons/collections/map/AbstractTestOrderedMap.java b/src/test/java/org/apache/commons/collections/map/AbstractTestOrderedMap.java
index 3772ca6be..b29262a6f 100644
--- a/src/test/java/org/apache/commons/collections/map/AbstractTestOrderedMap.java
+++ b/src/test/java/org/apache/commons/collections/map/AbstractTestOrderedMap.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.OrderedMap;
 import org.apache.commons.collections.OrderedMapIterator;
 import org.apache.commons.collections.comparators.NullComparator;
-import org.apache.commons.collections.iterators.AbstractTestOrderedMapIterator;
+import org.apache.commons.collections.iterators.AbstractOrderedMapIteratorTest;
 
 /**
  * Abstract test class for {@link OrderedMap} methods and contracts.
@@ -194,7 +194,7 @@ public abstract class AbstractTestOrderedMap<K, V> extends AbstractTestIterableM
         return new InnerTestOrderedMapIterator();
     }
 
-    public class InnerTestOrderedMapIterator extends AbstractTestOrderedMapIterator<K, V> {
+    public class InnerTestOrderedMapIterator extends AbstractOrderedMapIteratorTest<K, V> {
         public InnerTestOrderedMapIterator() {
             super("InnerTestOrderedMapIterator");
         }
diff --git a/src/test/java/org/apache/commons/collections/map/TestFlat3Map.java b/src/test/java/org/apache/commons/collections/map/TestFlat3Map.java
index 608a245e2..1a9dbc03e 100644
--- a/src/test/java/org/apache/commons/collections/map/TestFlat3Map.java
+++ b/src/test/java/org/apache/commons/collections/map/TestFlat3Map.java
@@ -27,7 +27,7 @@ import junit.framework.Test;
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.IterableMap;
 import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.iterators.AbstractTestMapIterator;
+import org.apache.commons.collections.iterators.AbstractMapIteratorTest;
 
 /**
  * JUnit tests.
@@ -343,7 +343,7 @@ public class TestFlat3Map<K, V> extends AbstractTestIterableMap<K, V> {
         return new TestFlatMapIterator();
     }
 
-    public class TestFlatMapIterator extends AbstractTestMapIterator<K, V> {
+    public class TestFlatMapIterator extends AbstractMapIteratorTest<K, V> {
         public TestFlatMapIterator() {
             super("TestFlatMapIterator");
         }