Index: lams_common/test/java/org/lamsfoundation/lams/util/zipfile/TestZipFileUtil.java
===================================================================
diff -u -rfb87f900acda9018b36e3e4fbb3ed04d4ac67805 -r2ae38b64d36843d58a04da0d84600ca000fd17aa
--- lams_common/test/java/org/lamsfoundation/lams/util/zipfile/TestZipFileUtil.java	(.../TestZipFileUtil.java)	(revision fb87f900acda9018b36e3e4fbb3ed04d4ac67805)
+++ lams_common/test/java/org/lamsfoundation/lams/util/zipfile/TestZipFileUtil.java	(.../TestZipFileUtil.java)	(revision 2ae38b64d36843d58a04da0d84600ca000fd17aa)
@@ -142,12 +142,16 @@
      */
     public void testCleanupOldFiles() {
 
-		Calendar foureDaysAgo = new GregorianCalendar();
-		foureDaysAgo.add(Calendar.DAY_OF_MONTH,-4);
-		long fourDaysAgoMilliseconds = foureDaysAgo.getTimeInMillis();
 
         try {
-            // create the three directories and stick a file in each directory to 
+            // clean up any old directories so they don't interfere with test.
+            ZipFileUtil.cleanupOldFiles(5);
+            
+    		Calendar foureDaysAgo = new GregorianCalendar();
+    		foureDaysAgo.add(Calendar.DAY_OF_MONTH,-4);
+    		long fourDaysAgoMilliseconds = foureDaysAgo.getTimeInMillis();
+
+    		// create the three directories and stick a file in each directory to 
             // test the recursive delete.
             String testDirToDelete = ZipFileUtil.prepareTempDirectory("todelete.zip");
             writeFile(testDirToDelete, testFilename, testFileContents);