diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt
index 0c2b6798b1a..8b002fdcbdc 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt
@@ -15,38 +15,20 @@ import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.idea.configuration.*
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.idea.util.application.runReadAction
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait
 import org.jetbrains.kotlin.test.testFramework.runWriteAction
+import org.jetbrains.plugins.gradle.util.GradleConstants
 import org.junit.Assert
 import org.junit.Ignore
 import org.junit.Test
+import java.io.File
 
 class GradleConfiguratorTest : GradleImportingTestCase() {
 
     @Test
     fun testProjectWithModule() {
-        createProjectSubFile("settings.gradle", "include ':app'")
-        createProjectSubFile(
-                "app/build.gradle", """
-        buildscript {
-            repositories {
-                jcenter()
-                mavenCentral()
-            }
-            dependencies {
-                classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
-            }
-        }
-
-        apply plugin: 'kotlin'
-
-        dependencies {
-            compile "org.jetbrains.kotlin:kotlin-stdlib-0.0"   // intentionally invalid version
-        }
-        """.trimIndent()
-        )
-
-        importProject()
+        importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -77,19 +59,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
 
     @Test
     fun testConfigure10() {
-        createProjectSubFile("settings.gradle", "include ':app'")
-        val file = createProjectSubFile(
-                "app/build.gradle", """
-        buildscript {
-            repositories {
-                jcenter()
-                mavenCentral()
-            }
-        }
-        """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -98,58 +68,14 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.0.6", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                val content = LoadTextUtil.loadText(file).toString()
-                assertEquals(
-                        """
-                buildscript {
-                    ext.kotlin_version = '1.0.6'
-                    repositories {
-                        jcenter()
-                        mavenCentral()
-                    }
-                    dependencies {
-                        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${"$"}kotlin_version"
-                    }
-                }
-                apply plugin: 'kotlin'
-                repositories {
-                    mavenCentral()
-                }
-                dependencies {
-                    compile "org.jetbrains.kotlin:kotlin-stdlib:${"$"}kotlin_version"
-                }
-                """.trimIndent(), content
-                )
+                checkFiles(files)
             }
         }
     }
 
     @Test
     fun testConfigureKotlinWithPluginsBlock() {
-        createProjectSubFile("settings.gradle", "include ':app'")
-        val file = createProjectSubFile(
-                "app/build.gradle", """
-        plugins {
-            id 'java'
-        }
-
-        group 'testgroup'
-        version '1.0-SNAPSHOT'
-
-        sourceCompatibility = 1.8
-
-        repositories {
-            mavenCentral()
-        }
-
-        dependencies {
-            testCompile group: 'junit', name: 'junit', version: '4.12'
-        }
-        """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -158,54 +84,14 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.0.6", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                val content = LoadTextUtil.loadText(file).toString()
-                assertEquals(
-                        """
-                buildscript {
-                    ext.kotlin_version = '1.0.6'
-                    repositories {
-                        mavenCentral()
-                    }
-                    dependencies {
-                        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${"$"}kotlin_version"
-                    }
-                }
-                plugins {
-                    id 'java'
-                }
-                apply plugin: 'kotlin'
-
-                group 'testgroup'
-                version '1.0-SNAPSHOT'
-
-                sourceCompatibility = 1.8
-
-                repositories {
-                    mavenCentral()
-                }
-
-                dependencies {
-                    testCompile group: 'junit', name: 'junit', version: '4.12'
-                    compile "org.jetbrains.kotlin:kotlin-stdlib:${"$"}kotlin_version"
-                }
-                """.trimIndent(), content
-                )
+                checkFiles(files)
             }
         }
     }
 
     @Test
     fun testConfigureKotlinDevVersion() {
-        createProjectSubFile("settings.gradle", "include ':app'")
-        val file = createProjectSubFile(
-                "app/build.gradle", """
-        group 'testgroup'
-        version '1.0-SNAPSHOT'
-        """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -214,61 +100,14 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.2.60-dev-286", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                val content = LoadTextUtil.loadText(file).toString()
-                assertEquals(
-                        """
-                group 'testgroup'
-                version '1.0-SNAPSHOT'
-                buildscript {
-                    ext.kotlin_version = '1.2.60-dev-286'
-                    repositories {
-                        maven {
-                            url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/'
-                        }
-                        mavenCentral()
-                    }
-                    dependencies {
-                        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${"$"}kotlin_version"
-                    }
-                }
-                apply plugin: 'kotlin'
-                repositories {
-                    maven {
-                        url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/'
-                    }
-                    mavenCentral()
-                }
-                dependencies {
-                    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${"$"}kotlin_version"
-                }
-                compileKotlin {
-                    kotlinOptions {
-                        jvmTarget = "1.8"
-                    }
-                }
-                compileTestKotlin {
-                    kotlinOptions {
-                        jvmTarget = "1.8"
-                    }
-                }
-                """.trimIndent(), content
-                )
+                checkFiles(files)
             }
         }
     }
 
     @Test
     fun testConfigureGradleKtsKotlinDevVersion() {
-        createProjectSubFile("settings.gradle", "include ':app'")
-        val file = createProjectSubFile(
-                "app/build.gradle.kts", """
-        group = "testgroup"
-        version = "1.0-SNAPSHOT"
-        """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -277,50 +116,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.2.60-dev-286", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                val content = LoadTextUtil.loadText(file).toString()
-                assertEquals(
-                        """
-                import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-                val kotlin_version: String by extra
-                buildscript {
-                    var kotlin_version: String by extra
-                    kotlin_version = "1.2.60-dev-286"
-                    repositories {
-                        maven {
-                            setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/")
-                        }
-                        mavenCentral()
-                    }
-                    dependencies {
-                        classpath(kotlinModule("gradle-plugin", kotlin_version))
-                    }
-                }
-                group = "testgroup"
-                version = "1.0-SNAPSHOT"
-                apply {
-                    plugin("kotlin")
-                }
-                dependencies {
-                    compile(kotlinModule("stdlib-jdk8", kotlin_version))
-                }
-                repositories {
-                    maven {
-                        setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/")
-                    }
-                    mavenCentral()
-                }
-                val compileKotlin: KotlinCompile by tasks
-                compileKotlin.kotlinOptions {
-                    jvmTarget = "1.8"
-                }
-                val compileTestKotlin: KotlinCompile by tasks
-                compileTestKotlin.kotlinOptions {
-                    jvmTarget = "1.8"
-                }
-                """.trimIndent(), content
-                )
+                checkFiles(files)
             }
         }
     }
@@ -328,30 +124,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
     @Test
     @Ignore // Enable in Gradle 4.4+
     fun testConfigureJvmWithBuildGradle() {
-        val settingsFile = createProjectSubFile("settings.gradle", "include ':app'")
-        val buildFile = createProjectSubFile(
-                "app/build.gradle",
-                """
-                    plugins {
-                        id 'java'
-                    }
-
-                    group 'testgroup'
-                    version '1.0-SNAPSHOT'
-
-                    sourceCompatibility = 1.8
-
-                    repositories {
-                        mavenCentral()
-                    }
-
-                    dependencies {
-                        testCompile group: 'junit', name: 'junit', version: '4.12'
-                    }
-                """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -360,46 +133,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.2.40", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                assertFileContent(
-                        buildFile,
-                        """
-                            plugins {
-                                id 'java'
-                                id 'org.jetbrains.kotlin.jvm' version '1.2.40'
-                            }
-
-                            group 'testgroup'
-                            version '1.0-SNAPSHOT'
-
-                            sourceCompatibility = 1.8
-
-                            repositories {
-                                mavenCentral()
-                            }
-
-                            dependencies {
-                                testCompile group: 'junit', name: 'junit', version: '4.12'
-                                compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-                            }
-                            compileKotlin {
-                                kotlinOptions {
-                                    jvmTarget = "1.8"
-                                }
-                            }
-                            compileTestKotlin {
-                                kotlinOptions {
-                                    jvmTarget = "1.8"
-                                }
-                            }
-                        """.trimIndent()
-                )
-                assertFileContent(
-                        settingsFile,
-                        """
-                            include ':app'
-                        """.trimIndent()
-                )
+                checkFiles(files)
             }
         }
     }
