diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralIdBasedToSMTRunnerEventsConvertor.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralIdBasedToSMTRunnerEventsConvertor.java
index 80998a056091..bd298b34cc22 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralIdBasedToSMTRunnerEventsConvertor.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralIdBasedToSMTRunnerEventsConvertor.java
@@ -137,6 +137,7 @@ public class GeneralIdBasedToSMTRunnerEventsConvertor extends GeneralTestEventsP
     if (node != null) {
       if (node.getState() == State.REGISTERED && startedNodeEvent.isRunning()) {
         node.setState(State.RUNNING);
+        myRunningNodes.add(node);
         node.getProxy().setStarted();
         if (suite) {
           fireOnSuiteStarted(node.getProxy());
@@ -172,13 +173,13 @@ public class GeneralIdBasedToSMTRunnerEventsConvertor extends GeneralTestEventsP
     State initialState = startedNodeEvent.isRunning() ? State.RUNNING : State.REGISTERED;
     node = new Node(startedNodeEvent.getId(), parentNode, childProxy, initialState);
     myNodeByIdMap.put(startedNodeEvent.getId(), node);
-    myRunningNodes.add(node);
     if (myLocator != null) {
       childProxy.setLocator(myLocator);
     }
     parentNode.getProxy().addChild(childProxy);
 
     if (node.getState() == State.RUNNING) {
+      myRunningNodes.add(node);
       // progress started
       childProxy.setStarted();
       if (suite) {