diff --git a/java/execution/impl/src/com/intellij/execution/testframework/JavaAwareTestConsoleProperties.java b/java/execution/impl/src/com/intellij/execution/testframework/JavaAwareTestConsoleProperties.java
index d49624954ff0..7337bb0fde95 100644
--- a/java/execution/impl/src/com/intellij/execution/testframework/JavaAwareTestConsoleProperties.java
+++ b/java/execution/impl/src/com/intellij/execution/testframework/JavaAwareTestConsoleProperties.java
@@ -64,6 +64,11 @@ public abstract class JavaAwareTestConsoleProperties<T extends ModuleBasedConfig
     return TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION;
   }
 
+  @Override
+  public boolean hideTreeRootIfNotEmpty() {
+    return true;
+  }
+
   @Override
   public boolean fixEmptySuite() {
     return ResetConfigurationModuleAdapter.tryWithAnotherModule(getConfiguration(), isDebug());
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 550614e82a05..e79fd472ada2 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
@@ -156,7 +156,17 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
       }
     });
 
-    final SMTRunnerTreeStructure structure = new SMTRunnerTreeStructure(myProject, myTestsRootNode);
+    final SMTRunnerTreeStructure structure = new SMTRunnerTreeStructure(myProject, myTestsRootNode) {
+      @Override
+      public Object[] getChildElements(Object element) {
+        final Object[] children = super.getChildElements(element);
+        if (element == myTestsRootNode && children.length > 0 && 
+            myProperties.hideTreeRootIfNotEmpty()) {
+          myTreeView.setRootVisible(false);
+        }
+        return children;
+      }
+    };
     myTreeBuilder = new SMTRunnerTreeBuilder(myTreeView, structure);
     myTreeBuilder.setTestsComparator(TestConsoleProperties.SORT_ALPHABETICALLY.value(myProperties));
     Disposer.register(this, myTreeBuilder);
diff --git a/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java b/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java
index b0661e1670cb..6716492fdeb3 100644
--- a/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java
+++ b/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java
@@ -204,4 +204,8 @@ public abstract class TestConsoleProperties extends StoringPropertyContainer imp
   protected int getSelectionMode() {
     return TreeSelectionModel.SINGLE_TREE_SELECTION;
   }
+
+  public boolean hideTreeRootIfNotEmpty() {
+    return false;
+  }
 }