@@ -407,32 +141,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
     @Test
     @Ignore // Enable in Gradle 4.4+
     fun testConfigureJvmWithBuildGradleKts() {
-        val settingsFile = createProjectSubFile("settings.gradle", "include ':app'")
-        val buildFile = createProjectSubFile(
-                "app/build.gradle.kts",
-                """
-                    plugins {
-                        java
-                    }
-
-                    group = "testgroup"
-                    version = "1.0-SNAPSHOT"
-
-                    repositories {
-                        mavenCentral()
-                    }
-
-                    dependencies {
-                        testCompile("junit", "junit", "4.12")
-                    }
-
-                    configure<JavaPluginConvention> {
-                        sourceCompatibility = JavaVersion.VERSION_1_8
-                    }
-                """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -441,48 +150,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.2.40", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                assertFileContent(
-                        buildFile,
-                        """
-                            import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-                            plugins {
-                                java
-                                kotlin("jvm") version "1.2.40"
-                            }
-
-                            group = "testgroup"
-                            version = "1.0-SNAPSHOT"
-
-                            repositories {
-                                mavenCentral()
-                            }
-
-                            dependencies {
-                                testCompile("junit", "junit", "4.12")
-                                compile(kotlin("stdlib-jdk8"))
-                            }
-
-                            configure<JavaPluginConvention> {
-                                sourceCompatibility = JavaVersion.VERSION_1_8
-                            }
-                            val compileKotlin: KotlinCompile by tasks
-                            compileKotlin.kotlinOptions {
-                                jvmTarget = "1.8"
-                            }
-                            val compileTestKotlin: KotlinCompile by tasks
-                            compileTestKotlin.kotlinOptions {
-                                jvmTarget = "1.8"
-                            }
-                        """.trimIndent()
-                )
-                assertFileContent(
-                        settingsFile,
-                        """
-                            include ':app'
-                        """.trimIndent()
-                )
+                checkFiles(files)
             }
         }
     }
@@ -490,30 +158,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
     @Test
     @Ignore // Enable in Gradle 4.4+
     fun testConfigureJvmEAPWithBuildGradle() {
-        val settingsFile = createProjectSubFile("settings.gradle", "include ':app'")
-        val buildFile = createProjectSubFile(
-                "app/build.gradle",
-                """
-                    plugins {
-                        id 'java'
-                    }
-
-                    group 'testgroup'
-                    version '1.0-SNAPSHOT'
-
-                    sourceCompatibility = 1.8
-
-                    repositories {
-                        mavenCentral()
-                    }
-
-                    dependencies {
-                        testCompile group: 'junit', name: 'junit', version: '4.12'
-                    }
-                """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -522,57 +167,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.2.40-eap-62", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                assertFileContent(
-                        buildFile,
-                        """
-                            plugins {
-                                id 'java'
-                                id 'org.jetbrains.kotlin.jvm' version '1.2.40-eap-62'
-                            }
-
-                            group 'testgroup'
-                            version '1.0-SNAPSHOT'
-
-                            sourceCompatibility = 1.8
-
-                            repositories {
-                                mavenCentral()
-                                maven {
-                                    url 'http://dl.bintray.com/kotlin/kotlin-eap'
-                                }
-                            }
-
-                            dependencies {
-                                testCompile group: 'junit', name: 'junit', version: '4.12'
-                                compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-                            }
-                            compileKotlin {
-                                kotlinOptions {
-                                    jvmTarget = "1.8"
-                                }
-                            }
-                            compileTestKotlin {
-                                kotlinOptions {
-                                    jvmTarget = "1.8"
-                                }
-                            }
-                        """.trimIndent()
-                )
-                assertFileContent(
-                        settingsFile,
-                        """
-                            pluginManagement {
-                                repositories {
-                                    maven {
-                                        url 'http://dl.bintray.com/kotlin/kotlin-eap'
-                                    }
-                                    mavenCentral()
-                                }
-                            }
-                            include ':app'
-                        """.trimIndent()
-                )
+                checkFiles(files)
             }
         }
     }
@@ -580,32 +175,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
     @Test
     @Ignore // Enable in Gradle 4.4+
     fun testConfigureJvmEAPWithBuildGradleKts() {
-        val settingsFile = createProjectSubFile("settings.gradle", "include ':app'")
-        val buildFile = createProjectSubFile(
-                "app/build.gradle.kts",
-                """
-                    plugins {
-                        java
-                    }
-
-                    group = "testgroup"
-                    version = "1.0-SNAPSHOT"
-
-                    repositories {
-                        mavenCentral()
-                    }
-
-                    dependencies {
-                        testCompile("junit", "junit", "4.12")
-                    }
-
-                    configure<JavaPluginConvention> {
-                        sourceCompatibility = JavaVersion.VERSION_1_8
-                    }
-                """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -614,57 +184,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.2.40-eap-62", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                assertFileContent(
-                        buildFile,
-                        """
-                            import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-                            plugins {
-                                java
-                                kotlin("jvm") version "1.2.40-eap-62"
-                            }
-
-                            group = "testgroup"
-                            version = "1.0-SNAPSHOT"
-
-                            repositories {
-                                mavenCentral()
-                                maven { setUrl("http://dl.bintray.com/kotlin/kotlin-eap") }
-                            }
-
-                            dependencies {
-                                testCompile("junit", "junit", "4.12")
-                                compile(kotlin("stdlib-jdk8"))
-                            }
-
-                            configure<JavaPluginConvention> {
-                                sourceCompatibility = JavaVersion.VERSION_1_8
-                            }
-                            val compileKotlin: KotlinCompile by tasks
-                            compileKotlin.kotlinOptions {
-                                jvmTarget = "1.8"
-                            }
-                            val compileTestKotlin: KotlinCompile by tasks
-                            compileTestKotlin.kotlinOptions {
-                                jvmTarget = "1.8"
-                            }
-                        """.trimIndent()
-                )
-                assertFileContent(
-                        settingsFile,
-                        """
-                            pluginManagement {
-                                repositories {
-                                    maven {
-                                        url 'http://dl.bintray.com/kotlin/kotlin-eap'
-                                    }
-                                    mavenCentral()
-                                }
-                            }
-                            include ':app'
-                        """.trimIndent()
-                )
+                checkFiles(files)
             }
         }
     }
@@ -672,20 +192,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
     @Test
     @Ignore // Enable in Gradle 4.4+
     fun testConfigureJsWithBuildGradle() {
-        val settingsFile = createProjectSubFile("settings.gradle", "include ':app'")
-        val buildFile = createProjectSubFile(
-                "app/build.gradle",
-                """
-                    group 'testgroup'
-                    version '1.0-SNAPSHOT'
-
-                    repositories {
-                        mavenCentral()
-                    }
-                """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -694,39 +201,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.2.40", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                assertFileContent(
-                        buildFile,
-                        """
-                            plugins {
-                                id 'kotlin2js' version '1.2.40'
-                            }
-                            group 'testgroup'
-                            version '1.0-SNAPSHOT'
-
-                            repositories {
-                                mavenCentral()
-                            }
-                            dependencies {
-                                compile "org.jetbrains.kotlin:kotlin-stdlib-js"
-                            }
-                        """.trimIndent()
-                )
-                assertFileContent(
-                        settingsFile,
-                        """
-                            pluginManagement {
-                                resolutionStrategy {
-                                    eachPlugin {
-                                        if (requested.id.id == "kotlin2js") {
-                                            useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}{requested.version}")
-                                        }
-                                    }
-                                }
-                            }
-                            include ':app'
-                        """.trimIndent()
-                )
+                checkFiles(files)
             }
         }
     }
