diff --git a/src/test/org/apache/commons/collections/AbstractTestObject.java b/src/test/org/apache/commons/collections/AbstractTestObject.java
index 256705669..9388cb30a 100644
--- a/src/test/org/apache/commons/collections/AbstractTestObject.java
+++ b/src/test/org/apache/commons/collections/AbstractTestObject.java
@@ -178,7 +178,7 @@ public abstract class AbstractTestObject extends BulkTest {
     }
 
     /**
-     * Tests serialization by comparing against a previously stored version in CVS.
+     * Tests serialization by comparing against a previously stored version in SVN.
      * If the test object is serializable, confirm that a canonical form exists.
      */
     public void testCanonicalEmptyCollectionExists() {
@@ -187,14 +187,14 @@ public abstract class AbstractTestObject extends BulkTest {
             if (object instanceof Serializable) {
                 String name = getCanonicalEmptyCollectionName(object);
                 assertTrue(
-                    "Canonical empty collection (" + name + ") is not in CVS",
+                    "Canonical empty collection (" + name + ") is not in SVN",
                     new File(name).exists());
             }
         }
     }
 
     /**
-     * Tests serialization by comparing against a previously stored version in CVS.
+     * Tests serialization by comparing against a previously stored version in SVN.
      * If the test object is serializable, confirm that a canonical form exists.
      */
     public void testCanonicalFullCollectionExists() {
@@ -203,7 +203,7 @@ public abstract class AbstractTestObject extends BulkTest {
             if (object instanceof Serializable) {
                 String name = getCanonicalFullCollectionName(object);
                 assertTrue(
-                    "Canonical full collection (" + name + ") is not in CVS",
+                    "Canonical full collection (" + name + ") is not in SVN",
                     new File(name).exists());
             }
         }
@@ -218,7 +218,7 @@ public abstract class AbstractTestObject extends BulkTest {
      * even exist in this version).
      * 
      * This constant makes it possible for TestMap (and other subclasses,
-     * if necessary) to automatically check CVS for a versionX copy of a
+     * if necessary) to automatically check SVN for a versionX copy of a
      * Serialized object, so we can make sure that compatibility is maintained.
      * See, for example, TestMap.getCanonicalFullMapName(Map map).
      * Subclasses can override this variable, indicating compatibility
