diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index 5d4ed90f2c78..79334b7af0a5 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -1318,6 +1318,7 @@ public class BuildManager implements Disposable {
 
   public void stopListening() {
     myChannelRegistrar.close();
+    myListenPort = -1;
   }
 
   private int startListening() throws Exception {
diff --git a/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java b/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java
index ff9db05fd70a..af21e18f47eb 100644
--- a/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java
+++ b/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java
@@ -115,6 +115,7 @@ public class CompilerTestUtil {
               ModuleRootModificationUtil.setModuleSdk(module, internalJdk);
             }
             BuildManager.getInstance().clearState(project);
+            BuildManager.getInstance().stopListening();
           }
         });
       }