diff --git a/libraries/examples/annotation-processor-example/build.gradle.kts b/libraries/examples/annotation-processor-example/build.gradle.kts
index 119bf3b7cee..2f6049a0b33 100644
--- a/libraries/examples/annotation-processor-example/build.gradle.kts
+++ b/libraries/examples/annotation-processor-example/build.gradle.kts
@@ -1,8 +1,15 @@
+import org.jetbrains.kotlin.pill.PillExtension
+
 description = "Simple Annotation Processor for testing kapt"
 
 plugins {
     kotlin("jvm")
     maven // only used for installing to mavenLocal()
+    id("jps-compatible")
+}
+
+pill {
+    variant = PillExtension.Variant.FULL
 }
 
 dependencies {
diff --git a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle
index 57685564498..db24cc05841 100644
--- a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle
+++ b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle
@@ -1,12 +1,16 @@
-
 apply plugin: 'kotlin'
 apply plugin: 'maven'
+apply plugin: 'jps-compatible'
 
 repositories {
     mavenLocal()
     jcenter()
 }
 
+pill {
+    variant = 'FULL'
+}
+
 dependencies {
     compile project(':kotlin-gradle-plugin-api')
     // Use this dependency instead when building apart from the other modules:
diff --git a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
index 89e6d0e528f..68786f670c6 100644
--- a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
+++ b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
@@ -1,8 +1,14 @@
+import org.jetbrains.kotlin.pill.PillExtension
 
 description = "Sample Kotlin JSR 223 scripting jar with daemon (out-of-process) compilation and local (in-process) evaluation"
 
 plugins {
     kotlin("jvm")
+    id("jps-compatible")
+}
+
+pill {
+    variant = PillExtension.Variant.FULL
 }
 
 val compilerClasspath by configurations.creating
diff --git a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts
index 3761186b975..8cc1be3dd8f 100644
--- a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts
+++ b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts
@@ -1,8 +1,14 @@
+import org.jetbrains.kotlin.pill.PillExtension
 
 description = "Sample Kotlin JSR 223 scripting jar with local (in-process) compilation and evaluation"
 
 plugins {
     kotlin("jvm")
+    id("jps-compatible")
+}
+
+pill {
+    variant = PillExtension.Variant.FULL
 }
 
 dependencies {
diff --git a/libraries/tools/binary-compatibility-validator/build.gradle b/libraries/tools/binary-compatibility-validator/build.gradle
index f533e252154..7089998962c 100644
--- a/libraries/tools/binary-compatibility-validator/build.gradle
+++ b/libraries/tools/binary-compatibility-validator/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'kotlin'
+apply plugin: 'jps-compatible'
 
 configurations {
     testArtifacts
@@ -21,6 +22,10 @@ dependencies {
     testArtifacts project(':kotlin-reflect')
 }
 
+pill {
+    variant = 'FULL'
+}
+
 sourceSets {
     test {
         java {
diff --git a/libraries/tools/kotlin-allopen/build.gradle b/libraries/tools/kotlin-allopen/build.gradle
index f46a6c9b468..56441b8b60d 100644
--- a/libraries/tools/kotlin-allopen/build.gradle
+++ b/libraries/tools/kotlin-allopen/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'kotlin'
+apply plugin: 'jps-compatible'
 
 configureJvmProject(project)
 configurePublishing(project)
@@ -8,6 +9,10 @@ repositories {
     jcenter()
 }
 
+pill {
+    variant = 'FULL'
+}
+
 dependencies {
     compile project(':kotlin-gradle-plugin-api')
     compile project(':kotlin-gradle-plugin-model')
diff --git a/libraries/tools/kotlin-annotations-android/build.gradle.kts b/libraries/tools/kotlin-annotations-android/build.gradle.kts
index 875a5d09196..d595cd17cfa 100644
--- a/libraries/tools/kotlin-annotations-android/build.gradle.kts
+++ b/libraries/tools/kotlin-annotations-android/build.gradle.kts
@@ -1,9 +1,15 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.pill.PillExtension
 
 description = "Kotlin annotations for Android"
 
 plugins {
     kotlin("jvm")
+    id("jps-compatible")
+}
+
+pill {
+    variant = PillExtension.Variant.FULL
 }
 
 jvmTarget = "1.6"
diff --git a/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts
index 46d0a4c18de..1a3db832f1c 100644
--- a/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.pill.PillExtension
 plugins {
     kotlin("jvm")
     maven
+    id("jps-compatible")
 }
 
 publish()
@@ -14,6 +15,10 @@ dependencies {
     compile(kotlinStdlib())
 }
 
+pill {
+    variant = PillExtension.Variant.FULL
+}
+
 tasks {
     withType<KotlinCompile> {
         kotlinOptions.languageVersion = "1.2"
diff --git a/libraries/tools/kotlin-noarg/build.gradle b/libraries/tools/kotlin-noarg/build.gradle
index 3b4bc029f5a..4ff84864c25 100644
--- a/libraries/tools/kotlin-noarg/build.gradle
+++ b/libraries/tools/kotlin-noarg/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'kotlin'
+apply plugin: 'jps-compatible'
 
 configureJvmProject(project)
 configurePublishing(project)
@@ -14,6 +15,10 @@ repositories {
     jcenter()
 }
 
+pill {
+    variant = 'FULL'
+}
+
 dependencies {
     compile project(':kotlin-gradle-plugin-api')
     compile project(':kotlin-gradle-plugin-model')
diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle
index ef3c88195f9..d64f68855f0 100644
--- a/libraries/tools/kotlin-sam-with-receiver/build.gradle
+++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'kotlin'
+apply plugin: 'jps-compatible'
 
 configureJvmProject(project)
 configurePublishing(project)
@@ -9,6 +10,10 @@ compileJava {
     options.fork = false
 }
 
+pill {
+    variant = 'FULL'
+}
+
 repositories {
     mavenLocal()
     jcenter()
diff --git a/libraries/tools/kotlin-serialization/build.gradle b/libraries/tools/kotlin-serialization/build.gradle
index fde83719449..047e1947cb7 100644
--- a/libraries/tools/kotlin-serialization/build.gradle
+++ b/libraries/tools/kotlin-serialization/build.gradle
@@ -1,8 +1,13 @@
 apply plugin: 'kotlin'
+apply plugin: 'jps-compatible'
 
 configureJvmProject(project)
 configurePublishing(project)
 
+pill {
+    variant = 'FULL'
+}
+
 compileJava {
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
diff --git a/test-instrumenter/build.gradle.kts b/test-instrumenter/build.gradle.kts
index e663d450bb4..3b7d8d0cb87 100644
--- a/test-instrumenter/build.gradle.kts
+++ b/test-instrumenter/build.gradle.kts
@@ -1,8 +1,14 @@
 import org.gradle.jvm.tasks.Jar
+import org.jetbrains.kotlin.pill.PillExtension
 
 plugins {
     java
     kotlin("jvm")
+    id("jps-compatible")
+}
+
+pill {
+    variant = PillExtension.Variant.FULL
 }
 
 dependencies {