diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java
index 5aee60f8e536..43083a05cc42 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,6 +119,7 @@ public class GeneralToSMTRunnerEventsConvertor extends GeneralTestEventsProcesso
     myTreeBuildBeforeStart = true;
     myBuildTreeRunnables.add(() -> {
       final SMTestProxy testProxy = new SMTestProxy(testName, false, locationHint);
+      testProxy.setTreeBuildBeforeStart();
       if (myLocator != null) {
         testProxy.setLocator(myLocator);
       }
@@ -136,6 +137,7 @@ public class GeneralToSMTRunnerEventsConvertor extends GeneralTestEventsProcesso
     myBuildTreeRunnables.add(() -> {
       final SMTestProxy parentSuite = getCurrentSuite();
       final SMTestProxy newSuite = new SMTestProxy(suiteName, true, locationHint);
+      newSuite.setTreeBuildBeforeStart();
       if (myLocator != null) {
         newSuite.setLocator(myLocator);
       }