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 38b333e3125a..c224cf46e66c 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 {
             private boolean myFoundFilesToMake = false;
             @Override
             public void compilationFinished(boolean aborted, int errors, int warnings, CompileContext compileContext) {
+              if (!myFoundFilesToMake) return;
               if (errors == 0) {
                 restartAllAutoTests(0);
               }
@@ -66,7 +67,6 @@ public class JavaAutoRunManager extends AbstractAutoTestManager {
 
             @Override
             public void automakeCompilationFinished(int errors, int warnings, CompileContext compileContext) {
-              if (!myFoundFilesToMake) return;
               compilationFinished(false, errors, warnings, compileContext);
             }