diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt
index 5bbe3b09eebd9829053520906d14a29eb143bb29..e3a903fd6f2ce6700a89755d68f79a32543b26cf 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt
@@ -165,9 +165,9 @@ class VariantAwareDependenciesIT : BaseGradleIT() {
                 "\n" + """
                 dependencies {
                     jvm6Implementation project(':${innerJvmProject.projectName}')
-                    jvm6TestRuntime project(':${innerJvmProject.projectName}')
+                    jvm6TestRuntimeOnly project(':${innerJvmProject.projectName}')
                     nodeJsImplementation project(':${innerJsProject.projectName}')
-                    nodeJsTestRuntime project(':${innerJsProject.projectName}')
+                    nodeJsTestRuntimeOnly project(':${innerJsProject.projectName}')
                 }
             """.trimIndent()
             )
@@ -184,12 +184,8 @@ class VariantAwareDependenciesIT : BaseGradleIT() {
         with(outerProject) {
             embedProject(innerProject)
 
-            gradleBuildScript().appendText(
-                "\nconfigurations['jvm6TestRuntime'].canBeConsumed = true"
-            )
-
             gradleBuildScript(innerProject.projectName).appendText(
-                "\ndependencies { testImplementation project(path: ':', configuration: 'jvm6TestRuntime') }"
+                "\ndependencies { testImplementation project(path: ':', configuration: 'jvm6RuntimeElements') }"
             )
 
             testResolveAllConfigurations(innerProject.projectName) {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
index 4373f0ac20d474207fa58e1ad2bf89ad178a1f88..5a77f3dded5cc78c022a6a7e2fe49765d836f6c7 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
@@ -171,7 +171,7 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
 
         val mainCompilation = target.compilations.maybeCreate(KotlinCompilation.MAIN_COMPILATION_NAME)
 
-        val compileConfiguration = configurations.maybeCreate(mainCompilation.deprecatedCompileConfigurationName)
+        val compileConfiguration = configurations.findByName(mainCompilation.deprecatedCompileConfigurationName)
         val implementationConfiguration = configurations.maybeCreate(mainCompilation.implementationConfigurationName)
 
         val runtimeOnlyConfiguration = configurations.maybeCreate(mainCompilation.runtimeOnlyConfigurationName)
@@ -184,8 +184,8 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
             attributes.attribute<Usage>(USAGE_ATTRIBUTE, KotlinUsages.producerApiUsage(target))
             extendsFrom(configurations.maybeCreate(mainCompilation.apiConfigurationName))
             if (mainCompilation is KotlinCompilationToRunnableFiles) {
-                val runtimeConfiguration = configurations.maybeCreate(mainCompilation.deprecatedRuntimeConfigurationName)
-                extendsFrom(runtimeConfiguration)
+                val runtimeConfiguration = configurations.findByName(mainCompilation.deprecatedRuntimeConfigurationName)
+                runtimeConfiguration?.let { extendsFrom(it) }
             }
             usesPlatformOf(target)
             setupAsPublicConfigurationIfSupported(target)
@@ -198,8 +198,9 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
                 isCanBeConsumed = true
                 isCanBeResolved = false
                 attributes.attribute<Usage>(USAGE_ATTRIBUTE, KotlinUsages.producerRuntimeUsage(target))
-                val runtimeConfiguration = configurations.maybeCreate(mainCompilation.deprecatedRuntimeConfigurationName)
-                extendsFrom(implementationConfiguration, runtimeOnlyConfiguration, runtimeConfiguration)
+                val runtimeConfiguration = configurations.findByName(mainCompilation.deprecatedRuntimeConfigurationName)
+                extendsFrom(implementationConfiguration, runtimeOnlyConfiguration)
+                runtimeConfiguration?.let { extendsFrom(it) }
                 usesPlatformOf(target)
                 setupAsPublicConfigurationIfSupported(target)
             }
@@ -210,18 +211,18 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
 
         if (createTestCompilation) {
             val testCompilation = target.compilations.getByName(KotlinCompilation.TEST_COMPILATION_NAME)
-            val compileTestsConfiguration = configurations.maybeCreate(testCompilation.deprecatedCompileConfigurationName)
+            val compileTestsConfiguration = configurations.findByName(testCompilation.deprecatedCompileConfigurationName)
             val testImplementationConfiguration = configurations.maybeCreate(testCompilation.implementationConfigurationName)
             val testRuntimeOnlyConfiguration = configurations.maybeCreate(testCompilation.runtimeOnlyConfigurationName)
 
-            compileTestsConfiguration.extendsFrom(compileConfiguration)
+            compileConfiguration?.let { compileTestsConfiguration?.extendsFrom(it) }
             testImplementationConfiguration.extendsFrom(implementationConfiguration)
             testRuntimeOnlyConfiguration.extendsFrom(runtimeOnlyConfiguration)
 
             if (mainCompilation is KotlinCompilationToRunnableFiles && testCompilation is KotlinCompilationToRunnableFiles) {
-                val runtimeConfiguration = configurations.maybeCreate(mainCompilation.deprecatedRuntimeConfigurationName)
-                val testRuntimeConfiguration = configurations.maybeCreate(testCompilation.deprecatedRuntimeConfigurationName)
-                testRuntimeConfiguration.extendsFrom(runtimeConfiguration)
+                val runtimeConfiguration = configurations.findByName(mainCompilation.deprecatedRuntimeConfigurationName)
+                val testRuntimeConfiguration = configurations.findByName(testCompilation.deprecatedRuntimeConfigurationName)
+                runtimeConfiguration?.let { testRuntimeConfiguration?.extendsFrom(it) }
             }
         }
     }
@@ -248,8 +249,8 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
         if (createTestCompilation) {
             val testCompilation = target.compilations.getByName(KotlinCompilation.TEST_COMPILATION_NAME)
             if (testCompilation is KotlinCompilationToRunnableFiles) {
-                addDependsOnTaskInOtherProjects(project, buildNeeded, true, testCompilation.deprecatedRuntimeConfigurationName)
-                addDependsOnTaskInOtherProjects(project, buildDependent, false, testCompilation.deprecatedRuntimeConfigurationName)
+                addDependsOnTaskInOtherProjects(project, buildNeeded, true, testCompilation.runtimeDependencyConfigurationName)
+                addDependsOnTaskInOtherProjects(project, buildDependent, false, testCompilation.runtimeDependencyConfigurationName)
             }
         }
     }
