diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts
index 0a01af7b5cb..8bda99c70d5 100644
--- a/jps/jps-plugin/build.gradle.kts
+++ b/jps/jps-plugin/build.gradle.kts
@@ -18,7 +18,11 @@ dependencies {
     compile(project(":idea:idea-jps-common"))
     compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
     compileOnly(intellijDep()) {
-        includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject)
+        if (Platform[181].orHigher()) {
+            includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject)
+        } else {
+            includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject)
+        }
     }
     compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))
@@ -29,8 +33,14 @@ dependencies {
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectTests(":kotlin-build-common"))
     testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
-    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") }
-    testCompile(intellijDep("devkit"))
+    Ide.IJ {
+        testCompile(intellijDep("devkit"))
+    }
+    if (Platform[181].orHigher()) {
+        testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") }
+    } else {
+        testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") }
+    }
     testCompile(intellijDep("jps-build-test"))
     compilerModules.forEach {
         testRuntime(project(it))
@@ -43,7 +53,9 @@ dependencies {
 sourceSets {
     "main" { projectDefault() }
     "test" {
-        java.srcDirs("jps-tests/test")
+        Ide.IJ {
+            java.srcDirs("jps-tests/test")
+        }
     }
 }
 
diff --git a/jps/jps-plugin/build.gradle.kts.173 b/jps/jps-plugin/build.gradle.kts.173
deleted file mode 100644
index d82dceb0827..00000000000
--- a/jps/jps-plugin/build.gradle.kts.173
+++ /dev/null
@@ -1,57 +0,0 @@
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-val compilerModules: Array<String> by rootProject.extra
-
-dependencies {
-    compile(project(":kotlin-build-common"))
-    compile(project(":core:descriptors"))
-    compile(project(":core:descriptors.jvm"))
-    compile(project(":kotlin-compiler-runner"))
-    compile(project(":compiler:daemon-common"))
-    compile(projectRuntimeJar(":kotlin-daemon-client"))
-    compile(project(":compiler:frontend.java"))
-    compile(project(":js:js.frontend"))
-    compile(projectRuntimeJar(":kotlin-preloader"))
-    compile(project(":idea:idea-jps-common"))
-    compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
-    compileOnly(intellijDep()) {
-        includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject)
-    }
-    compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
-    testCompileOnly(project(":kotlin-reflect-api"))
-    testCompile(project(":compiler:incremental-compilation-impl"))
-    testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":compiler:incremental-compilation-impl"))
-    testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    testCompile(projectTests(":kotlin-build-common"))
-    testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
-    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") }
-    testCompile(intellijDep("devkit"))
-    testCompile(intellijDep("jps-build-test"))
-    compilerModules.forEach {
-        testRuntime(project(it))
-    }
-    testRuntime(intellijDep())
-    testRuntime(project(":kotlin-reflect"))
-    testRuntime(project(":kotlin-script-runtime"))
-}
-
-sourceSets {
-    "main" { projectDefault() }
-    "test" {
-        java.srcDirs("jps-tests/test")
-    }
-}
-
-projectTest {
-    // do not replace with compile/runtime dependency,
-    // because it forces Intellij reindexing after each compiler change
-    dependsOn(":kotlin-compiler:dist")
-    workingDir = rootDir
-}
-
-testsJar {}
diff --git a/jps/jps-plugin/build.gradle.kts.as31 b/jps/jps-plugin/build.gradle.kts.as31
deleted file mode 100644
index 198f9eec55b..00000000000
--- a/jps/jps-plugin/build.gradle.kts.as31
+++ /dev/null
@@ -1,56 +0,0 @@
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-val compilerModules: Array<String> by rootProject.extra
-
-dependencies {
-    compile(project(":kotlin-build-common"))
-    compile(project(":core:descriptors"))
-    compile(project(":core:descriptors.jvm"))
-    compile(project(":kotlin-compiler-runner"))
-    compile(project(":compiler:daemon-common"))
-    compile(projectRuntimeJar(":kotlin-daemon-client"))
-    compile(project(":compiler:frontend.java"))
-    compile(project(":js:js.frontend"))
-    compile(projectRuntimeJar(":kotlin-preloader"))
-    compile(project(":idea:idea-jps-common"))
-    compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
-    compileOnly(intellijDep()) {
-        includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject)
-    }
-    compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
-    testCompileOnly(project(":kotlin-reflect-api"))
-    testCompile(project(":compiler:incremental-compilation-impl"))
-    testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":compiler:incremental-compilation-impl"))
-    testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    testCompile(projectTests(":kotlin-build-common"))
-    testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
-    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") }
-    testCompile(intellijDep("jps-build-test"))
-    compilerModules.forEach {
-        testRuntime(project(it))
-    }
-    testRuntime(intellijDep())
-    testRuntime(project(":kotlin-reflect"))
-    testRuntime(project(":kotlin-script-runtime"))
-}
-
-sourceSets {
-    "main" { projectDefault() }
-    "test" {
-        // No JPS in AS
-    }
-}
-
-projectTest {
-    // do not replace with compile/runtime dependency,
-    // because it forces Intellij reindexing after each compiler change
-    dependsOn(":kotlin-compiler:dist")
-    workingDir = rootDir
-}
-
-testsJar {}
diff --git a/jps/jps-plugin/build.gradle.kts.as32 b/jps/jps-plugin/build.gradle.kts.as32
deleted file mode 100644
index 1405495bbaa..00000000000
--- a/jps/jps-plugin/build.gradle.kts.as32
+++ /dev/null
@@ -1,56 +0,0 @@
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-val compilerModules: Array<String> by rootProject.extra
-
-dependencies {
-    compile(project(":kotlin-build-common"))
-    compile(project(":core:descriptors"))
-    compile(project(":core:descriptors.jvm"))
-    compile(project(":kotlin-compiler-runner"))
-    compile(project(":compiler:daemon-common"))
-    compile(projectRuntimeJar(":kotlin-daemon-client"))
-    compile(project(":compiler:frontend.java"))
-    compile(project(":js:js.frontend"))
-    compile(projectRuntimeJar(":kotlin-preloader"))
-    compile(project(":idea:idea-jps-common"))
-    compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
-    compileOnly(intellijDep()) {
-        includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject)
-    }
-    compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
-    testCompileOnly(project(":kotlin-reflect-api"))
-    testCompile(project(":compiler:incremental-compilation-impl"))
-    testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":compiler:incremental-compilation-impl"))
-    testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    testCompile(projectTests(":kotlin-build-common"))
-    testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
-    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") }
-    testCompile(intellijDep("jps-build-test"))
-    compilerModules.forEach {
-        testRuntime(project(it))
-    }
-    testRuntime(intellijDep())
-    testRuntime(project(":kotlin-reflect"))
-    testRuntime(project(":kotlin-script-runtime"))
-}
-
-sourceSets {
-    "main" { projectDefault() }
-    "test" {
-        // No JPS in AS
-    }
-}
-
-projectTest {
-    // do not replace with compile/runtime dependency,
-    // because it forces Intellij reindexing after each compiler change
-    dependsOn(":kotlin-compiler:dist")
-    workingDir = rootDir
-}
-
-testsJar {}
diff --git a/jps/jps-plugin/build.gradle.kts.as33 b/jps/jps-plugin/build.gradle.kts.as33
deleted file mode 100644
index c8cfa68a943..00000000000
--- a/jps/jps-plugin/build.gradle.kts.as33
+++ /dev/null
@@ -1,55 +0,0 @@
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-val compilerModules: Array<String> by rootProject.extra
-
-dependencies {
-    compile(project(":kotlin-build-common"))
-    compile(project(":core:descriptors"))
-    compile(project(":core:descriptors.jvm"))
-    compile(project(":kotlin-compiler-runner"))
-    compile(project(":compiler:daemon-common"))
-    compile(projectRuntimeJar(":kotlin-daemon-client"))
-    compile(project(":compiler:frontend.java"))
-    compile(project(":js:js.frontend"))
-    compile(projectRuntimeJar(":kotlin-preloader"))
-    compile(project(":idea:idea-jps-common"))
-    compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
-    compileOnly(intellijDep()) {
-        includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject)
-    }
-    compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
-    testCompileOnly(project(":kotlin-reflect-api"))
-    testCompile(project(":compiler:incremental-compilation-impl"))
-    testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":compiler:incremental-compilation-impl"))
-    testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    testCompile(projectTests(":kotlin-build-common"))
-    testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
-    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") }
-    testCompile(intellijDep("jps-build-test"))
-    compilerModules.forEach {
-        testRuntime(project(it))
-    }
-    testRuntime(intellijDep())
-    testRuntime(project(":kotlin-reflect"))
-}
-
-sourceSets {
-    "main" { projectDefault() }
-    "test" {
-        /*java.srcDirs("jps-tests/test"
-                     /*, "kannotator-jps-plugin-test/test"*/ // Obsolete
-        )*/
-    }
-}
-
-projectTest {
-    dependsOn(":kotlin-compiler:dist")
-    workingDir = rootDir
-}
-
-testsJar {}
diff --git a/jps/jps-plugin/build.gradle.kts.as34 b/jps/jps-plugin/build.gradle.kts.as34
deleted file mode 100644
index c8cfa68a943..00000000000
--- a/jps/jps-plugin/build.gradle.kts.as34
+++ /dev/null
@@ -1,55 +0,0 @@
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-val compilerModules: Array<String> by rootProject.extra
-
-dependencies {
-    compile(project(":kotlin-build-common"))
-    compile(project(":core:descriptors"))
-    compile(project(":core:descriptors.jvm"))
-    compile(project(":kotlin-compiler-runner"))
-    compile(project(":compiler:daemon-common"))
-    compile(projectRuntimeJar(":kotlin-daemon-client"))
-    compile(project(":compiler:frontend.java"))
-    compile(project(":js:js.frontend"))
-    compile(projectRuntimeJar(":kotlin-preloader"))
-    compile(project(":idea:idea-jps-common"))
-    compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
-    compileOnly(intellijDep()) {
-        includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject)
-    }
-    compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
-    testCompileOnly(project(":kotlin-reflect-api"))
-    testCompile(project(":compiler:incremental-compilation-impl"))
-    testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":compiler:incremental-compilation-impl"))
-    testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    testCompile(projectTests(":kotlin-build-common"))
-    testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
-    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") }
-    testCompile(intellijDep("jps-build-test"))
-    compilerModules.forEach {
-        testRuntime(project(it))
-    }
-    testRuntime(intellijDep())
-    testRuntime(project(":kotlin-reflect"))
-}
-
-sourceSets {
-    "main" { projectDefault() }
-    "test" {
-        /*java.srcDirs("jps-tests/test"
-                     /*, "kannotator-jps-plugin-test/test"*/ // Obsolete
-        )*/
-    }
-}
-
-projectTest {
-    dependsOn(":kotlin-compiler:dist")
-    workingDir = rootDir
-}
-
-testsJar {}