diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java
index 4b916b083966..3acbbc27160d 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java
@@ -76,7 +76,7 @@ public class FileWatcherTest extends PlatformLangTestCase {
   };
   private final Object myWaiter = new Object();
   private int myTimeout = NATIVE_PROCESS_DELAY;
-  private final List<VFileEvent> myEvents = new ArrayList<VFileEvent>();
+  private final List<VFileEvent> myEvents = ContainerUtil.createLockFreeCopyOnWriteList();
 
   @Override
   protected void setUp() throws Exception {
@@ -288,11 +288,11 @@ public class FileWatcherTest extends PlatformLangTestCase {
 
   public void testDirectoryOverlapping() throws Exception {
     final File topDir = FileUtil.createTempDirectory("top.", null);
-    final File fileInTopDir = FileUtil.createTempFile(topDir, "file1.", ".txt");
-    final File subDir = FileUtil.createTempDirectory(topDir, "sub.", null);
-    final File fileInSubDir = FileUtil.createTempFile(subDir, "file2.", ".txt");
+    final File fileInTopDir = new File(topDir, "file1.txt"); FileUtil.createIfNotExists(fileInTopDir);
+    final File subDir = new File(topDir, "sub");  FileUtil.createDirectory(subDir);
+    final File fileInSubDir = new File(subDir, "file2.txt"); FileUtil.createIfNotExists(fileInSubDir);
     final File sideDir = FileUtil.createTempDirectory("side.", null);
-    final File fileInSideDir = FileUtil.createTempFile(sideDir, "file3.", ".txt");
+    final File fileInSideDir = new File(sideDir, "file3.txt"); FileUtil.createIfNotExists(fileInSideDir);
     refresh(topDir);
     refresh(sideDir);