diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java
index 724a0b152b2..259db927abc 100644
--- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java
+++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java
@@ -91,31 +91,24 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator
                 ConfigureKotlinInProjectUtils.getNonConfiguredModules(project, this):
                 Arrays.asList(ModuleManager.getInstance(project).getModules());
 
+        List<Module> modulesToConfigure = nonConfiguredModules;
+        String copyLibIntoPath = null;
+
         if (nonConfiguredModules.size() > 1 || showPathPanelForJava) {
-            List<Module> modulesToConfigure;
-            String copyLibIntoPath;
+            CreateJavaLibraryDialogWithModules dialog = new CreateJavaLibraryDialogWithModules(
+                    project, nonConfiguredModules, defaultPath, showPathPanelForJava);
 
             if (!ApplicationManager.getApplication().isUnitTestMode()) {
-                CreateJavaLibraryDialogWithModules dialog = new CreateJavaLibraryDialogWithModules(
-                        project, nonConfiguredModules, defaultPath, showPathPanelForJava);
                 dialog.show();
                 if (!dialog.isOK()) return;
-                modulesToConfigure = dialog.getModulesToConfigure();
-                copyLibIntoPath = dialog.getCopyIntoPath();
-            }
-            else {
-                modulesToConfigure = nonConfiguredModules;
-                copyLibIntoPath = defaultPath;
             }
 
-            for (Module module : modulesToConfigure) {
-                configureModuleWithLibrary(module, defaultPath, copyLibIntoPath);
-            }
+            modulesToConfigure = dialog.getModulesToConfigure();
+            copyLibIntoPath = dialog.getCopyIntoPath();
         }
-        else {
-            for (Module module : nonConfiguredModules) {
-                configureModuleWithLibrary(module, defaultPath, null);
-            }
+
+        for (Module module : modulesToConfigure) {
+            configureModuleWithLibrary(module, defaultPath, copyLibIntoPath);
         }
     }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java
index af404adf8b1..3837b80471b 100644
--- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java
+++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java
@@ -16,7 +16,9 @@
 
 package org.jetbrains.jet.plugin.configuration;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.OrderRootType;
 import org.jetbrains.annotations.NotNull;
@@ -28,6 +30,7 @@ import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
 import org.jetbrains.jet.utils.PathUtil;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.List;
 
 public class KotlinJsModuleConfigurator extends KotlinWithLibraryConfigurator {
@@ -97,26 +100,36 @@ public class KotlinJsModuleConfigurator extends KotlinWithLibraryConfigurator {
         boolean showPathToJarPanel = needToChooseJarPath(project);
         boolean showPathToJsFilePanel = needToChooseJsFilePath(project);
 
-        List<Module> nonConfiguredModules = ConfigureKotlinInProjectUtils.getNonConfiguredModules(project, this);
+        List<Module> nonConfiguredModules =
+                !ApplicationManager.getApplication().isUnitTestMode() ?
+                ConfigureKotlinInProjectUtils.getNonConfiguredModules(project, this) :
+                Arrays.asList(ModuleManager.getInstance(project).getModules());
+
+        List<Module> modulesToConfigure = nonConfiguredModules;
+        String copyLibraryIntoPath = null;
+        String jsFilesIntoPath = null;
 
         if (nonConfiguredModules.size() > 1 || showPathToJarPanel || showPathToJsFilePanel) {
             CreateJavaScriptLibraryDialogWithModules dialog =
                     new CreateJavaScriptLibraryDialogWithModules(project, nonConfiguredModules,
                                                                  defaultPathToJar, defaultPathToJsFile,
                                                                  showPathToJarPanel, showPathToJsFilePanel);
-            dialog.show();
-            if (!dialog.isOK()) return;
-            for (Module module : dialog.getModulesToConfigure()) {
-                configureModuleWithLibrary(module, defaultPathToJar, dialog.getCopyLibraryIntoPath());
+
+            if (!ApplicationManager.getApplication().isUnitTestMode()) {
+                dialog.show();
+                if (!dialog.isOK()) return;
             }
-            configureModuleWithJsFile(defaultPathToJsFile, dialog.getCopyJsIntoPath());
+
+            modulesToConfigure = dialog.getModulesToConfigure();
+            copyLibraryIntoPath = dialog.getCopyLibraryIntoPath();
+            jsFilesIntoPath = dialog.getCopyJsIntoPath();
         }
-        else {
-            for (Module module : nonConfiguredModules) {
-                configureModuleWithLibrary(module, defaultPathToJar, null);
-            }
-            configureModuleWithJsFile(defaultPathToJsFile, null);
+
+        for (Module module : modulesToConfigure) {
+            configureModuleWithLibrary(module, defaultPathToJar, copyLibraryIntoPath);
         }
+
+        configureModuleWithJsFile(defaultPathToJsFile, jsFilesIntoPath);
     }
 
     public static boolean isJsFilePresent(@NotNull String dir) {