diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
index c09216c8e727..33847fc44028 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
@@ -361,15 +361,15 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
 
   @TestOnly
   public synchronized void cleanupCachedChildren(Set<VirtualFile> survivors) {
-    if (survivors.contains(this)) {
+    /*if (survivors.contains(this)) {
       for (VirtualFile file : getCachedChildren()) {
         if (file instanceof VirtualDirectoryImpl) {
           ((VirtualDirectoryImpl)file).cleanupCachedChildren(survivors);
         }
       }
     } else {
-      myChildren = null;
-    }
+    }*/
+    myChildren = null;
   }
 
   public InputStream getInputStream() throws IOException {
diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
index 802273fc7c08..7f6f7110b0b0 100644
--- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
@@ -75,6 +75,7 @@ import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -272,7 +273,7 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
     try {
       LocalFileSystemImpl localFileSystem = (LocalFileSystemImpl)LocalFileSystem.getInstance();
       if (localFileSystem != null) {
-        localFileSystem.cleanupForNextTest(eternallyLivingFiles());
+        localFileSystem.cleanupForNextTest(Collections.<VirtualFile>emptySet());
       }
     }
     catch (IOException e) {