diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ChooseTemplateStep.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ChooseTemplateStep.java
index edc6a019a29c..65a1ffdfa9b1 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/ChooseTemplateStep.java
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ChooseTemplateStep.java
@@ -19,6 +19,7 @@ import com.intellij.ide.util.projectWizard.ModuleWizardStep;
 import com.intellij.ide.util.projectWizard.WizardContext;
 import com.intellij.platform.ProjectTemplate;
 import com.intellij.ui.components.JBCheckBox;
+import org.jetbrains.annotations.TestOnly;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -77,4 +78,11 @@ public class ChooseTemplateStep extends ModuleWizardStep {
   public ProjectTemplateList getTemplateList() {
     return myTemplateList;
   }
+
+  @TestOnly
+  public boolean setSelectedTemplate(String name) {
+    myCreateFromTemplateCheckBox.setSelected(true);
+    return myTemplateList.setSelectedTemplate(name);
+  }
+
 }
diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java
index 91620549cb7a..3c6d456b420f 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java
@@ -31,6 +31,7 @@ import com.intellij.ui.components.JBList;
 import com.intellij.ui.popup.list.GroupedItemsListRenderer;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
@@ -185,6 +186,11 @@ public class ProjectTemplateList extends JPanel {
     myList.addListSelectionListener(listener);
   }
 
+  public void setPaintBusy(boolean b) {
+    myList.setPaintBusy(b);
+  }
+
+  @TestOnly
   public boolean setSelectedTemplate(String name) {
     ListModel model1 = myList.getModel();
     for (int j = 0; j < model1.getSize(); j++) {
@@ -196,8 +202,4 @@ public class ProjectTemplateList extends JPanel {
 
     return false;
   }
-
-  public void setPaintBusy(boolean b) {
-    myList.setPaintBusy(b);
-  }
 }
diff --git a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
index d328f5a22b9f..96e85a21f989 100644
--- a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
+++ b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
@@ -82,7 +82,7 @@ public abstract class ProjectWizardTestCase<T extends AbstractProjectWizard> ext
     return new NewModuleAction().createModuleFromWizard(myProject, null, myWizard);
   }
 
-  protected void runWizard(String group, String name, Project project, @Nullable Consumer<Step> adjuster) throws IOException {
+  protected void runWizard(String group, final String name, Project project, @Nullable final Consumer<Step> adjuster) throws IOException {
 
     createWizard(project);
     ProjectTypeStep step = (ProjectTypeStep)myWizard.getCurrentStepObject();
@@ -95,7 +95,17 @@ public abstract class ProjectWizardTestCase<T extends AbstractProjectWizard> ext
       adjuster.consume(step);
     }
 
-    runWizard(adjuster);
+    runWizard(new Consumer<Step>() {
+      @Override
+      public void consume(Step step) {
+        if (name != null && step instanceof ChooseTemplateStep) {
+          ((ChooseTemplateStep)step).setSelectedTemplate(name);
+        }
+        if (adjuster != null) {
+          adjuster.consume(step);
+        }
+      }
+    });
   }
 
   protected void createWizard(Project project) throws IOException {