@@ -259,7 +259,7 @@ public abstract class AbstractTestObject extends BulkTest {
      * Write a Serializable or Externalizable object as
      * a file at the given path.  NOT USEFUL as part
      * of a unit test; this is just a utility method
-     * for creating disk-based objects in CVS that can become
+     * for creating disk-based objects in SVN that can become
      * the basis for compatibility tests using
      * readExternalFormFromDisk(String path)
      * 
@@ -289,7 +289,7 @@ public abstract class AbstractTestObject extends BulkTest {
     /**
      * Reads a Serialized or Externalized Object from disk.
      * Useful for creating compatibility tests between
-     * different CVS versions of the same class
+     * different SVN versions of the same class
      * 
      * @param path path to the serialized Object
      * @return the Object at the given path
diff --git a/src/test/org/apache/commons/collections/bag/AbstractTestBag.java b/src/test/org/apache/commons/collections/bag/AbstractTestBag.java
index 5bcbf597f..c357deb40 100644
--- a/src/test/org/apache/commons/collections/bag/AbstractTestBag.java
+++ b/src/test/org/apache/commons/collections/bag/AbstractTestBag.java
@@ -475,7 +475,7 @@ public abstract class AbstractTestBag extends AbstractTestObject {
 
     /**
      * Compare the current serialized form of the Bag
-     * against the canonical version in CVS.
+     * against the canonical version in SVN.
      */
     public void testEmptyBagCompatibility() throws IOException, ClassNotFoundException {
         // test to make sure the canonical form has been preserved
@@ -489,7 +489,7 @@ public abstract class AbstractTestBag extends AbstractTestObject {
 
     /**
      * Compare the current serialized form of the Bag
-     * against the canonical version in CVS.
+     * against the canonical version in SVN.
      */
     public void testFullBagCompatibility() throws IOException, ClassNotFoundException {
         // test to make sure the canonical form has been preserved
diff --git a/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java b/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java
index e03c2ec1f..645628fd5 100644
--- a/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java
@@ -193,7 +193,7 @@ public abstract class AbstractTestComparator extends AbstractTestObject {
 
     /**
      * Compare the current serialized form of the Comparator
-     * against the canonical version in CVS.
+     * against the canonical version in SVN.
      */
     public void testComparatorCompatibility() throws IOException, ClassNotFoundException {
         if(!skipSerializedCanonicalTests()) {
@@ -211,7 +211,7 @@ public abstract class AbstractTestComparator extends AbstractTestObject {
             		String fileName = getCanonicalComparatorName(comparator);
             		writeExternalFormToDisk((Serializable) comparator, fileName);
             		fail("Serialized form could not be found.  A serialized version " +
-            		     "has now been written (and should be added to CVS): " + fileName);
+            		     "has now been written (and should be added to SVN): " + fileName);
                 } else {
                     fail("The Serialized form could be located to test serialization " +
                         "compatibility: " + exception.getMessage());
diff --git a/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java b/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
index 894ee6857..4b5b03943 100644
--- a/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
@@ -51,7 +51,7 @@ public class TestReverseComparator extends AbstractTestComparator {
      * Comparator.  The resulting comparator should
      * sort according to natural Order.  (Note: we wrap
      * a Comparator taken from the JDK so that we can
-     * save a "canonical" form in CVS.
+     * save a "canonical" form in SVN.
      * 
      * @return Comparator that returns "natural" order
      */
diff --git a/src/test/org/apache/commons/collections/list/AbstractTestList.java b/src/test/org/apache/commons/collections/list/AbstractTestList.java
index 7a2f333b0..4659c4826 100644
--- a/src/test/org/apache/commons/collections/list/AbstractTestList.java
+++ b/src/test/org/apache/commons/collections/list/AbstractTestList.java
@@ -1060,7 +1060,7 @@ public abstract class AbstractTestList extends AbstractTestCollection {
 
     /**
      * Compare the current serialized form of the List
-     * against the canonical version in CVS.
+     * against the canonical version in SVN.
      */
     public void testEmptyListCompatibility() throws IOException, ClassNotFoundException {
         /**
@@ -1082,7 +1082,7 @@ public abstract class AbstractTestList extends AbstractTestCollection {
 
     /**
      * Compare the current serialized form of the List
-     * against the canonical version in CVS.
+     * against the canonical version in SVN.
      */
     public void testFullListCompatibility() throws IOException, ClassNotFoundException {
         /**
diff --git a/src/test/org/apache/commons/collections/map/AbstractTestMap.java b/src/test/org/apache/commons/collections/map/AbstractTestMap.java
index 25a251b45..0175f4748 100644
--- a/src/test/org/apache/commons/collections/map/AbstractTestMap.java
+++ b/src/test/org/apache/commons/collections/map/AbstractTestMap.java
@@ -726,7 +726,7 @@ public abstract class AbstractTestMap extends AbstractTestObject {
 
     /**
      * Compare the current serialized form of the Map
-     * against the canonical version in CVS.
+     * against the canonical version in SVN.
      */
     public void testEmptyMapCompatibility() throws Exception {
         /**
@@ -747,7 +747,7 @@ public abstract class AbstractTestMap extends AbstractTestObject {
 
     /**
      * Compare the current serialized form of the Map
-     * against the canonical version in CVS.
+     * against the canonical version in SVN.
      */
     public void testFullMapCompatibility() throws Exception {
         /**
diff --git a/src/test/org/apache/commons/collections/map/TestIdentityMap.java b/src/test/org/apache/commons/collections/map/TestIdentityMap.java
index b1e6c4eb2..cfa30bbe2 100644
--- a/src/test/org/apache/commons/collections/map/TestIdentityMap.java
+++ b/src/test/org/apache/commons/collections/map/TestIdentityMap.java
@@ -115,7 +115,7 @@ public class TestIdentityMap extends AbstractTestObject {
     
     /**
      * Compare the current serialized form of the Map
-     * against the canonical version in CVS.
+     * against the canonical version in SVN.
      */
     public void testEmptyMapCompatibility() throws IOException, ClassNotFoundException {
         // test to make sure the canonical form has been preserved