@@ -734,20 +209,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
     @Test
     @Ignore // Enable in Gradle 4.4+
     fun testConfigureJsWithBuildGradleKts() {
-        val settingsFile = createProjectSubFile("settings.gradle", "include ':app'")
-        val buildFile = createProjectSubFile(
-                "app/build.gradle.kts",
-                """
-                    group = "testgroup"
-                    version = "1.0-SNAPSHOT"
-
-                    repositories {
-                        mavenCentral()
-                    }
-                """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -756,39 +218,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.2.40", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                assertFileContent(
-                        buildFile,
-                        """
-                            plugins {
-                                id("kotlin2js") version "1.2.40"
-                            }
-                            group = "testgroup"
-                            version = "1.0-SNAPSHOT"
-
-                            repositories {
-                                mavenCentral()
-                            }
-                            dependencies {
-                                compile(kotlin("stdlib-js"))
-                            }
-                        """.trimIndent()
-                )
-                assertFileContent(
-                        settingsFile,
-                        """
-                            pluginManagement {
-                                resolutionStrategy {
-                                    eachPlugin {
-                                        if (requested.id.id == "kotlin2js") {
-                                            useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}{requested.version}")
-                                        }
-                                    }
-                                }
-                            }
-                            include ':app'
-                        """.trimIndent()
-                )
+                checkFiles(files)
             }
         }
     }
@@ -796,20 +226,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
     @Test
     @Ignore // Enable in Gradle 4.4+
     fun testConfigureJsEAPWithBuildGradle() {
-        val settingsFile = createProjectSubFile("settings.gradle", "include ':app'")
-        val buildFile = createProjectSubFile(
-                "app/build.gradle",
-                """
-                    group 'testgroup'
-                    version '1.0-SNAPSHOT'
-
-                    repositories {
-                        mavenCentral()
-                    }
-                """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -818,48 +235,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.2.40-eap-62", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                assertFileContent(
-                        buildFile,
-                        """
-                            plugins {
-                                id 'kotlin2js' version '1.2.40-eap-62'
-                            }
-                            group 'testgroup'
-                            version '1.0-SNAPSHOT'
-
-                            repositories {
-                                mavenCentral()
-                                maven {
-                                    url 'http://dl.bintray.com/kotlin/kotlin-eap'
-                                }
-                            }
-                            dependencies {
-                                compile "org.jetbrains.kotlin:kotlin-stdlib-js"
-                            }
-                        """.trimIndent()
-                )
-                assertFileContent(
-                        settingsFile,
-                        """
-                            pluginManagement {
-                                resolutionStrategy {
-                                    eachPlugin {
-                                        if (requested.id.id == "kotlin2js") {
-                                            useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}{requested.version}")
-                                        }
-                                    }
-                                }
-                                repositories {
-                                    maven {
-                                        url 'http://dl.bintray.com/kotlin/kotlin-eap'
-                                    }
-                                    mavenCentral()
-                                }
-                            }
-                            include ':app'
-                        """.trimIndent()
-                )
+                checkFiles(files)
             }
         }
     }
@@ -867,20 +243,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
     @Test
     @Ignore // Enable in Gradle 4.4+
     fun testConfigureJsEAPWithBuildGradleKts() {
-        val settingsFile = createProjectSubFile("settings.gradle", "include ':app'")
-        val buildFile = createProjectSubFile(
-                "app/build.gradle.kts",
-                """
-                    group = "testgroup"
-                    version = "1.0-SNAPSHOT"
-
-                    repositories {
-                        mavenCentral()
-                    }
-                """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -889,79 +252,24 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.2.40-eap-62", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                assertFileContent(
-                        buildFile,
-                        """
-                            plugins {
-                                id("kotlin2js") version "1.2.40-eap-62"
-                            }
-                            group = "testgroup"
-                            version = "1.0-SNAPSHOT"
-
-                            repositories {
-                                mavenCentral()
-                                maven { setUrl("http://dl.bintray.com/kotlin/kotlin-eap") }
-                            }
-                            dependencies {
-                                compile(kotlin("stdlib-js"))
-                            }
-                        """.trimIndent()
-                )
-                assertFileContent(
-                        settingsFile,
-                        """
-                            pluginManagement {
-                                resolutionStrategy {
-                                    eachPlugin {
-                                        if (requested.id.id == "kotlin2js") {
-                                            useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}{requested.version}")
-                                        }
-                                    }
-                                }
-                                repositories {
-                                    maven {
-                                        url 'http://dl.bintray.com/kotlin/kotlin-eap'
-                                    }
-                                    mavenCentral()
-                                }
-                            }
-                            include ':app'
-                        """.trimIndent()
-                )
+                checkFiles(files)
             }
         }
     }
 
