diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AbstractProjectWizard.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AbstractProjectWizard.java
index 4afaad08b5ba..0b83da74e9f5 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AbstractProjectWizard.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AbstractProjectWizard.java
@@ -154,6 +154,11 @@ public abstract class AbstractProjectWizard extends AbstractWizard<ModuleWizardS
 
   @Override
   protected final void doOKAction() {
+    if (!doFinishAction()) return;
+    super.doOKAction();
+  }
+
+  public boolean doFinishAction() {
     int idx = getCurrentStep();
     try {
       do {
@@ -162,7 +167,7 @@ public abstract class AbstractProjectWizard extends AbstractWizard<ModuleWizardS
           step.updateStep();
         }
         if (!commitStepData(step)) {
-          return;
+          return false;
         }
         step.onStepLeaving();
         try {
@@ -170,18 +175,19 @@ public abstract class AbstractProjectWizard extends AbstractWizard<ModuleWizardS
         }
         catch (CommitStepException e) {
           handleCommitException(e);
-          return;
+          return false;
         }
         if (!isLastStep(idx)) {
           idx = getNextStep(idx);
-        } else {
+        }
+        else {
           for (ModuleWizardStep wizardStep : mySteps) {
             try {
               wizardStep.onWizardFinished();
             }
             catch (CommitStepException e) {
               handleCommitException(e);
-              return;
+              return false;
             }
           }
           break;
@@ -192,7 +198,7 @@ public abstract class AbstractProjectWizard extends AbstractWizard<ModuleWizardS
       myCurrentStep = idx;
       updateStep();
     }
-    super.doOKAction();
+    return true;
   }
 
   private void handleCommitException(CommitStepException e) {
diff --git a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
index 2050b01ccbb2..25751535842a 100644
--- a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
+++ b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
@@ -58,7 +58,6 @@ import java.util.List;
  */
 @SuppressWarnings("unchecked")
 public abstract class ProjectWizardTestCase<T extends AbstractProjectWizard> extends PlatformTestCase {
-
   protected static final String DEFAULT_SDK = "default";
   protected final List<Sdk> mySdks = new ArrayList<Sdk>();
   protected T myWizard;
@@ -133,6 +132,7 @@ public abstract class ProjectWizardTestCase<T extends AbstractProjectWizard> ext
         throw new RuntimeException(currentStep + " is not validated");
       }
     }
+    myWizard.doFinishAction();
   }
 
   protected void createWizard(Project project) throws IOException {