diff --git a/buildSrc/src/main/kotlin/localDependencies.kt b/buildSrc/src/main/kotlin/localDependencies.kt
index 557a3e82718..9e99d7112d1 100644
--- a/buildSrc/src/main/kotlin/localDependencies.kt
+++ b/buildSrc/src/main/kotlin/localDependencies.kt
@@ -174,7 +174,6 @@ fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File,
             "-XX:ReservedCodeCacheSize=240m",
             "-XX:+HeapDumpOnOutOfMemoryError",
             "-ea",
-            "-Didea.platform.prefix=Idea",
             "-Didea.debug.mode=true",
             "-Didea.system.path=$ideaSandboxDir",
             "-Didea.config.path=$ideaSandboxConfigDir",
@@ -184,6 +183,10 @@ fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File,
             "-Dplugin.path=${ideaPluginDir.absolutePath}"
         )
 
+        if (Platform[201].orHigher()) {
+            jvmArgs("-Didea.platform.prefix=Idea")
+        }
+
         if (rootProject.findProperty("versions.androidStudioRelease") != null) {
             jvmArgs("-Didea.platform.prefix=AndroidStudio")
         }
diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts
index b850ef4c6a3..07e2080fa2e 100644
--- a/gradle/jps.gradle.kts
+++ b/gradle/jps.gradle.kts
@@ -1,7 +1,10 @@
 @file:Suppress("UnstableApiUsage")
 
 import org.gradle.jvm.tasks.Jar
-import org.jetbrains.gradle.ext.*
+import org.jetbrains.gradle.ext.ActionDelegationConfig
+import org.jetbrains.gradle.ext.JUnit
+import org.jetbrains.gradle.ext.RecursiveArtifact
+import org.jetbrains.gradle.ext.TopLevelArtifact
 import org.jetbrains.kotlin.ideaExt.*
 
 
@@ -22,13 +25,15 @@ fun JUnit.configureForKotlin(xmx: String = "1600m") {
         "-XX:+UseCodeCacheFlushing",
         "-XX:ReservedCodeCacheSize=128m",
         "-Djna.nosys=true",
+        if (Platform[201].orHigher()) "-Didea.platform.prefix=Idea" else null,
         "-Didea.is.unit.test=true",
         "-Didea.home.path=$ideaSdkPath",
         "-Djps.kotlin.home=${ideaPluginDir.absolutePath}",
         "-Dkotlin.ni=" + if (rootProject.hasProperty("newInferenceTests")) "true" else "false",
         "-Duse.jps=true",
         "-Djava.awt.headless=true"
-    ).joinToString(" ")
+    ).filterNotNull().joinToString(" ")
+
     envs = mapOf(
         "NO_FS_ROOTS_ACCESS_CHECK" to "true",
         "PROJECT_CLASSES_DIRS" to "out/test/org.jetbrains.kotlin.compiler.test"