diff --git a/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
index ab47f81b21..71961f7b3b 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
@@ -116,13 +116,13 @@ public TestBidiMapIterator() {
 
         @Override
         public V[] addSetValues() {
-            return AbstractBidiMapTest.this.getNewSampleValues();
+            return getNewSampleValues();
         }
 
         @Override
         public Map<K, V> getConfirmedMap() {
             // assumes makeFullMapIterator() called first
-            return AbstractBidiMapTest.this.getConfirmed();
+            return getConfirmed();
         }
 
         @Override
@@ -145,12 +145,12 @@ public MapIterator<K, V> makeObject() {
 
         @Override
         public boolean supportsRemove() {
-            return AbstractBidiMapTest.this.isRemoveSupported();
+            return isRemoveSupported();
         }
 
         @Override
         public boolean supportsSetValue() {
-            return AbstractBidiMapTest.this.isSetValueSupported();
+            return isSetValueSupported();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
index 0cb194337a..684d6a271b 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
@@ -46,7 +46,7 @@ public TestBidiOrderedMapIterator() {
 
         @Override
         public V[] addSetValues() {
-            return AbstractOrderedBidiMapTest.this.getNewSampleValues();
+            return getNewSampleValues();
         }
 
         @Override
@@ -75,12 +75,12 @@ public MapIterator<K, V> makeObject() {
 
         @Override
         public boolean supportsRemove() {
-            return AbstractOrderedBidiMapTest.this.isRemoveSupported();
+            return isRemoveSupported();
         }
 
         @Override
         public boolean supportsSetValue() {
-            return AbstractOrderedBidiMapTest.this.isSetValueSupported();
+            return isSetValueSupported();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
index 32a5a1e875..4a93d6bdfa 100644
--- a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
@@ -136,7 +136,7 @@ public TestListIterator() {
 
         @Override
         public E addSetValue() {
-            return AbstractListTest.this.getOtherElements()[0];
+            return getOtherElements()[0];
         }
 
         @Override
@@ -153,12 +153,12 @@ public ListIterator<E> makeObject() {
 
         @Override
         public boolean supportsAdd() {
-            return AbstractListTest.this.isAddSupported();
+            return isAddSupported();
         }
 
         @Override
         public boolean supportsRemove() {
-            return AbstractListTest.this.isRemoveSupported();
+            return isRemoveSupported();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
index 78ca9b0e39..58e5038d3a 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
@@ -43,13 +43,13 @@ public InnerTestMapIterator() {
 
         @Override
         public V[] addSetValues() {
-            return AbstractIterableMapTest.this.getNewSampleValues();
+            return getNewSampleValues();
         }
 
         @Override
         public Map<K, V> getConfirmedMap() {
             // assumes makeFullMapIterator() called first
-            return AbstractIterableMapTest.this.getConfirmed();
+            return getConfirmed();
         }
 
         @Override
@@ -77,12 +77,12 @@ public MapIterator<K, V> makeObject() {
 
         @Override
         public boolean supportsRemove() {
-            return AbstractIterableMapTest.this.isRemoveSupported();
+            return isRemoveSupported();
         }
 
         @Override
         public boolean supportsSetValue() {
-            return AbstractIterableMapTest.this.isSetValueSupported();
+            return isSetValueSupported();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
index 9caf0c4fc5..e9302d4c02 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
@@ -49,7 +49,7 @@ public InnerTestOrderedMapIterator() {
         @Override
         public Map<K, V> getConfirmedMap() {
             // assumes makeFullMapIterator() called first
-            return AbstractOrderedMapTest.this.getConfirmed();
+            return getConfirmed();
         }
 
         @Override
@@ -77,12 +77,12 @@ public OrderedMapIterator<K, V> makeObject() {
 
         @Override
         public boolean supportsRemove() {
-            return AbstractOrderedMapTest.this.isRemoveSupported();
+            return isRemoveSupported();
         }
 
         @Override
         public boolean supportsSetValue() {
-            return AbstractOrderedMapTest.this.isSetValueSupported();
+            return isSetValueSupported();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
index 58f7869a45..0e85dbf443 100644
--- a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
@@ -51,13 +51,13 @@ public TestFlatMapIterator() {
 
         @Override
         public V[] addSetValues() {
-            return Flat3MapTest.this.getNewSampleValues();
+            return getNewSampleValues();
         }
 
         @Override
         public Map<K, V> getConfirmedMap() {
             // assumes makeFullMapIterator() called first
-            return Flat3MapTest.this.getConfirmed();
+            return getConfirmed();
         }
 
         @Override
@@ -80,12 +80,12 @@ public MapIterator<K, V> makeObject() {
 
         @Override
         public boolean supportsRemove() {
-            return Flat3MapTest.this.isRemoveSupported();
+            return isRemoveSupported();
         }
 
         @Override
         public boolean supportsSetValue() {
-            return Flat3MapTest.this.isSetValueSupported();
+            return isSetValueSupported();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java b/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
index bce52b9b80..6d58d40a5a 100644
--- a/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
@@ -45,7 +45,7 @@ public class TestListView extends AbstractListTest<K> {
 
         @Override
         public K[] getFullElements() {
-            return LinkedMapTest.this.getSampleKeys();
+            return getSampleKeys();
         }
 
         @Override
@@ -55,7 +55,7 @@ public boolean isAddSupported() {
 
         @Override
         public boolean isNullSupported() {
-            return LinkedMapTest.this.isAllowNullKey();
+            return isAllowNullKey();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
index 1da8296472..4e6c898042 100644
--- a/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
+++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
@@ -41,7 +41,7 @@ public class TestListView extends AbstractListTest<K> {
 
         @Override
         public K[] getFullElements() {
-            return ListOrderedMap2Test.this.getSampleKeys();
+            return getSampleKeys();
         }
 
         @Override
@@ -51,7 +51,7 @@ public boolean isAddSupported() {
 
         @Override
         public boolean isNullSupported() {
-            return ListOrderedMap2Test.this.isAllowNullKey();
+            return isAllowNullKey();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
index 2b2e4e6089..e05f520215 100644
--- a/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
@@ -47,7 +47,7 @@ public class TestKeyListView extends AbstractListTest<K> {
 
         @Override
         public K[] getFullElements() {
-            return ListOrderedMapTest.this.getSampleKeys();
+            return getSampleKeys();
         }
 
         @Override
@@ -57,7 +57,7 @@ public boolean isAddSupported() {
 
         @Override
         public boolean isNullSupported() {
-            return ListOrderedMapTest.this.isAllowNullKey();
+            return isAllowNullKey();
         }
 
         @Override
@@ -95,7 +95,7 @@ public class TestValueListView extends AbstractListTest<V> {
 
         @Override
         public V[] getFullElements() {
-            return ListOrderedMapTest.this.getSampleValues();
+            return getSampleValues();
         }
 
         @Override
@@ -105,7 +105,7 @@ public boolean isAddSupported() {
 
         @Override
         public boolean isNullSupported() {
-            return ListOrderedMapTest.this.isAllowNullKey();
+            return isAllowNullKey();
         }
 
         @Override