diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/JavaAutoRunManager.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/JavaAutoRunManager.java
index 6d731e84db8f..a74b8ea63b7c 100644
--- a/java/execution/impl/src/com/intellij/execution/testDiscovery/JavaAutoRunManager.java
+++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/JavaAutoRunManager.java
@@ -57,6 +57,7 @@ public class JavaAutoRunManager extends AbstractAutoTestManager {
         }
 
         myEventDisposable = Disposer.newDisposable();
+        Disposer.register(project, myEventDisposable);
         project.getMessageBus().connect(myEventDisposable).subscribe(CompilerTopics.COMPILATION_STATUS, new CompilationStatusListener() {
           private boolean myFoundFilesToMake = false;