diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
index daae4fbed69c..543726649fff 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
@@ -639,6 +639,19 @@ public class ProjectTypeStep extends ModuleWizardStep implements SettingsStep, D
     }
   }
 
+  @TestOnly
+  public String availableTemplateGroupsToString() {
+    ListModel model = myProjectTypeList.getModel();
+    StringBuilder builder = new StringBuilder();
+    for (int i = 0; i < model.getSize(); i++) {
+      if (builder.length() > 0) {
+        builder.append(", ");
+      }
+      builder.append(((TemplatesGroup)model.getElementAt(i)).getName());
+    }
+    return builder.toString();
+  }
+
   @TestOnly
   public boolean setSelectedTemplate(@NotNull String group, @Nullable String name) {
     ListModel model = myProjectTypeList.getModel();
diff --git a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
index a1e62b00dabc..b3bca3199ed5 100644
--- a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
+++ b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
@@ -98,8 +98,9 @@ public abstract class ProjectWizardTestCase<T extends AbstractProjectWizard> ext
 
   protected void runWizard(@NotNull String group, @Nullable final String name, Project project, @Nullable final Consumer<Step> adjuster) throws IOException {
     createWizard(project);
-    if (!((ProjectTypeStep)myWizard.getCurrentStepObject()).setSelectedTemplate(group, name)) {
-      throw new IllegalArgumentException(group + '/' + name + " template not found");
+    ProjectTypeStep step = (ProjectTypeStep)myWizard.getCurrentStepObject();
+    if (!step.setSelectedTemplate(group, name)) {
+      throw new IllegalArgumentException(group + '/' + name + " template not found, available groups " + step.availableTemplateGroupsToString());
     }
 
     runWizard(new Consumer<Step>() {