@@ -271,7 +272,7 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
             val target = compilation.target
             val configurations = target.project.configurations
 
-            val compileConfiguration = configurations.maybeCreate(compilation.deprecatedCompileConfigurationName).apply {
+            val compileConfiguration = configurations.findByName(compilation.deprecatedCompileConfigurationName)?.apply {
                 isCanBeConsumed = false
                 setupAsLocalTargetSpecificConfigurationIfSupported(target)
                 isVisible = false
@@ -280,7 +281,7 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
             }
 
             val apiConfiguration = configurations.maybeCreate(compilation.apiConfigurationName).apply {
-                extendsFrom(compileConfiguration)
+                compileConfiguration?.let { extendsFrom(it) }
                 isVisible = false
                 isCanBeConsumed = false
                 isCanBeResolved = false
@@ -288,7 +289,8 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
             }
 
             val implementationConfiguration = configurations.maybeCreate(compilation.implementationConfigurationName).apply {
-                extendsFrom(compileConfiguration, apiConfiguration)
+                extendsFrom(apiConfiguration)
+                compileConfiguration?.let { extendsFrom(it) }
                 isVisible = false
                 isCanBeConsumed = false
                 isCanBeResolved = false
@@ -313,10 +315,10 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
             }
 
             if (compilation is KotlinCompilationToRunnableFiles) {
-                val runtimeConfiguration = configurations.maybeCreate(compilation.deprecatedRuntimeConfigurationName).apply {
+                val runtimeConfiguration = configurations.findByName(compilation.deprecatedRuntimeConfigurationName)?.apply {
                     isCanBeConsumed = false
                     setupAsLocalTargetSpecificConfigurationIfSupported(target)
-                    extendsFrom(compileConfiguration)
+                    compileConfiguration?.let { extendsFrom(it) }
                     isVisible = false
                     isCanBeResolved = true // Needed for IDE import
                     description =
@@ -331,7 +333,8 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
                 }
 
                 val runtimeClasspathConfiguration = configurations.maybeCreate(compilation.runtimeDependencyConfigurationName).apply {
-                    extendsFrom(runtimeOnlyConfiguration, runtimeConfiguration, implementationConfiguration)
+                    extendsFrom(runtimeOnlyConfiguration, implementationConfiguration)
+                    runtimeConfiguration?.let { extendsFrom(it) }
                     usesPlatformOf(target)
                     isVisible = false
                     isCanBeConsumed = false
@@ -411,9 +414,9 @@ abstract class KotlinOnlyTargetConfigurator<KotlinCompilationType : KotlinCompil
                 addJarIfNoArtifactsPresent(apiElementsConfiguration, jarArtifact)
 
                 if (mainCompilation is KotlinCompilationToRunnableFiles<*>) {
-                    val runtimeConfiguration = project.configurations.getByName(mainCompilation.deprecatedRuntimeConfigurationName)
+                    val runtimeConfiguration = project.configurations.findByName(mainCompilation.deprecatedRuntimeConfigurationName)
                     val runtimeElementsConfiguration = project.configurations.getByName(target.runtimeElementsConfigurationName)
-                    addJarIfNoArtifactsPresent(runtimeConfiguration, jarArtifact)
+                    runtimeConfiguration?.let { addJarIfNoArtifactsPresent(runtimeConfiguration, jarArtifact) }
                     addJarIfNoArtifactsPresent(runtimeElementsConfiguration, jarArtifact)
                 }
             }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt
index 79cfe2dec291f8c388bac93150310c7d07183c8f..67383ff6eb2cd21d1be5d993dc9ed37bc5213dc7 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt
@@ -131,20 +131,20 @@ open class KotlinJvmTarget @Inject constructor(
     ) {
         // Make sure Kotlin compilation dependencies appear in the Java source set classpaths:
 
-        listOf(
+        listOfNotNull(
             compilation.apiConfigurationName,
             compilation.implementationConfigurationName,
             compilation.compileOnlyConfigurationName,
-            compilation.deprecatedCompileConfigurationName
+            compilation.deprecatedCompileConfigurationName.takeIf { project.configurations.findByName(it) != null }
         ).forEach { configurationName ->
             project.addExtendsFromRelation(javaSourceSet.compileClasspathConfigurationName, configurationName)
         }
 
-        listOf(
+        listOfNotNull(
             compilation.apiConfigurationName,
             compilation.implementationConfigurationName,
             compilation.runtimeOnlyConfigurationName,
-            compilation.deprecatedRuntimeConfigurationName
+            compilation.deprecatedRuntimeConfigurationName.takeIf { project.configurations.findByName(it) != null }
         ).forEach { configurationName ->
             project.addExtendsFromRelation(javaSourceSet.runtimeClasspathConfigurationName, configurationName)
         }
@@ -152,7 +152,7 @@ open class KotlinJvmTarget @Inject constructor(
         // Add the Java source set dependencies to the Kotlin compilation compile & runtime configurations:
 
         listOfNotNull(
-            javaSourceSet.compileConfigurationName,
+            javaSourceSet.compileConfigurationName.takeIf { project.configurations.findByName(it) != null },
             javaSourceSet.compileOnlyConfigurationName,
             javaSourceSet.apiConfigurationName.takeIf { project.configurations.findByName(it) != null },
             javaSourceSet.implementationConfigurationName
@@ -161,7 +161,7 @@ open class KotlinJvmTarget @Inject constructor(
         }
 
         listOfNotNull(
-            javaSourceSet.runtimeConfigurationName,
+            javaSourceSet.runtimeConfigurationName.takeIf { project.configurations.findByName(it) != null },
             javaSourceSet.runtimeOnlyConfigurationName,
             javaSourceSet.apiConfigurationName.takeIf { project.configurations.findByName(it) != null },
             javaSourceSet.implementationConfigurationName