diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java
index 8373539c4eb5..eb38a1a2b0e4 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java
@@ -220,6 +220,9 @@ public class SMTestRunnerConnectionUtil {
     processHandler.addProcessListener(new ProcessAdapter() {
       @Override
       public void processTerminated(final ProcessEvent event) {
+        outputConsumer.flushBufferBeforeTerminating();
+        eventsProcessor.onFinishTesting();
+
         Disposer.dispose(eventsProcessor);
         Disposer.dispose(outputConsumer);
       }
@@ -231,8 +234,6 @@ public class SMTestRunnerConnectionUtil {
 
       @Override
       public void processWillTerminate(ProcessEvent event, boolean willBeDestroyed) {
-        outputConsumer.flushBufferBeforeTerminating();
-        eventsProcessor.onFinishTesting();
       }
 
       @Override
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerEventsAdapter.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerEventsAdapter.java
index eab148228df1..250b55e39c40 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerEventsAdapter.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerEventsAdapter.java
@@ -31,8 +31,6 @@ public class SMTRunnerEventsAdapter implements SMTRunnerEventsListener {
   public void onTestFailed(@NotNull final SMTestProxy test) {}
   public void onTestIgnored(@NotNull final SMTestProxy test) {}
 
-  public void onFinish() {}
-
   public void onSuiteStarted(@NotNull final SMTestProxy suite) {}
   public void onSuiteFinished(@NotNull final SMTestProxy suite) {}
 
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerEventsListener.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerEventsListener.java
index cec0b91a3146..74d321254d43 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerEventsListener.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerEventsListener.java
@@ -44,8 +44,6 @@ public interface SMTRunnerEventsListener {
   void onTestFailed(@NotNull SMTestProxy test);
   void onTestIgnored(@NotNull SMTestProxy test);
 
-  void onFinish();
-
   void onSuiteFinished(@NotNull SMTestProxy suite);
   void onSuiteStarted(@NotNull SMTestProxy suite);
 
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerConsoleView.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerConsoleView.java
index 8312b0f3b88a..a91d9688b322 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerConsoleView.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerConsoleView.java
@@ -17,9 +17,6 @@ package com.intellij.execution.testframework.sm.runner.ui;
 
 import com.intellij.execution.configurations.ConfigurationPerRunnerSettings;
 import com.intellij.execution.configurations.RunnerSettings;
-import com.intellij.execution.process.ProcessEvent;
-import com.intellij.execution.process.ProcessHandler;
-import com.intellij.execution.process.ProcessListener;
 import com.intellij.execution.testframework.TestConsoleProperties;
 import com.intellij.execution.testframework.TestFrameworkRunningModel;
 import com.intellij.execution.testframework.sm.SMRunnerUtil;
@@ -27,7 +24,6 @@ import com.intellij.execution.testframework.sm.runner.SMTestProxy;
 import com.intellij.execution.testframework.ui.BaseTestsOutputConsoleView;
 import com.intellij.execution.testframework.ui.TestResultsPanel;
 import com.intellij.openapi.application.ModalityState;
-import com.intellij.openapi.util.Key;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -110,26 +106,4 @@ public class SMTRunnerConsoleView extends BaseTestsOutputConsoleView {
   public SMTestRunnerResultsForm getResultsViewer() {
     return myResultsViewer;
   }
-
-  public void attachToProcess(final ProcessHandler processHandler) {
-    super.attachToProcess(processHandler);
-    if (processHandler == null) {
-      return;
-    }
-    processHandler.addProcessListener(new ProcessListener() {
-      @Override
-      public void startNotified(ProcessEvent event) {}
-
-      @Override
-      public void processTerminated(ProcessEvent event) {
-        myResultsViewer.onFinish();
-      }
-
-      @Override
-      public void processWillTerminate(ProcessEvent event, boolean willBeDestroyed) {}
-
-      @Override
-      public void onTextAvailable(ProcessEvent event, Key outputType) {}
-    });
-  }
 }
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java
index cb5af8abc46c..2a673369b76d 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java
@@ -236,6 +236,11 @@ public class SMTestRunnerResultsForm extends TestResultsPanel implements TestFra
     LvcsHelper.addLabel(this);
 
     fireOnTestingFinished();
+
+    SMTestProxy root = getTestsRootNode();
+    if (root != null) {
+      selectAndNotify(root);
+    }
   }
 
   public void onTestsCountInSuite(final int count) {
@@ -264,14 +269,6 @@ public class SMTestRunnerResultsForm extends TestResultsPanel implements TestFra
     //Do nothing
   }
 
-  @Override
-  public void onFinish() {
-    SMTestProxy root = getTestsRootNode();
-    if (root != null) {
-      selectAndNotify(root);
-    }
-  }
-
   /**
    * Adds suite to tree
    * Suite proxy should be initialized, proxy parent must be some suite (already added to tree)