diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
index 6f4d6597f0..70b8954aa9 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
@@ -35,6 +35,9 @@
  * Concrete subclasses must provide the iterator to be tested.
  * They must also specify certain details of how the iterator operates by
  * overriding the supportsXxx() methods if necessary.
+ * </p>
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public abstract class AbstractIteratorTest<E> extends AbstractObjectTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
index b64153cc4d..e8f9b3c0ac 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
@@ -35,6 +35,9 @@
  * Concrete subclasses must provide the list iterator to be tested.
  * They must also specify certain details of how the list iterator operates by
  * overriding the supportsXxx() methods if necessary.
+ * </p>
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public abstract class AbstractListIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
index 330f721810..b01f538a84 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
@@ -38,6 +38,10 @@
  * Concrete subclasses must provide the list iterator to be tested.
  * They must also specify certain details of how the list iterator operates by
  * overriding the supportsXxx() methods if necessary.
+ * </p>
+ *
+ * @param <K> the type of the keys in the maps tested.
+ * @param <V> the type of the values in the maps tested.
  */
 public abstract class AbstractMapIteratorTest<K, V> extends AbstractIteratorTest<K> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
index e2d502a602..9cee41ce5d 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
@@ -40,6 +40,9 @@
  * Concrete subclasses must provide the list iterator to be tested.
  * They must also specify certain details of how the list iterator operates by
  * overriding the supportsXxx() methods if necessary.
+ *
+ * @param <K> the type of the keys in the maps tested.
+ * @param <V> the type of the values in the maps tested.
  */
 public abstract class AbstractOrderedMapIteratorTest<K, V> extends AbstractMapIteratorTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java
index 05318f9a4b..3f3c4a1640 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java
@@ -29,6 +29,8 @@
 
 /**
  * Tests the ArrayIterator with primitive type arrays.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class ArrayIterator2Test<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java
index 0ea17653f2..e2d20cca96 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java
@@ -29,6 +29,8 @@
  * Tests the ArrayIterator to ensure that the next() method will actually
  * perform the iteration rather than the hasNext() method.
  * The code of this test was supplied by Mauricio S. Moura.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class ArrayIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java
index 7dff976db2..3ee3920cab 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java
@@ -18,6 +18,8 @@
 
 /**
  * Test the ArrayListIterator class with primitives.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class ArrayListIterator2Test<E> extends ArrayIterator2Test<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
index c6f481fb25..071b4a71a1 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
@@ -28,6 +28,8 @@
 
 /**
  * Test the ArrayListIterator class.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class ArrayListIteratorTest<E> extends ArrayIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java
index 8e1d39deb4..36f66236ef 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java
@@ -37,6 +37,8 @@
 
 /**
  * A unit test to test the basic functions of {@link BoundedIterator}.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class BoundedIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
index 157bc87259..ba12cb6978 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
@@ -38,6 +38,8 @@
 
 /**
  * Test the filter iterator.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class FilterIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
index b446edaefe..5fd06163f0 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
@@ -31,6 +31,8 @@
 
 /**
  * Tests the ListIteratorWrapper to ensure that it behaves as expected when wrapping a ListIterator.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class ListIteratorWrapper2Test<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
index c52bef0ffb..84842dd06e 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
@@ -32,6 +32,8 @@
 /**
  * Tests the ListIteratorWrapper to ensure that it simulates
  * a ListIterator correctly.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class ListIteratorWrapperTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java
index 108ccdd6a9..ac34971236 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java
@@ -27,6 +27,8 @@
 
 /**
  * Tests the ObjectArrayIterator.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class ObjectArrayIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java
index 1091226f61..c47fb577a6 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java
@@ -18,6 +18,8 @@
 
 /**
  * Tests the ObjectArrayListIterator class.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class ObjectArrayListIterator2Test<E> extends AbstractListIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
index 22bdd9a868..b3f140675b 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
@@ -28,6 +28,8 @@
 
 /**
  * Tests the ObjectArrayListIterator class.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class ObjectArrayListIteratorTest<E> extends ObjectArrayIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java
index ba0c0421d5..276ea36b79 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java
@@ -34,6 +34,8 @@
 
 /**
  * Tests the PeekingIterator.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class PeekingIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java
index 83537d2e32..fac2ca4251 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java
@@ -34,6 +34,8 @@
 
 /**
  * Test class for PermutationIterator.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class PermutationIteratorTest extends AbstractIteratorTest<List<Character>> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java
index c743574ab7..acddc805db 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java
@@ -31,6 +31,8 @@
 
 /**
  * Tests the PushbackIterator.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class PushbackIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java
index b1a7e7ce7a..2c5a16698e 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java
@@ -33,6 +33,8 @@
 
 /**
  * Tests the ReverseListIterator.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class ReverseListIteratorTest<E> extends AbstractListIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java
index 41efd1fa01..3438538c31 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java
@@ -29,6 +29,8 @@
 /**
  * Tests the SingletonIterator to ensure that the next() method will actually
  * perform the iteration rather than the hasNext() method.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class SingletonIterator2Test<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java
index 7cdd3da60b..31ff4b9f32 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java
@@ -29,6 +29,8 @@
 /**
  * Tests the SingletonIterator to ensure that the next() method will actually
  * perform the iteration rather than the hasNext() method.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class SingletonIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java
index ca3868a5f2..b8d4a53883 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java
@@ -28,6 +28,8 @@
 
 /**
  * Tests the SingletonListIterator.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class SingletonListIteratorTest<E> extends AbstractListIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java
index b10aaefafc..c021af6b31 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java
@@ -33,6 +33,8 @@
 
 /**
  * A unit test to test the basic functions of {@link SkippingIterator}.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class SkippingIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java
index 4bcf3a77c4..079fa961e0 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java
@@ -29,6 +29,8 @@
 
 /**
  * Tests the UniqueFilterIterator class.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class UniqueFilterIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java
index fdcca6fcd4..c9cb32faa5 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java
@@ -33,6 +33,8 @@
 
 /**
  * Tests the UnmodifiableIterator.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class UnmodifiableIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java
index 055e481544..868f66007e 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java
@@ -33,6 +33,8 @@
 
 /**
  * Tests the UnmodifiableListIterator.
+ *
+ * @param <E> the type of elements tested by this iterator.
  */
 public class UnmodifiableListIteratorTest<E> extends AbstractListIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java
