diff --git a/buildSrc/src/main/kotlin/common-configuration.gradle.kts b/buildSrc/src/main/kotlin/common-configuration.gradle.kts
index b11cb3ad0ed..0d8605b0204 100644
--- a/buildSrc/src/main/kotlin/common-configuration.gradle.kts
+++ b/buildSrc/src/main/kotlin/common-configuration.gradle.kts
@@ -22,6 +22,8 @@ dependencies {
     }
 }
 
+project.applyFixForStdlib16()
+
 apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts")
 project.configureJvmDefaultToolchain()
 project.addEmbeddedConfigurations()
@@ -99,7 +101,7 @@ fun Project.configureJavaBasePlugin() {
 }
 
 fun Project.configureKotlinCompilationOptions() {
-    plugins.withType<KotlinBasePluginWrapper>() {
+    plugins.withType<KotlinBasePluginWrapper> {
         val commonCompilerArgs = listOfNotNull(
             "-opt-in=kotlin.RequiresOptIn",
             "-progressive".takeIf { hasProperty("test.progressive.mode") }
@@ -189,6 +191,16 @@ fun Project.configureKotlinCompilationOptions() {
     }
 }
 
+// Still compile stdlib, reflect, kotlin.test and scripting runtimes
+// with JVM target 1.6 to simplify migration from Kotlin 1.6 to 1.7.
+fun Project.applyFixForStdlib16() {
+    plugins.withType<KotlinBasePluginWrapper>() {
+        dependencies {
+            "kotlinCompilerClasspath"(project(":libraries:tools:stdlib-compiler-classpath"))
+        }
+    }
+}
+
 fun Project.configureArtifacts() {
     tasks.withType<Javadoc>().configureEach {
         enabled = false
diff --git a/compiler/tests-common-jvm6/build.gradle.kts b/compiler/tests-common-jvm6/build.gradle.kts
index a31857853da..a52c4b35c61 100644
--- a/compiler/tests-common-jvm6/build.gradle.kts
+++ b/compiler/tests-common-jvm6/build.gradle.kts
@@ -8,7 +8,6 @@ project.updateJvmTarget("1.6")
 dependencies {
     api(kotlinStdlib())
     testApi(project(":kotlin-test:kotlin-test-jvm"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/compiler.common.jvm/build.gradle.kts b/core/compiler.common.jvm/build.gradle.kts
index b17b84c077f..a87c74b4449 100644
--- a/core/compiler.common.jvm/build.gradle.kts
+++ b/core/compiler.common.jvm/build.gradle.kts
@@ -7,7 +7,6 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
 
 dependencies {
     api(project(":core:compiler.common"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/compiler.common/build.gradle.kts b/core/compiler.common/build.gradle.kts
index 7e58c26be49..e8022e8d91b 100644
--- a/core/compiler.common/build.gradle.kts
+++ b/core/compiler.common/build.gradle.kts
@@ -9,7 +9,6 @@ dependencies {
     api(project(":core:util.runtime"))
     api(kotlinStdlib())
     api(project(":kotlin-annotations-jvm"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/descriptors.jvm/build.gradle.kts b/core/descriptors.jvm/build.gradle.kts
index bd187c3fe92..8e2767dbf1d 100644
--- a/core/descriptors.jvm/build.gradle.kts
+++ b/core/descriptors.jvm/build.gradle.kts
@@ -13,7 +13,6 @@ dependencies {
     api(project(":core:deserialization.common.jvm"))
     api(project(":core:util.runtime"))
     api(commonDependency("javax.inject"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts
index 4980d0d370f..be41d14766d 100644
--- a/core/descriptors.runtime/build.gradle.kts
+++ b/core/descriptors.runtime/build.gradle.kts
@@ -26,8 +26,6 @@ dependencies {
     testApi(projectTests(":generators:test-generator"))
 
     testApi(intellijCore())
-
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts
index e58faa6e3bb..c39470e3d59 100644
--- a/core/descriptors/build.gradle.kts
+++ b/core/descriptors/build.gradle.kts
@@ -10,7 +10,6 @@ dependencies {
     api(project(":core:util.runtime"))
     api(kotlinStdlib())
     api(project(":kotlin-annotations-jvm"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/deserialization.common.jvm/build.gradle.kts b/core/deserialization.common.jvm/build.gradle.kts
index deb7f91fcb0..70bfe2d567b 100644
--- a/core/deserialization.common.jvm/build.gradle.kts
+++ b/core/deserialization.common.jvm/build.gradle.kts
@@ -9,7 +9,6 @@ dependencies {
     api(project(":core:metadata.jvm"))
     api(project(":core:deserialization.common"))
     implementation(project(":core:compiler.common.jvm"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/deserialization.common/build.gradle.kts b/core/deserialization.common/build.gradle.kts
index ab564432c96..ccbc08528a1 100644
--- a/core/deserialization.common/build.gradle.kts
+++ b/core/deserialization.common/build.gradle.kts
@@ -8,7 +8,6 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
 dependencies {
     api(project(":core:compiler.common"))
     api(project(":core:metadata"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/deserialization/build.gradle.kts b/core/deserialization/build.gradle.kts
index c96a52f41e6..6340eb559f7 100644
--- a/core/deserialization/build.gradle.kts
+++ b/core/deserialization/build.gradle.kts
@@ -11,7 +11,6 @@ dependencies {
     api(project(":core:util.runtime"))
     api(project(":core:descriptors"))
     api(commonDependency("javax.inject"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/metadata.jvm/build.gradle.kts b/core/metadata.jvm/build.gradle.kts
index 9f01714c62c..42d6971504c 100644
--- a/core/metadata.jvm/build.gradle.kts
+++ b/core/metadata.jvm/build.gradle.kts
@@ -7,7 +7,6 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
 
 dependencies {
     api(project(":core:metadata"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/metadata/build.gradle.kts b/core/metadata/build.gradle.kts
index e1d6ce3b8d7..2c057f87691 100644
--- a/core/metadata/build.gradle.kts
+++ b/core/metadata/build.gradle.kts
@@ -8,7 +8,6 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
 dependencies {
     api(protobufLite())
     api(kotlinStdlib())
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/util.runtime/build.gradle.kts b/core/util.runtime/build.gradle.kts
index 3826ffa75ab..6f234688663 100644
--- a/core/util.runtime/build.gradle.kts
+++ b/core/util.runtime/build.gradle.kts
@@ -7,7 +7,6 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
 
 dependencies {
     compileOnly(kotlinStdlib())
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle
index f24719034cb..75a4e84bed5 100644
--- a/libraries/kotlin.test/common/build.gradle
+++ b/libraries/kotlin.test/common/build.gradle
@@ -7,7 +7,6 @@ JvmToolchain.updateJvmTarget(project, "1.6")
 dependencies {
     api kotlinStdlib("common")
     testApi project(":kotlin-test:kotlin-test-annotations-common")
-    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 jar {
diff --git a/libraries/kotlin.test/junit/build.gradle b/libraries/kotlin.test/junit/build.gradle
index 3c234291389..76d00f39d1e 100644
--- a/libraries/kotlin.test/junit/build.gradle
+++ b/libraries/kotlin.test/junit/build.gradle
@@ -16,7 +16,6 @@ dependencies {
     expectedBy project(':kotlin-test:kotlin-test-annotations-common')
     api project(':kotlin-test:kotlin-test-jvm')
     api('junit:junit:4.13.2')
-    kotlinCompilerClasspath(project(':libraries:tools:stdlib-compiler-classpath'))
 }
 
 
diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle
index 4337822b0ca..c5cd642a77a 100644
--- a/libraries/kotlin.test/jvm/build.gradle
+++ b/libraries/kotlin.test/jvm/build.gradle
@@ -19,7 +19,6 @@ dependencies {
     api(kotlinStdlib())
     testApi(project(":kotlin-test:kotlin-test-junit"))
     testApi('junit:junit:4.13.2')
-    kotlinCompilerClasspath(project(':libraries:tools:stdlib-compiler-classpath'))
 }
 
 jar {
diff --git a/libraries/kotlin.test/testng/build.gradle b/libraries/kotlin.test/testng/build.gradle
index 7ff56884ee2..2a69163372b 100644
--- a/libraries/kotlin.test/testng/build.gradle
+++ b/libraries/kotlin.test/testng/build.gradle
@@ -20,7 +20,6 @@ dependencies {
     if (includeJava9) {
         java9CompileOnly('org.testng:testng:7.0.0')
     }
-    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 jar {
diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle
index e1c37395e83..9a9e2e263cc 100644
--- a/libraries/reflect/api/build.gradle
+++ b/libraries/reflect/api/build.gradle
@@ -29,7 +29,6 @@ dependencies {
     compileOnly project(':core:descriptors.runtime')
     compileOnly project(':core:util.runtime')
     compileOnly "org.jetbrains:annotations:13.0"
-    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 if (includeJava9) {
diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts
index 273de87c656..2b073a2ee75 100644
--- a/libraries/scripting/common/build.gradle.kts
+++ b/libraries/scripting/common/build.gradle.kts
@@ -9,7 +9,6 @@ dependencies {
     api(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
     testApi(commonDependency("junit"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/dependencies-maven/build.gradle.kts b/libraries/scripting/dependencies-maven/build.gradle.kts
index 481917372d0..f802f76d863 100644
--- a/libraries/scripting/dependencies-maven/build.gradle.kts
+++ b/libraries/scripting/dependencies-maven/build.gradle.kts
@@ -21,7 +21,6 @@ dependencies {
     testRuntimeOnly("org.slf4j:slf4j-nop:1.7.36")
     testImplementation(kotlin("reflect"))
     testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/dependencies/build.gradle.kts b/libraries/scripting/dependencies/build.gradle.kts
index 7752eda8170..728c14c2136 100644
--- a/libraries/scripting/dependencies/build.gradle.kts
+++ b/libraries/scripting/dependencies/build.gradle.kts
@@ -10,7 +10,6 @@ dependencies {
     api(project(":kotlin-scripting-common"))
     testApi(commonDependency("junit"))
     testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts
index 6783525ac61..b019def9fd9 100644
--- a/libraries/scripting/jvm/build.gradle.kts
+++ b/libraries/scripting/jvm/build.gradle.kts
@@ -10,7 +10,6 @@ dependencies {
     api(kotlinStdlib())
     api(project(":kotlin-scripting-common"))
     testApi(commonDependency("junit"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index 7558ac8ee98..ffcce3c6e83 100644
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -44,7 +44,6 @@ configurations {
 dependencies {
     api project(':kotlin-stdlib')
     testApi project(':kotlin-test:kotlin-test-junit')
-    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 jar {
diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
index 46e3b4afc31..c5e7fe35cdb 100644
--- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
+++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
@@ -20,7 +20,6 @@ val builtins by configurations.creating {
 dependencies {
     compileOnly(project(":kotlin-stdlib"))
     builtins(project(":core:builtins"))
-    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index aa9d263a563..ad951330b7e 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -63,8 +63,6 @@ dependencies {
     testApi project(':kotlin-test:kotlin-test-junit')
 
     builtins project(':core:builtins')
-
-    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 jar {
diff --git a/libraries/tools/kotlin-annotations-jvm/build.gradle b/libraries/tools/kotlin-annotations-jvm/build.gradle
index f6ca223e6f4..7b09125614b 100644
--- a/libraries/tools/kotlin-annotations-jvm/build.gradle
+++ b/libraries/tools/kotlin-annotations-jvm/build.gradle
@@ -16,7 +16,6 @@ sourceSets {
 
 dependencies {
     compileOnly DependenciesKt.kotlinBuiltins(project)
-    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 configureSourcesJar()
diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle
index f6586f3c1d3..f05d7629e00 100644
--- a/libraries/tools/script-runtime/build.gradle
+++ b/libraries/tools/script-runtime/build.gradle
@@ -8,7 +8,6 @@ configurePublishing(project)
 
 dependencies {
     compileOnly kotlinStdlib()
-    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 sourceSets {