-    private fun assertFileContent(file: VirtualFile, expected: String) {
-        assertEquals(expected, LoadTextUtil.loadText(file).toString())
-    }
-
     private fun findGradleModuleConfigurator() = Extensions.findExtension(
-            KotlinProjectConfigurator.EP_NAME,
-            KotlinGradleModuleConfigurator::class.java
+        KotlinProjectConfigurator.EP_NAME,
+        KotlinGradleModuleConfigurator::class.java
     )
 
     private fun findJsGradleModuleConfigurator() = Extensions.findExtension(
-            KotlinProjectConfigurator.EP_NAME,
-            KotlinJsGradleModuleConfigurator::class.java
+        KotlinProjectConfigurator.EP_NAME,
+        KotlinJsGradleModuleConfigurator::class.java
     )
 
     @Test
     fun testConfigureGSK() {
-        createProjectSubFile("settings.gradle", "include ':app'")
-        val file = createProjectSubFile(
-                "app/build.gradle.kts", """
-        buildscript {
-            repositories {
-                jcenter()
-                mavenCentral()
-            }
-        }
-        """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             runWriteAction {
@@ -970,65 +278,14 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                 val collector = createConfigureKotlinNotificationCollector(myProject)
                 configurator.configureWithVersion(myProject, listOf(module), "1.1.2", collector)
 
-                FileDocumentManager.getInstance().saveAllDocuments()
-                val content = LoadTextUtil.loadText(file).toString()
-                assertEquals(
-                        """
-                    import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-                    val kotlin_version: String by extra
-                    buildscript {
-                        var kotlin_version: String by extra
-                        kotlin_version = "1.1.2"
-                        repositories {
-                            jcenter()
-                            mavenCentral()
-                        }
-                        dependencies {
-                            classpath(kotlinModule("gradle-plugin", kotlin_version))
-                        }
-                    }
-                    apply {
-                        plugin("kotlin")
-                    }
-                    dependencies {
-                        compile(kotlinModule("stdlib-jre8", kotlin_version))
-                    }
-                    repositories {
-                        mavenCentral()
-                    }
-                    val compileKotlin: KotlinCompile by tasks
-                    compileKotlin.kotlinOptions {
-                        jvmTarget = "1.8"
-                    }
-                    val compileTestKotlin: KotlinCompile by tasks
-                    compileTestKotlin.kotlinOptions {
-                        jvmTarget = "1.8"
-                    }
-                """.trimIndent(), content
-                )
+                checkFiles(files)
             }
         }
     }
 
     @Test
     fun testListNonConfiguredModules() {
-        createProjectSubFile("settings.gradle", "include ':app'")
-        createProjectSubFile(
-                "app/build.gradle", """
-        buildscript {
-            repositories {
-                jcenter()
-                mavenCentral()
-            }
-        }
-
-        apply plugin: 'java'
-        """.trimIndent()
-        )
-        createProjectSubFile("app/src/main/java/foo.kt", "")
-
-        importProject()
+        importProjectFromTestData()
 
         runReadAction {
             val configurator = findGradleModuleConfigurator()
@@ -1048,32 +305,8 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
     }
 
     @Test
-    fun testListNonConfiguredModules_Configured() {
-        createProjectSubFile("settings.gradle", "include ':app'")
-        createProjectSubFile(
-                "app/build.gradle", """
-        buildscript {
-            repositories {
-                jcenter()
-                mavenCentral()
-            }
-        }
-
-        apply plugin: 'java'
-
-        repositories {
-            jcenter()
-            mavenCentral()
-        }
-
-        dependencies {
-            compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.3"
-        }
-        """.trimIndent()
-        )
-        createProjectSubFile("app/src/main/java/foo.kt", "")
-
-        importProject()
+    fun testListNonConfiguredModulesConfigured() {
+        importProjectFromTestData()
 
         runReadAction {
             assertEmpty(getConfigurationPossibilitiesForConfigureNotification(myProject).first)
@@ -1081,32 +314,8 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
     }
 
     @Test
-    fun testListNonConfiguredModules_ConfiguredWithImplementation() {
-        createProjectSubFile("settings.gradle", "include ':app'")
-        createProjectSubFile(
-                "app/build.gradle", """
-        buildscript {
-            repositories {
-                jcenter()
-                mavenCentral()
-            }
-        }
-
-        apply plugin: 'java'
-
-        repositories {
-            jcenter()
-            mavenCentral()
-        }
-
-        dependencies {
-            implementation "org.jetbrains.kotlin:kotlin-stdlib:1.1.3"
-        }
-        """.trimIndent()
-        )
-        createProjectSubFile("app/src/main/java/foo.kt", "")
-
-        importProject()
+    fun testListNonConfiguredModulesConfiguredWithImplementation() {
+        importProjectFromTestData()
 
         runReadAction {
             assertEmpty(getConfigurationPossibilitiesForConfigureNotification(myProject).first)
@@ -1114,32 +323,8 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
     }
 
     @Test
-    fun testListNonConfiguredModules_ConfiguredOnlyTest() {
-        createProjectSubFile("settings.gradle", "include ':app'")
-        createProjectSubFile(
-                "app/build.gradle", """
-        buildscript {
-            repositories {
-                jcenter()
-                mavenCentral()
-            }
-        }
-
-        apply plugin: 'java'
-
-        repositories {
-            jcenter()
-            mavenCentral()
-        }
-
-        dependencies {
-            testCompile "org.jetbrains.kotlin:kotlin-stdlib:1.1.3"
-        }
-        """.trimIndent()
-        )
-        createProjectSubFile("app/src/test/java/foo.kt", "")
-
-        importProject()
+    fun testListNonConfiguredModulesConfiguredOnlyTest() {
+        importProjectFromTestData()
 
         runReadAction {
             assertEmpty(getConfigurationPossibilitiesForConfigureNotification(myProject).first)
@@ -1148,581 +333,228 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
 
     @Test
     fun testAddNonKotlinLibraryGSK() {
-        val buildScript = createProjectSubFile(
-                "build.gradle.kts",
-                """
-                                                     |dependencies {
-                                                     |    testCompile("junit:junit:4.12")
-                                                     |    compile(kotlinModule("stdlib-jre8"))
-                                                     |}
-                                                     |""".trimMargin("|")
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 KotlinWithGradleConfigurator.addKotlinLibraryToModule(
-                        myTestFixture.module,
-                        DependencyScope.COMPILE,
-                        object : ExternalLibraryDescriptor("org.a.b", "lib", "1.0.0", "1.0.0") {
-                            override fun getLibraryClassesRoots() = emptyList<String>()
-                        })
+                    myTestFixture.module,
+                    DependencyScope.COMPILE,
+                    object : ExternalLibraryDescriptor("org.a.b", "lib", "1.0.0", "1.0.0") {
+                        override fun getLibraryClassesRoots() = emptyList<String>()
+                    })
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
-
-        assertEquals(
-                """
-                 |dependencies {
-                 |    testCompile("junit:junit:4.12")
-                 |    compile(kotlinModule("stdlib-jre8"))
-                 |    compile("org.a.b:lib:1.0.0")
-                 |}
-                 |""".trimMargin("|"),
-                LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 
     @Test
-    fun testAddLibraryGSK_WithKotlinVersion() {
-        val buildScript = createProjectSubFile(
-                "build.gradle.kts",
-                """
-                                                     |val kotlin_version: String by extra
-                                                     |dependencies {
-                                                     |    testCompile("junit:junit:4.12")
-                                                     |    compile(kotlinModule("stdlib-jre8", kotlin_version))
-                                                     |}
-                                                     |""".trimMargin("|")
-        )
-
-        importProject()
+    fun testAddLibraryGSKWithKotlinVersion() {
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 val stdLibVersion = KotlinWithGradleConfigurator.getKotlinStdlibVersion(myTestFixture.module)
                 KotlinWithGradleConfigurator.addKotlinLibraryToModule(
-                        myTestFixture.module,
-                        DependencyScope.COMPILE,
-                        object : ExternalLibraryDescriptor("org.jetbrains.kotlin", "kotlin-reflect", stdLibVersion, stdLibVersion) {
-                            override fun getLibraryClassesRoots() = emptyList<String>()
-                        })
+                    myTestFixture.module,
+                    DependencyScope.COMPILE,
+                    object : ExternalLibraryDescriptor("org.jetbrains.kotlin", "kotlin-reflect", stdLibVersion, stdLibVersion) {
+                        override fun getLibraryClassesRoots() = emptyList<String>()
+                    })
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
-
-        assertEquals(
-                """
-                 |val kotlin_version: String by extra
-                 |dependencies {
-                 |    testCompile("junit:junit:4.12")
-                 |    compile(kotlinModule("stdlib-jre8", kotlin_version))
-                 |    compile(kotlinModule("reflect", kotlin_version))
-                 |}
-                 |""".trimMargin("|"),
-                LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 
     @Test
     fun testAddTestLibraryGSK() {
-        val buildScript = createProjectSubFile(
-                "build.gradle.kts",
-                """
-                                                     |dependencies {
-                                                     |    compile(kotlinModule("stdlib-jre8"))
-                                                     |}
-                                                     |""".trimMargin("|")
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 KotlinWithGradleConfigurator.addKotlinLibraryToModule(
-                        myTestFixture.module,
-                        DependencyScope.TEST,
-                        object : ExternalLibraryDescriptor("junit", "junit", "4.12", "4.12") {
-                            override fun getLibraryClassesRoots() = emptyList<String>()
-                        })
+                    myTestFixture.module,
+                    DependencyScope.TEST,
+                    object : ExternalLibraryDescriptor("junit", "junit", "4.12", "4.12") {
+                        override fun getLibraryClassesRoots() = emptyList<String>()
+                    })
 
                 KotlinWithGradleConfigurator.addKotlinLibraryToModule(
-                        myTestFixture.module,
-                        DependencyScope.TEST,
-                        object : ExternalLibraryDescriptor("org.jetbrains.kotlin", "kotlin-test", "1.1.2", "1.1.2") {
-                            override fun getLibraryClassesRoots() = emptyList<String>()
-                        })
+                    myTestFixture.module,
+                    DependencyScope.TEST,
+                    object : ExternalLibraryDescriptor("org.jetbrains.kotlin", "kotlin-test", "1.1.2", "1.1.2") {
+                        override fun getLibraryClassesRoots() = emptyList<String>()
+                    })
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
-
-        assertEquals(
-                """
-                 |dependencies {
-                 |    compile(kotlinModule("stdlib-jre8"))
-                 |    testCompile("junit:junit:4.12")
-                 |    testCompile(kotlinModule("test", "1.1.2"))
-                 |}
-                 |""".trimMargin("|"),
-                LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 
     @Test
     fun testAddLibraryGSK() {
-        val buildScript = createProjectSubFile(
-                "build.gradle.kts",
-                """
-                                                     |dependencies {
-                                                     |    testCompile("junit:junit:4.12")
-                                                     |    compile(kotlinModule("stdlib-jre8"))
-                                                     |}
-                                                     |""".trimMargin("|")
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 KotlinWithGradleConfigurator.addKotlinLibraryToModule(
-                        myTestFixture.module,
-                        DependencyScope.COMPILE,
-                        object : ExternalLibraryDescriptor("org.jetbrains.kotlin", "kotlin-reflect", "1.0.0", "1.0.0") {
-                            override fun getLibraryClassesRoots() = emptyList<String>()
-                        })
+                    myTestFixture.module,
+                    DependencyScope.COMPILE,
+                    object : ExternalLibraryDescriptor("org.jetbrains.kotlin", "kotlin-reflect", "1.0.0", "1.0.0") {
+                        override fun getLibraryClassesRoots() = emptyList<String>()
+                    })
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
-
-        assertEquals(
-                """
-                 |dependencies {
-                 |    testCompile("junit:junit:4.12")
-                 |    compile(kotlinModule("stdlib-jre8"))
-                 |    compile(kotlinModule("reflect", "1.0.0"))
-                 |}
-                 |""".trimMargin("|"),
-                LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 
     @Test
     fun testAddCoroutinesSupport() {
-        val buildScript = createProjectSubFile(
-                "build.gradle", """
-        buildscript {
-            repositories {
-                jcenter()
-                mavenCentral()
-            }
-            dependencies {
-                classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
-            }
-        }
-
-        apply plugin: 'kotlin'
-
-        dependencies {
-            compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
-        }
-        """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 KotlinWithGradleConfigurator.changeCoroutineConfiguration(myTestFixture.module, "enable")
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
-
-        assertEquals(
-                """
-                buildscript {
-                    repositories {
-                        jcenter()
-                        mavenCentral()
-                    }
-                    dependencies {
-                        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
-                    }
-                }
-
-                apply plugin: 'kotlin'
-
-                dependencies {
-                    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
-                }
-                kotlin {
-                    experimental {
-                        coroutines "enable"
-                    }
-                }
-                """.trimIndent(),
-                LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 
     @Test
     fun testAddCoroutinesSupportGSK() {
-        val buildScript = createProjectSubFile("build.gradle.kts", "")
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 KotlinWithGradleConfigurator.changeCoroutineConfiguration(myTestFixture.module, "enable")
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
-
-        assertEquals(
-                """import org.jetbrains.kotlin.gradle.dsl.Coroutines
-                  |
-                  |kotlin {
-                  |    experimental.coroutines = Coroutines.ENABLE
-                  |}""".trimMargin("|"),
-                LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 
     @Test
     fun testChangeCoroutinesSupport() {
-        val buildScript = createProjectSubFile(
-                "build.gradle", """
-            buildscript {
-                repositories {
-                    jcenter()
-                    mavenCentral()
-                }
-                dependencies {
-                    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
-                }
-            }
-
-            apply plugin: 'kotlin'
-
-            dependencies {
-                compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
-            }
-            kotlin {
-                experimental {
-                      coroutines "error"
-                }
-            }
-            """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 KotlinWithGradleConfigurator.changeCoroutineConfiguration(myTestFixture.module, "enable")
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
-
-        assertEquals(
-                """
-            buildscript {
-                repositories {
-                    jcenter()
-                    mavenCentral()
-                }
-                dependencies {
-                    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
-                }
-            }
-
-            apply plugin: 'kotlin'
-
-            dependencies {
-                compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
-            }
-            kotlin {
-                experimental {
-                      coroutines "enable"
-                }
-            }
-            """.trimIndent(), LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 
     @Test
     fun testChangeCoroutinesSupportGSK() {
-        val buildScript = createProjectSubFile(
-                "build.gradle.kts",
-                """import org.jetbrains.kotlin.gradle.dsl.Coroutines
-                  |
-                  |kotlin {
-                  |    experimental.coroutines = Coroutines.DISABLE
-                  |}
-                  |""".trimMargin("|")
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 KotlinWithGradleConfigurator.changeCoroutineConfiguration(myTestFixture.module, "enable")
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
-
-        assertEquals(
-                """import org.jetbrains.kotlin.gradle.dsl.Coroutines
-                  |
-                  |kotlin {
-                  |    experimental.coroutines = Coroutines.ENABLE
-                  |}
-                  |""".trimMargin("|"),
-                LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 
     @Test
     fun testAddLanguageVersion() {
-        val buildScript = createProjectSubFile(
-                "build.gradle", """
-            buildscript {
-                repositories {
-                    jcenter()
-                    mavenCentral()
-                }
-                dependencies {
-                    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
-                }
-            }
-
-            apply plugin: 'kotlin'
-
-            dependencies {
-                compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
-            }
-            """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 KotlinWithGradleConfigurator.changeLanguageVersion(myTestFixture.module, "1.1", null, false)
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
-
-        assertEquals(
-                """
-            buildscript {
-                repositories {
-                    jcenter()
-                    mavenCentral()
-                }
-                dependencies {
-                    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
-                }
-            }
-
-            apply plugin: 'kotlin'
-
-            dependencies {
-                compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
-            }
-            compileKotlin {
-                kotlinOptions {
-                    languageVersion = "1.1"
-                }
-            }
-            """.trimIndent(), LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 
     @Test
     fun testAddLanguageVersionGSK() {
-        val buildScript = createProjectSubFile("build.gradle.kts", "")
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 KotlinWithGradleConfigurator.changeLanguageVersion(myTestFixture.module, "1.1", null, false)
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
-
-        assertEquals(
-                """import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-                 |
-                 |val compileKotlin: KotlinCompile by tasks
-                 |compileKotlin.kotlinOptions {
-                 |    languageVersion = "1.1"
-                 |}""".trimMargin("|"),
-                LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 
     @Test
     fun testChangeLanguageVersion() {
-        val buildScript = createProjectSubFile(
-                "build.gradle", """
-            buildscript {
-                repositories {
-                    jcenter()
-                    mavenCentral()
-                }
-                dependencies {
-                    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
-                }
-            }
-
-            apply plugin: 'kotlin'
-
-            dependencies {
-                compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
-            }
-            compileKotlin {
-                kotlinOptions {
-                    languageVersion = "1.0"
-                }
-            }
-            """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 KotlinWithGradleConfigurator.changeLanguageVersion(myTestFixture.module, "1.1", null, false)
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
-
-        assertEquals(
-                """
-            buildscript {
-                repositories {
-                    jcenter()
-                    mavenCentral()
-                }
-                dependencies {
-                    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
-                }
-            }
-
-            apply plugin: 'kotlin'
-
-            dependencies {
-                compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
-            }
-            compileKotlin {
-                kotlinOptions {
-                    languageVersion = "1.1"
-                }
-            }
-            """.trimIndent(), LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 
     @Test
     fun testChangeLanguageVersionGSK() {
-        val buildScript = createProjectSubFile(
-                "build.gradle.kts",
-                """val compileKotlin: KotlinCompile by tasks
-                                                     |compileKotlin.kotlinOptions {
-                                                     |   languageVersion = "1.0"
-                                                     |}
-                                                     |""".trimMargin("|")
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 KotlinWithGradleConfigurator.changeLanguageVersion(myTestFixture.module, "1.1", null, false)
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
-
-        assertEquals(
-                """val compileKotlin: KotlinCompile by tasks
-                 |compileKotlin.kotlinOptions {
-                 |    languageVersion = "1.1"
-                 |}
-                 |""".trimMargin("|"),
-                LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 
     @Test
     fun testAddLibrary() {
-        val buildScript = createProjectSubFile(
-                "build.gradle", """
-            buildscript {
-                repositories {
-                    jcenter()
-                    mavenCentral()
-                }
-                dependencies {
-                    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
-                }
-            }
-
-            apply plugin: 'kotlin'
-
-            dependencies {
-                compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
-            }
-            """.trimIndent()
-        )
-
-        importProject()
+        val files = importProjectFromTestData()
 
         runInEdtAndWait {
             myTestFixture.project.executeWriteCommand("") {
                 KotlinWithGradleConfigurator.addKotlinLibraryToModule(
-                        myTestFixture.module,
-                        DependencyScope.COMPILE,
-                        object : ExternalLibraryDescriptor("org.jetbrains.kotlin", "kotlin-reflect", "1.0.0", "1.0.0") {
-                            override fun getLibraryClassesRoots() = emptyList<String>()
-                        })
+                    myTestFixture.module,
+                    DependencyScope.COMPILE,
+                    object : ExternalLibraryDescriptor("org.jetbrains.kotlin", "kotlin-reflect", "1.0.0", "1.0.0") {
+                        override fun getLibraryClassesRoots() = emptyList<String>()
+                    })
             }
 
-            FileDocumentManager.getInstance().saveAllDocuments()
+            checkFiles(files)
         }
+    }
 
-        assertEquals(
-                """
-            buildscript {
-                repositories {
-                    jcenter()
-                    mavenCentral()
-                }
-                dependencies {
-                    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
-                }
+    private fun importProjectFromTestData(): List<VirtualFile> {
+        val files = configureByFiles()
+        importProject()
+        return files
+    }
+
+    override fun testDataDirName(): String {
+        return "configurator"
+    }
+
+    private fun checkFiles(files: List<VirtualFile>) {
+        FileDocumentManager.getInstance().saveAllDocuments()
+
+        files.filter {
+            it.name == GradleConstants.DEFAULT_SCRIPT_NAME
+                    || it.name == GradleConstants.KOTLIN_DSL_SCRIPT_NAME
+                    || it.name == GradleConstants.SETTINGS_FILE_NAME
+        }
+            .forEach {
+                if (it.name == GradleConstants.SETTINGS_FILE_NAME && !File(testDataDirectory(), it.name + SUFFIX).exists()) return@forEach
+                val actualText = LoadTextUtil.loadText(it).toString()
+                KotlinTestUtils.assertEqualsToFile(File(testDataDirectory(), it.name + SUFFIX), actualText)
             }
-
-            apply plugin: 'kotlin'
-
-            dependencies {
-                compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
-                compile "org.jetbrains.kotlin:kotlin-reflect:1.0.0"
-            }
-            """.trimIndent(), LoadTextUtil.loadText(buildScript).toString()
-        )
     }
 }
diff --git a/idea/testData/gradle/configurator/addCoroutinesSupport/build.gradle b/idea/testData/gradle/configurator/addCoroutinesSupport/build.gradle
new file mode 100644
index 00000000000..d2abf8e4f31
--- /dev/null
+++ b/idea/testData/gradle/configurator/addCoroutinesSupport/build.gradle
@@ -0,0 +1,15 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+    }
+}
+
+apply plugin: 'kotlin'
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+}
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/addCoroutinesSupport/build.gradle.after b/idea/testData/gradle/configurator/addCoroutinesSupport/build.gradle.after
new file mode 100644
index 00000000000..e6ec5719aa1
--- /dev/null
+++ b/idea/testData/gradle/configurator/addCoroutinesSupport/build.gradle.after
@@ -0,0 +1,20 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+    }
+}
+
+apply plugin: 'kotlin'
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+}
+kotlin {
+    experimental {
+        coroutines "enable"
+    }
+}
diff --git a/idea/testData/gradle/configurator/addCoroutinesSupportGSK/build.gradle.kts b/idea/testData/gradle/configurator/addCoroutinesSupportGSK/build.gradle.kts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/idea/testData/gradle/configurator/addCoroutinesSupportGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/addCoroutinesSupportGSK/build.gradle.kts.after
new file mode 100644
index 00000000000..cf0ea6d7678
--- /dev/null
+++ b/idea/testData/gradle/configurator/addCoroutinesSupportGSK/build.gradle.kts.after
@@ -0,0 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.Coroutines
+
+kotlin {
+    experimental.coroutines = Coroutines.ENABLE
+}
diff --git a/idea/testData/gradle/configurator/addLanguageVersion/build.gradle b/idea/testData/gradle/configurator/addLanguageVersion/build.gradle
new file mode 100644
index 00000000000..d2abf8e4f31
--- /dev/null
+++ b/idea/testData/gradle/configurator/addLanguageVersion/build.gradle
@@ -0,0 +1,15 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+    }
+}
+
+apply plugin: 'kotlin'
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+}
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/addLanguageVersion/build.gradle.after b/idea/testData/gradle/configurator/addLanguageVersion/build.gradle.after
new file mode 100644
index 00000000000..1b66d1e0564
--- /dev/null
+++ b/idea/testData/gradle/configurator/addLanguageVersion/build.gradle.after
@@ -0,0 +1,20 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+    }
+}
+
+apply plugin: 'kotlin'
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+}
+compileKotlin {
+    kotlinOptions {
+        languageVersion = "1.1"
+    }
+}
diff --git a/idea/testData/gradle/configurator/addLanguageVersionGSK/build.gradle.kts b/idea/testData/gradle/configurator/addLanguageVersionGSK/build.gradle.kts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/idea/testData/gradle/configurator/addLanguageVersionGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/addLanguageVersionGSK/build.gradle.kts.after
new file mode 100644
index 00000000000..0d487ff9b21
--- /dev/null
+++ b/idea/testData/gradle/configurator/addLanguageVersionGSK/build.gradle.kts.after
@@ -0,0 +1,6 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+    languageVersion = "1.1"
+}
diff --git a/idea/testData/gradle/configurator/addLibrary/build.gradle b/idea/testData/gradle/configurator/addLibrary/build.gradle
new file mode 100644
index 00000000000..d2abf8e4f31
--- /dev/null
+++ b/idea/testData/gradle/configurator/addLibrary/build.gradle
@@ -0,0 +1,15 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+    }
+}
+
+apply plugin: 'kotlin'
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+}
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/addLibrary/build.gradle.after b/idea/testData/gradle/configurator/addLibrary/build.gradle.after
new file mode 100644
index 00000000000..06640684345
--- /dev/null
+++ b/idea/testData/gradle/configurator/addLibrary/build.gradle.after
@@ -0,0 +1,16 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+    }
+}
+
+apply plugin: 'kotlin'
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-reflect:1.0.0"
+}
diff --git a/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts b/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts
new file mode 100644
index 00000000000..3eb5768fc71
--- /dev/null
+++ b/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts
@@ -0,0 +1,4 @@
+dependencies {
+    testCompile("junit:junit:4.12")
+    compile(kotlinModule("stdlib-jre8"))
+}
diff --git a/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.after
new file mode 100644
index 00000000000..ee1dca3c20f
--- /dev/null
+++ b/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.after
@@ -0,0 +1,5 @@
+dependencies {
+    testCompile("junit:junit:4.12")
+    compile(kotlinModule("stdlib-jre8"))
+    compile(kotlinModule("reflect", "1.0.0"))
+}
diff --git a/idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts b/idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts
new file mode 100644
index 00000000000..120a6147250
--- /dev/null
+++ b/idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts
@@ -0,0 +1,5 @@
+val kotlin_version: String by extra
+dependencies {
+    testCompile("junit:junit:4.12")
+    compile(kotlinModule("stdlib-jre8", kotlin_version))
+}
diff --git a/idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts.after b/idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts.after
new file mode 100644
index 00000000000..b235f0a11cd
--- /dev/null
+++ b/idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts.after
@@ -0,0 +1,6 @@
+val kotlin_version: String by extra
+dependencies {
+    testCompile("junit:junit:4.12")
+    compile(kotlinModule("stdlib-jre8", kotlin_version))
+    compile(kotlinModule("reflect", kotlin_version))
+}
diff --git a/idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts b/idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts
new file mode 100644
index 00000000000..3eb5768fc71
--- /dev/null
+++ b/idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts
@@ -0,0 +1,4 @@
+dependencies {
+    testCompile("junit:junit:4.12")
+    compile(kotlinModule("stdlib-jre8"))
+}
diff --git a/idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts.after
new file mode 100644
index 00000000000..f0c587bfc28
--- /dev/null
+++ b/idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts.after
@@ -0,0 +1,5 @@
+dependencies {
+    testCompile("junit:junit:4.12")
+    compile(kotlinModule("stdlib-jre8"))
+    compile("org.a.b:lib:1.0.0")
+}
diff --git a/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts b/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts
new file mode 100644
index 00000000000..d175a6350b5
--- /dev/null
+++ b/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts
@@ -0,0 +1,3 @@
+dependencies {
+    compile(kotlinModule("stdlib-jre8"))
+}
diff --git a/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.after
new file mode 100644
index 00000000000..d295550f0c4
--- /dev/null
+++ b/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.after
@@ -0,0 +1,5 @@
+dependencies {
+    compile(kotlinModule("stdlib-jre8"))
+    testCompile("junit:junit:4.12")
+    testCompile(kotlinModule("test", "1.1.2"))
+}
diff --git a/idea/testData/gradle/configurator/changeCoroutinesSupport/build.gradle b/idea/testData/gradle/configurator/changeCoroutinesSupport/build.gradle
new file mode 100644
index 00000000000..8f62fe2054e
--- /dev/null
+++ b/idea/testData/gradle/configurator/changeCoroutinesSupport/build.gradle
@@ -0,0 +1,20 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+    }
+}
+
+apply plugin: 'kotlin'
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+}
+kotlin {
+    experimental {
+          coroutines "error"
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/changeCoroutinesSupport/build.gradle.after b/idea/testData/gradle/configurator/changeCoroutinesSupport/build.gradle.after
new file mode 100644
index 00000000000..a11932b3928
--- /dev/null
+++ b/idea/testData/gradle/configurator/changeCoroutinesSupport/build.gradle.after
@@ -0,0 +1,20 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+    }
+}
+
+apply plugin: 'kotlin'
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+}
+kotlin {
+    experimental {
+          coroutines "enable"
+    }
+}
diff --git a/idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts b/idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts
new file mode 100644
index 00000000000..8ae41abbd2c
--- /dev/null
+++ b/idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts
@@ -0,0 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.Coroutines
+
+kotlin {
+    experimental.coroutines = Coroutines.DISABLE
+}
diff --git a/idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts.after
new file mode 100644
index 00000000000..cf0ea6d7678
--- /dev/null
+++ b/idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts.after
@@ -0,0 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.Coroutines
+
+kotlin {
+    experimental.coroutines = Coroutines.ENABLE
+}
diff --git a/idea/testData/gradle/configurator/changeLanguageVersion/build.gradle b/idea/testData/gradle/configurator/changeLanguageVersion/build.gradle
new file mode 100644
index 00000000000..3c098b6673c
--- /dev/null
+++ b/idea/testData/gradle/configurator/changeLanguageVersion/build.gradle
@@ -0,0 +1,20 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+    }
+}
+
+apply plugin: 'kotlin'
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+}
+compileKotlin {
+    kotlinOptions {
+        languageVersion = "1.0"
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/changeLanguageVersion/build.gradle.after b/idea/testData/gradle/configurator/changeLanguageVersion/build.gradle.after
new file mode 100644
index 00000000000..1b66d1e0564
--- /dev/null
+++ b/idea/testData/gradle/configurator/changeLanguageVersion/build.gradle.after
@@ -0,0 +1,20 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+    }
+}
+
+apply plugin: 'kotlin'
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+}
+compileKotlin {
+    kotlinOptions {
+        languageVersion = "1.1"
+    }
+}
diff --git a/idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts b/idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts
new file mode 100644
index 00000000000..decac356650
--- /dev/null
+++ b/idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts
@@ -0,0 +1,4 @@
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+   languageVersion = "1.0"
+}
diff --git a/idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts.after
new file mode 100644
index 00000000000..37143c1a29e
--- /dev/null
+++ b/idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts.after
@@ -0,0 +1,4 @@
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+    languageVersion = "1.1"
+}
diff --git a/idea/testData/gradle/configurator/configure10/app/build.gradle b/idea/testData/gradle/configurator/configure10/app/build.gradle
new file mode 100644
index 00000000000..d6b421a6f54
--- /dev/null
+++ b/idea/testData/gradle/configurator/configure10/app/build.gradle
@@ -0,0 +1,6 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/configure10/build.gradle.after b/idea/testData/gradle/configurator/configure10/build.gradle.after
new file mode 100644
index 00000000000..1da77db838f
--- /dev/null
+++ b/idea/testData/gradle/configurator/configure10/build.gradle.after
@@ -0,0 +1,17 @@
+buildscript {
+    ext.kotlin_version = '1.0.6'
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+apply plugin: 'kotlin'
+repositories {
+    mavenCentral()
+}
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
diff --git a/idea/testData/gradle/configurator/configure10/settings.gradle b/idea/testData/gradle/configurator/configure10/settings.gradle
new file mode 100644
index 00000000000..9d495b34f86
--- /dev/null
+++ b/idea/testData/gradle/configurator/configure10/settings.gradle
@@ -0,0 +1 @@
+include ':app'
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/configureGSK/app/build.gradle.kts b/idea/testData/gradle/configurator/configureGSK/app/build.gradle.kts
new file mode 100644
index 00000000000..d6b421a6f54
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureGSK/app/build.gradle.kts
@@ -0,0 +1,6 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/configureGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/configureGSK/build.gradle.kts.after
new file mode 100644
index 00000000000..8c6dd573435
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureGSK/build.gradle.kts.after
@@ -0,0 +1,31 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+val kotlin_version: String by extra
+buildscript {
+    var kotlin_version: String by extra
+    kotlin_version = "1.1.2"
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath(kotlinModule("gradle-plugin", kotlin_version))
+    }
+}
+apply {
+    plugin("kotlin")
+}
+dependencies {
+    compile(kotlinModule("stdlib-jre8", kotlin_version))
+}
+repositories {
+    mavenCentral()
+}
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}
+val compileTestKotlin: KotlinCompile by tasks
+compileTestKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}
diff --git a/idea/testData/gradle/configurator/configureGSK/settings.gradle b/idea/testData/gradle/configurator/configureGSK/settings.gradle
new file mode 100644
index 00000000000..9d495b34f86
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureGSK/settings.gradle
@@ -0,0 +1 @@
+include ':app'
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/app/build.gradle.kts b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/app/build.gradle.kts
new file mode 100644
index 00000000000..aba17bf341a
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/app/build.gradle.kts
@@ -0,0 +1,2 @@
+group = "testgroup"
+version = "1.0-SNAPSHOT"
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.after b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.after
new file mode 100644
index 00000000000..ed59bca8a49
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.after
@@ -0,0 +1,38 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+val kotlin_version: String by extra
+buildscript {
+    var kotlin_version: String by extra
+    kotlin_version = "1.2.60-dev-286"
+    repositories {
+        maven {
+            setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/")
+        }
+        mavenCentral()
+    }
+    dependencies {
+        classpath(kotlinModule("gradle-plugin", kotlin_version))
+    }
+}
+group = "testgroup"
+version = "1.0-SNAPSHOT"
+apply {
+    plugin("kotlin")
+}
+dependencies {
+    compile(kotlinModule("stdlib-jdk8", kotlin_version))
+}
+repositories {
+    maven {
+        setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/")
+    }
+    mavenCentral()
+}
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}
+val compileTestKotlin: KotlinCompile by tasks
+compileTestKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}
diff --git a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/settings.gradle b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/settings.gradle
new file mode 100644
index 00000000000..9d495b34f86
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/settings.gradle
@@ -0,0 +1 @@
+include ':app'
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/configureKotlinDevVersion/app/build.gradle b/idea/testData/gradle/configurator/configureKotlinDevVersion/app/build.gradle
new file mode 100644
index 00000000000..a17915333d4
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureKotlinDevVersion/app/build.gradle
@@ -0,0 +1,2 @@
+group 'testgroup'
+version '1.0-SNAPSHOT'
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.after b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.after
new file mode 100644
index 00000000000..fe0f2d7ba0c
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.after
@@ -0,0 +1,34 @@
+group 'testgroup'
+version '1.0-SNAPSHOT'
+buildscript {
+    ext.kotlin_version = '1.2.60-dev-286'
+    repositories {
+        maven {
+            url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/'
+        }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+apply plugin: 'kotlin'
+repositories {
+    maven {
+        url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/'
+    }
+    mavenCentral()
+}
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
diff --git a/idea/testData/gradle/configurator/configureKotlinDevVersion/settings.gradle b/idea/testData/gradle/configurator/configureKotlinDevVersion/settings.gradle
new file mode 100644
index 00000000000..9d495b34f86
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureKotlinDevVersion/settings.gradle
@@ -0,0 +1 @@
+include ':app'
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/app/build.gradle b/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/app/build.gradle
new file mode 100644
index 00000000000..0c8366a9522
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/app/build.gradle
@@ -0,0 +1,16 @@
+plugins {
+    id 'java'
+}
+
+group 'testgroup'
+version '1.0-SNAPSHOT'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+}
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/build.gradle.after b/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/build.gradle.after
new file mode 100644
index 00000000000..d504bc5bea1
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/build.gradle.after
@@ -0,0 +1,27 @@
+buildscript {
+    ext.kotlin_version = '1.0.6'
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+plugins {
+    id 'java'
+}
+apply plugin: 'kotlin'
+
+group 'testgroup'
+version '1.0-SNAPSHOT'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
diff --git a/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/settings.gradle b/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/settings.gradle
new file mode 100644
index 00000000000..9d495b34f86
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/settings.gradle
@@ -0,0 +1 @@
+include ':app'
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/listNonConfiguredModules/app/build.gradle b/idea/testData/gradle/configurator/listNonConfiguredModules/app/build.gradle
new file mode 100644
index 00000000000..791677a478b
--- /dev/null
+++ b/idea/testData/gradle/configurator/listNonConfiguredModules/app/build.gradle
@@ -0,0 +1,8 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
+
+apply plugin: 'java'
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/listNonConfiguredModules/app/src/main/java/foo.kt b/idea/testData/gradle/configurator/listNonConfiguredModules/app/src/main/java/foo.kt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/idea/testData/gradle/configurator/listNonConfiguredModules/settings.gradle b/idea/testData/gradle/configurator/listNonConfiguredModules/settings.gradle
new file mode 100644
index 00000000000..9d495b34f86
--- /dev/null
+++ b/idea/testData/gradle/configurator/listNonConfiguredModules/settings.gradle
@@ -0,0 +1 @@
+include ':app'
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/listNonConfiguredModulesConfigured/app/build.gradle b/idea/testData/gradle/configurator/listNonConfiguredModulesConfigured/app/build.gradle
new file mode 100644
index 00000000000..030f7952241
--- /dev/null
+++ b/idea/testData/gradle/configurator/listNonConfiguredModulesConfigured/app/build.gradle
@@ -0,0 +1,17 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
+
+apply plugin: 'java'
+
+repositories {
+    jcenter()
+    mavenCentral()
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.3"
+}
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/listNonConfiguredModulesConfigured/app/src/main/java/foo.kt b/idea/testData/gradle/configurator/listNonConfiguredModulesConfigured/app/src/main/java/foo.kt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/idea/testData/gradle/configurator/listNonConfiguredModulesConfigured/settings.gradle b/idea/testData/gradle/configurator/listNonConfiguredModulesConfigured/settings.gradle
new file mode 100644
index 00000000000..9d495b34f86
--- /dev/null
+++ b/idea/testData/gradle/configurator/listNonConfiguredModulesConfigured/settings.gradle
@@ -0,0 +1 @@
+include ':app'
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredOnlyTest/app/build.gradle b/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredOnlyTest/app/build.gradle
new file mode 100644
index 00000000000..d2ddfe34c2c
--- /dev/null
+++ b/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredOnlyTest/app/build.gradle
@@ -0,0 +1,17 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
+
+apply plugin: 'java'
+
+repositories {
+    jcenter()
+    mavenCentral()
+}
+
+dependencies {
+    testCompile "org.jetbrains.kotlin:kotlin-stdlib:1.1.3"
+}
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredOnlyTest/app/src/test/java/foo.kt b/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredOnlyTest/app/src/test/java/foo.kt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredOnlyTest/settings.gradle b/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredOnlyTest/settings.gradle
new file mode 100644
index 00000000000..9d495b34f86
--- /dev/null
+++ b/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredOnlyTest/settings.gradle
@@ -0,0 +1 @@
+include ':app'
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredWithImplementation/app/build.gradle b/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredWithImplementation/app/build.gradle
new file mode 100644
index 00000000000..4840f30dfc2
--- /dev/null
+++ b/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredWithImplementation/app/build.gradle
@@ -0,0 +1,17 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
+
+apply plugin: 'java'
+
+repositories {
+    jcenter()
+    mavenCentral()
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.1.3"
+}
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredWithImplementation/app/src/main/java/foo.kt b/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredWithImplementation/app/src/main/java/foo.kt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredWithImplementation/settings.gradle b/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredWithImplementation/settings.gradle
new file mode 100644
index 00000000000..9d495b34f86
--- /dev/null
+++ b/idea/testData/gradle/configurator/listNonConfiguredModulesConfiguredWithImplementation/settings.gradle
@@ -0,0 +1 @@
+include ':app'
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/projectWithModule/app/build.gradle b/idea/testData/gradle/configurator/projectWithModule/app/build.gradle
new file mode 100644
index 00000000000..e4ff4f0d27d
--- /dev/null
+++ b/idea/testData/gradle/configurator/projectWithModule/app/build.gradle
@@ -0,0 +1,15 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+    }
+}
+
+apply plugin: 'kotlin'
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-0.0"   // intentionally invalid version
+}
\ No newline at end of file
diff --git a/idea/testData/gradle/configurator/projectWithModule/settings.gradle b/idea/testData/gradle/configurator/projectWithModule/settings.gradle
new file mode 100644
index 00000000000..9d495b34f86
--- /dev/null
+++ b/idea/testData/gradle/configurator/projectWithModule/settings.gradle
@@ -0,0 +1 @@
+include ':app'
\ No newline at end of file