index eed151bf1d..1dea7840fd 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java
@@ -32,6 +32,9 @@
 
 /**
  * Tests the UnmodifiableMapIterator.
+ *
+ * @param <K> the type of the keys in the maps tested.
+ * @param <V> the type of the values in the maps tested.
  */
 public class UnmodifiableMapIteratorTest<K, V> extends AbstractMapIteratorTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java
index 3ccd23c56b..70f8289e52 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java
@@ -33,6 +33,9 @@
 
 /**
  * Tests the UnmodifiableOrderedMapIterator.
+ *
+ * @param <K> the type of the keys in the maps tested.
+ * @param <V> the type of the values in the maps tested.
  */
 public class UnmodifiableOrderedMapIteratorTest<K, V> extends AbstractOrderedMapIteratorTest<K, V> {
 
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 7a059c6beb..3be2938cbc 100644
--- a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
@@ -47,11 +47,15 @@
  * <p>
  * To use, simply extend this class, and implement
  * the {@link #makeObject} method.
+ * </p>
  * <p>
  * If your {@link List} fails one of these tests by design,
  * you may still use this base set of cases.  Simply override the
  * test case (method) your {@link List} fails or override one of the
  * protected methods from AbstractCollectionTest.
+ * </p>
+ *
+ * @param <E> the type of elements returned by this iterator
  */
 public abstract class AbstractListTest<E> extends AbstractCollectionTest<E> {
 
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 e9302d4c02..c0583c9096 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
@@ -38,6 +38,9 @@
 
 /**
  * Abstract test class for {@link OrderedMap} methods and contracts.
+ *
+ * @param <K> the type of the keys in the maps tested.
+ * @param <V> the type of the values in the maps tested.
  */
 public abstract class AbstractOrderedMapTest<K, V> extends AbstractIterableMapTest<K, V> {