diff --git a/buildSrc/src/main/kotlin/pill/plugin.kt b/buildSrc/src/main/kotlin/pill/plugin.kt
index cb160742e15..639834959cb 100644
--- a/buildSrc/src/main/kotlin/pill/plugin.kt
+++ b/buildSrc/src/main/kotlin/pill/plugin.kt
@@ -272,7 +272,7 @@ class JpsCompatiblePlugin : Plugin<Project> {
                 addOrReplaceOptionValue("idea.home.path", platformDirProjectRelative)
                 addOrReplaceOptionValue("ideaSdk.androidPlugin.path", platformDirProjectRelative + "/plugins/android/lib")
                 addOrReplaceOptionValue("robolectric.classpath", robolectricClasspath)
-                addOrReplaceOptionValue("use.pill", "true")
+                addOrReplaceOptionValue("use.jps", "true")
 
                 val isAndroidStudioBunch = project.findProperty("versions.androidStudioRelease") != null
                 addOrReplaceOptionValue("idea.platform.prefix", if (isAndroidStudioBunch) "AndroidStudio" else null)
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java
index 928d40ff367..c296274be27 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java
@@ -36,7 +36,7 @@ public class JUnit3RunnerWithInners extends Runner implements Filterable, Sortab
     public JUnit3RunnerWithInners(Class<?> klass) {
         super();
 
-        if ("true".equals(System.getProperty("use.pill"))) {
+        if ("true".equals(System.getProperty("use.jps"))) {
             delegateRunner = new JUnit3RunnerWithInnersForJPS(klass);
         }
         else {
diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts
index 2b37d9d379d..4046bda502d 100644
--- a/gradle/jps.gradle.kts
+++ b/gradle/jps.gradle.kts
@@ -19,7 +19,8 @@ fun org.jetbrains.gradle.ext.JUnit.configureForKotlin() {
         "-Didea.is.unit.test=true",
         "-Didea.home.path=$ideaSdkPath",
         "-Djps.kotlin.home=${ideaPluginDir.absolutePath}",
-        "-Dkotlin.ni=" + if (rootProject.hasProperty("newInferenceTests")) "true" else "false"
+        "-Dkotlin.ni=" + if (rootProject.hasProperty("newInferenceTests")) "true" else "false",
+        "-Duse.jps=true"
     ).joinToString(" ")
     envs = mapOf(
         "NO_FS_ROOTS_ACCESS_CHECK" to "true",