diff --git a/src/gr/spinellis/umlgraph/test/TestUtils.java b/src/gr/spinellis/umlgraph/test/TestUtils.java
index fc5283d..ffc9b42 100644
--- a/src/gr/spinellis/umlgraph/test/TestUtils.java
+++ b/src/gr/spinellis/umlgraph/test/TestUtils.java
@@ -115,11 +115,11 @@ public class TestUtils {
 
     /**
          * Deletes the content of the folder, eventually in a recursive way (but
-         * avoids deleting eventual .cvsignore files)
+         * avoids deleting eventual .cvsignore files and CVS folders)
          */
     public static void cleanFolder(File folder, boolean recurse) {
 	for (File f : folder.listFiles()) {
-	    if (f.isDirectory()) {
+	    if (f.isDirectory() && !f.getName().equals("CVS")) {
 		if (recurse) {
 		    cleanFolder(f, true);
 		    if (f.list().length == 0)
diff --git a/src/org/umlgraph/test/TestUtils.java b/src/org/umlgraph/test/TestUtils.java
index fc5283d..ffc9b42 100644
--- a/src/org/umlgraph/test/TestUtils.java
+++ b/src/org/umlgraph/test/TestUtils.java
@@ -115,11 +115,11 @@ public class TestUtils {
 
     /**
          * Deletes the content of the folder, eventually in a recursive way (but
-         * avoids deleting eventual .cvsignore files)
+         * avoids deleting eventual .cvsignore files and CVS folders)
          */
     public static void cleanFolder(File folder, boolean recurse) {
 	for (File f : folder.listFiles()) {
-	    if (f.isDirectory()) {
+	    if (f.isDirectory() && !f.getName().equals("CVS")) {
 		if (recurse) {
 		    cleanFolder(f, true);
 		    if (f.list().length == 0)