diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
index 2e1bf628e5bf..e479c5c94a25 100644
--- a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
@@ -47,7 +47,7 @@ public class ExecutorRegistryImpl extends ExecutorRegistry {
   private static final Logger LOG = Logger.getInstance(ExecutorRegistryImpl.class);
 
   @NonNls public static final String RUNNERS_GROUP = "RunnerActions";
-  @NonNls public static final String RUN_CONTEXT_GROUP = "RunContextGroup";
+  @NonNls public static final String RUN_CONTEXT_GROUP = "RunContextGroupInner";
 
   private List<Executor> myExecutors = new ArrayList<Executor>();
   private ActionManager myActionManager;
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index 1f043ec05433..2589cbd4903e 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -12,6 +12,9 @@
     <action id="ChooseDebugConfiguration" class="com.intellij.execution.actions.ChooseDebugConfigurationPopupAction" text="Debug..." description="Choose and debug configuration" icon="AllIcons.General.Debug"/>
 
     <group id="RunContextGroup" popup="false">
+      <!-- A dynamic group filled with executor actions -->
+      <group id="RunContextGroupInner"/>
+      <separator/>
       <action id="CreateRunConfiguration" class="com.intellij.execution.actions.CreateAction"/>
     </group>
     <group id="RunContextPopupGroup" popup="false">
@@ -849,7 +852,6 @@
 
     <group id="TestTreePopupMenu">
       <reference ref="RunContextGroup"/>
-      <separator/>
       <reference ref="EditSource"/>
       <reference ref="ViewSource"/>
     </group>
diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml
index 131ebeddc940..1730a1cef508 100644
--- a/plugins/devkit/resources/META-INF/plugin.xml
+++ b/plugins/devkit/resources/META-INF/plugin.xml
@@ -209,14 +209,11 @@
     <action id="TestData.Navigate"
             class="org.jetbrains.idea.devkit.testAssistant.NavigateToTestDataAction"
             text="Navigate to testdata" use-shortcut-of="GotoRelated">
+      <add-to-group anchor="last" group-id="TestTreePopupMenu"/>
     </action>
     <action id="DumpCleanTestData" internal="true" class="org.jetbrains.idea.devkit.internal.DumpCleanHighlightingTestdataAction">
       <add-to-group group-id="Internal.Dump"/>
     </action>
-    <group>
-      <reference id="TestData.Navigate"/>
-      <add-to-group anchor="first" group-id="TestTreePopupMenu"/>
-    </group>
   </actions>
 
 </idea-plugin>
diff --git a/plugins/junit/src/META-INF/plugin.xml b/plugins/junit/src/META-INF/plugin.xml
index a80c2bde3994..52e8d652e22f 100644
--- a/plugins/junit/src/META-INF/plugin.xml
+++ b/plugins/junit/src/META-INF/plugin.xml
@@ -78,7 +78,7 @@
     </group>
     <group>
       <action class="com.intellij.execution.junit.JUnitAddToTestsPatternAction" id="AddToISuite" text="Add to pattern suite"/>
-      <add-to-group anchor="first" group-id="RunContextGroup"/>
+      <add-to-group anchor="last" group-id="RunContextGroup"/>
     </group>
   </actions>
 </idea-plugin>
diff --git a/resources/src/idea/RichPlatformActions.xml b/resources/src/idea/RichPlatformActions.xml
index ab2573813a96..4c82664c9e6f 100644
--- a/resources/src/idea/RichPlatformActions.xml
+++ b/resources/src/idea/RichPlatformActions.xml
@@ -341,11 +341,7 @@
     </group>
 
     <group id="TestStatisticsTablePopupMenu">
-      <reference ref="RunContextGroup"/>
-      <separator/>
-      <reference ref="EditSource"/>
-      <reference ref="ViewSource"/>
-      <separator/>
+      <reference ref="TestTreePopupMenu"/>
       <action id="Testing.SelectInTree" class="com.intellij.execution.testframework.actions.SelectInTreeAction"
               text="Select in Tree" description="Navigate from tests statistics to tests tree"/>
     </group>