diff --git a/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java b/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java
index af21e18f47eb..95d71bc9bec5 100644
--- a/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java
+++ b/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java
@@ -36,6 +36,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 
 import java.util.List;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author nik
@@ -115,7 +117,13 @@ public class CompilerTestUtil {
               ModuleRootModificationUtil.setModuleSdk(module, internalJdk);
             }
             BuildManager.getInstance().clearState(project);
-            BuildManager.getInstance().stopListening();
+            Future<?> future = BuildManager.getInstance().stopListening();
+            try {
+              future.get(100, TimeUnit.SECONDS);
+            }
+            catch (Exception e) {
+              throw new RuntimeException(e);
+            }
           }
         });
       }