diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/DiscoveredTestsTree.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/DiscoveredTestsTree.java
index 8cbffef6b2cc..3fc8b63f9730 100644
--- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/DiscoveredTestsTree.java
+++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/DiscoveredTestsTree.java
@@ -89,7 +89,10 @@ class DiscoveredTestsTree extends Tree implements DataProvider {
       protected void process(TreeModelEvent event, EventType type) {
         if (!myAlreadyDone && myModel.getTestCount() != 0) {
           myAlreadyDone = true;
-          EdtInvocationManager.getInstance().invokeLater(() -> TreeUtil.selectFirstNode(DiscoveredTestsTree.this));
+          EdtInvocationManager.getInstance().invokeLater(() -> {
+            TreeUtil.collapseAll(DiscoveredTestsTree.this, 0);
+            TreeUtil.selectFirstNode(DiscoveredTestsTree.this);
+          });
         }
       }
     });