diff --git a/generators/build.gradle.kts.as31 b/generators/build.gradle.kts.as31
new file mode 100644
index 00000000000..bd432828ebf
--- /dev/null
+++ b/generators/build.gradle.kts.as31
@@ -0,0 +1,43 @@
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compile(projectTests(":compiler:cli"))
+    compile(projectTests(":idea:idea-maven"))
+    compile(projectTests(":j2k"))
+    compile(projectTests(":idea:idea-android"))
+    compile(projectTests(":jps-plugin"))
+    compile(projectTests(":plugins:android-extensions-compiler"))
+    compile(projectTests(":plugins:android-extensions-ide"))
+    compile(projectTests(":plugins:android-extensions-jps"))
+    compile(projectTests(":kotlin-annotation-processing"))
+    compile(projectTests(":kotlin-allopen-compiler-plugin"))
+    compile(projectTests(":kotlin-noarg-compiler-plugin"))
+    compile(projectTests(":kotlin-sam-with-receiver-compiler-plugin"))
+    compile(projectTests(":generators:test-generator"))
+    // testCompileOnly(intellijDep("jps-build-test"))
+    testCompileOnly(project(":kotlin-reflect-api"))
+    testRuntime(intellijDep()) { includeJars("idea_rt") }
+    testRuntime(projectDist(":kotlin-reflect"))
+}
+
+sourceSets {
+    "main" { }
+    "test" { projectDefault() }
+}
+
+projectTest {
+    workingDir = rootDir
+}
+
+val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateTestsKt")
+
+val generateProtoBuf by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufKt")
+val generateProtoBufCompare by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare")
+
+val generateGradleOptions by generator("org.jetbrains.kotlin.generators.arguments.GenerateGradleOptionsKt")
+
+testsJar()
diff --git a/jps-plugin/build.gradle.kts.as31 b/jps-plugin/build.gradle.kts.as31
new file mode 100644
index 00000000000..5da3a9e2fb7
--- /dev/null
+++ b/jps-plugin/build.gradle.kts.as31
@@ -0,0 +1,51 @@
+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(projectRuntimeJar(":kotlin-preloader"))
+    compile(project(":idea:idea-jps-common"))
+    compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all") }
+    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(projectDist(":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(projectDist(":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 {}