diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
index 841abd04876b..a16ef39d1168 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
@@ -1438,6 +1438,7 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
   }
 
   public void testReactivityPerformance() throws Throwable {
+    List<Thread> watchers = new ArrayList<>();
     @NonNls String filePath = "/psi/resolve/Thinlet.java";
     configureByFile(filePath);
     type(' ');
@@ -1463,7 +1464,7 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
         }
         final AtomicLong typingStart = new AtomicLong();
         final DaemonProgressIndicator progress = codeAnalyzer.getUpdateProgress();
-        new Thread("reactivity watcher") {
+        Thread watcher = new Thread("reactivity watcher") {
           @Override
           public void run() {
             while (true) {
@@ -1481,7 +1482,11 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
               long now = System.currentTimeMillis();
               if (now - start1 > 500) {
                 // too long, see WTF
-                PerformanceWatcher.dumpThreadsToConsole("Too long interrupt: " + (now - start1) + "; Progress canceled=" + progress.isCanceled() + "\n----------------------------");
+                PerformanceWatcher.dumpThreadsToConsole("Too long interrupt: " +
+                                                        (now - start1) +
+                                                        "; Progress canceled=" +
+                                                        progress.isCanceled() +
+                                                        "\n----------------------------");
                 System.out.println("----all threads---");
                 for (Thread thread : Thread.getAllStackTraces().keySet()) {
                   boolean canceled = CoreProgressManager.isCanceledThread(thread);
@@ -1494,7 +1499,9 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
               }
             }
           }
-        }.start();
+        };
+        watcher.start();
+        watchers.add(watcher);
         typingStart.set(System.currentTimeMillis());
         type(' ');
         typingStart.set(-1);
@@ -1523,6 +1530,9 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
     long ave = ArrayUtil.averageAmongMedians(interruptTimes, 3);
     System.out.println("Average among the N/3 median times: " + ave + "ms");
     assertTrue(ave < 300);
+    for (Thread watcher : watchers) {
+      watcher.join();
+    }
   }
 
   public void testTypingLatencyPerformance() throws Throwable {
diff --git a/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java b/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
index 36e813cf076e..42ede414582f 100644
--- a/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
+++ b/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
@@ -901,6 +901,7 @@ public class FindManagerTest extends DaemonAnalyzerTestCase {
     thread.join(500);
     assertNotNull(result.get());
     assertTrue(!result.get().isStringFound());
+    thread.join();
   }
 
   private void doTestRegexpReplace(String initialText, String searchString, String replaceString, String expectedResult) {
diff --git a/platform/dvcs-impl/testSrc/com.intellij.dvcs/VcsRepositoryManagerTest.java b/platform/dvcs-impl/testSrc/com.intellij.dvcs/VcsRepositoryManagerTest.java
index 64c222910ad7..b186dd8f92ce 100644
--- a/platform/dvcs-impl/testSrc/com.intellij.dvcs/VcsRepositoryManagerTest.java
+++ b/platform/dvcs-impl/testSrc/com.intellij.dvcs/VcsRepositoryManagerTest.java
@@ -132,15 +132,19 @@ public class VcsRepositoryManagerTest extends UsefulTestCase {
         return !myGlobalRepositoryManager.getRepositories().isEmpty();
       }
     });
-    new Thread(modifyRepositoryMapping,"vcs modify").start();
+    Thread modify = new Thread(modifyRepositoryMapping,"vcs modify");
+    modify.start();
 
     //wait until modification starts
     assertTrue(LOCK_ERROR_TEXT, READY_TO_READ.await(1, TimeUnit.SECONDS));
 
-    new Thread(readExistingRepo,"vcs read").start();
+    Thread read = new Thread(readExistingRepo,"vcs read");
+    read.start();
     assertNotNull(readExistingRepo.get(1, TimeUnit.SECONDS));
     CONTINUE_MODIFY.countDown();
     assertTrue(modifyRepositoryMapping.get(1, TimeUnit.SECONDS));
+    read.join();
+    modify.join();
   }
 
   @NotNull