diff --git a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
index 8dc7ce7eaa56..7781f61f598c 100644
--- a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
+++ b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
@@ -18,6 +18,7 @@ package com.intellij.ide.wizard;
 import com.intellij.CommonBundle;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.application.ApplicationInfo;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.help.HelpManager;
 import com.intellij.openapi.project.Project;
@@ -465,7 +466,7 @@ public abstract class AbstractWizard<T extends Step> extends DialogWrapper {
       myNextButton.setEnabled(canGoNext());
     }
 
-    if (myNextButton.isEnabled()) {
+    if (myNextButton.isEnabled() && !ApplicationManager.getApplication().isUnitTestMode()) {
       getRootPane().setDefaultButton(myNextButton);
     }
 
diff --git a/platform/testFramework/src/com/intellij/testFramework/TestActionEvent.java b/platform/testFramework/src/com/intellij/testFramework/TestActionEvent.java
index d367c557cf44..764e80453ad6 100644
--- a/platform/testFramework/src/com/intellij/testFramework/TestActionEvent.java
+++ b/platform/testFramework/src/com/intellij/testFramework/TestActionEvent.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.testFramework;
 
+import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -30,4 +31,8 @@ public class TestActionEvent extends AnActionEvent {
                          @NotNull AnAction action) {
     super(null, dataContext, "", action.getTemplatePresentation(), ActionManager.getInstance(), 0);
   }
+
+  public TestActionEvent(@NotNull AnAction action) {
+    this(DataManager.getInstance().getDataContext(), action);
+  }
 }
diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
index b894ed124586..933eb4e26ee9 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
@@ -45,7 +45,6 @@ import com.intellij.find.FindManager;
 import com.intellij.find.findUsages.FindUsagesHandler;
 import com.intellij.find.findUsages.FindUsagesOptions;
 import com.intellij.find.impl.FindManagerImpl;
-import com.intellij.ide.DataManager;
 import com.intellij.ide.startup.StartupManagerEx;
 import com.intellij.ide.startup.impl.StartupManagerImpl;
 import com.intellij.ide.structureView.StructureViewBuilder;
@@ -789,8 +788,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
 
   @Override
   public Presentation testAction(AnAction action) {
-    DataContext context = DataManager.getInstance().getDataContext();
-    TestActionEvent e = new TestActionEvent(context, action);
+    TestActionEvent e = new TestActionEvent(action);
     action.beforeActionPerformedUpdate(e);
     if (e.getPresentation().isEnabled() && e.getPresentation().isVisible()) {
       action.actionPerformed(e);
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskUiTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskUiTest.java
index d55cdacd97b0..afeadb7f9c71 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskUiTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskUiTest.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.tasks;
 
-import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.tasks.actions.SwitchTaskCombo;
@@ -66,7 +65,7 @@ public class TaskUiTest extends CodeInsightFixtureTestCase {
   }
 
   private static Presentation doTest(AnAction action) {
-    TestActionEvent event = new TestActionEvent(DataManager.getInstance().getDataContext(), action);
+    TestActionEvent event = new TestActionEvent(action);
     action.update(event);
     return event.getPresentation();
   }