diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/QueueingPathRemoverServiceTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/QueueingPathRemoverServiceTest.java
index 13da6f8b287264a114fd5875656714e252610378..e72f0aca3a72b7aaded9c79c77f290e5a5e859c3 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/QueueingPathRemoverServiceTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/QueueingPathRemoverServiceTest.java
@@ -74,13 +74,17 @@ public class QueueingPathRemoverServiceTest
     @BeforeMethod
     public void cleanUp() throws IOException
     {
-        for (File f : workingDirectory.listFiles(SHREDDER_FILTER))
+        File[] files = workingDirectory.listFiles(SHREDDER_FILTER);
+        if (files != null)
         {
-            for (int i = 0; f.exists() && i < 3; i++)
+            for (File f : files)
             {
-                FileUtilities.deleteRecursively(f);
+                for (int i = 0; f.exists() && i < 3; i++)
+                {
+                    FileUtilities.deleteRecursively(f);
+                }
+                assertFalse(f.exists());
             }
-            assertFalse(f.exists());
         }
     }