diff --git a/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCaseBase.java b/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCaseBase.java
index f44d764a2f0a..3b3646111cfc 100644
--- a/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCaseBase.java
+++ b/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCaseBase.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.keymap;
 
+import com.intellij.execution.ExecutorRegistry;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.keymap.Keymap;
 import com.intellij.openapi.keymap.KeymapManager;
@@ -238,6 +239,12 @@ public abstract class KeymapsTestCaseBase extends LightPlatformTestCase {
     }
   }
 
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    ExecutorRegistry.getInstance();
+  }
+
   @NotNull
   private Map<String, Map<Shortcut, List<String>>> collectExpectedDuplicatedShortcuts() {
     Map<String, Map<String, List<String>>> knownDuplicates = getKnownDuplicates();
@@ -441,11 +448,8 @@ public abstract class KeymapsTestCaseBase extends LightPlatformTestCase {
 
       for (String actionId : keymapImpl.getActionIds()) {
         if (knownBoundActions.contains(actionId)) continue;
-
-        Shortcut[] ownShortcuts = keymapImpl.getOwnShortcuts(actionId);
         boolean isBound = keymapImpl.isActionBound(actionId);
-
-        if (isBound && ownShortcuts != null) {
+        if (isBound) {
           unboundActionsWithShortcut.add(actionId);
         }
       }
diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
index 9b45ab40e87a..74aec3940450 100644
--- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
@@ -296,7 +296,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
   @NotNull
   public static Pair.NonNull<Project, Module> doSetup(@NotNull LightProjectDescriptor descriptor,
                                                       @NotNull LocalInspectionTool[] localInspectionTools,
-                                                      @NotNull Disposable parentDisposable) throws Exception {
+                                                      @NotNull Disposable parentDisposable) {
     assertNull("Previous test " + ourTestCase + " hasn't called tearDown(). Probably overridden without super call.", ourTestCase);
     IdeaLogger.ourErrorsOccurred = null;
     ApplicationManager.getApplication().assertIsDispatchThread();