diff --git a/idea/testData/configuration/dropKotlincOnVersionAutoAdvance/.idea/kotlinc.xml b/idea/testData/configuration/dropKotlincOnVersionAutoAdvance/.idea/kotlinc.xml
index 22d8d323966..87001db3a02 100644
--- a/idea/testData/configuration/dropKotlincOnVersionAutoAdvance/.idea/kotlinc.xml
+++ b/idea/testData/configuration/dropKotlincOnVersionAutoAdvance/.idea/kotlinc.xml
@@ -1,7 +1,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance/.idea/libraries/KotlinJavaRuntime.xml b/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance/.idea/libraries/KotlinJavaRuntime.xml
index bcc4ed94e22..7be88eee463 100644
--- a/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance/.idea/libraries/KotlinJavaRuntime.xml
+++ b/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance/.idea/libraries/KotlinJavaRuntime.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance/lib/kotlin-runtime.jar b/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance/lib/kotlin-stdlib.jar
similarity index 100%
rename from idea/testData/configuration/kotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance/lib/kotlin-runtime.jar
rename to idea/testData/configuration/kotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance/lib/kotlin-stdlib.jar
diff --git a/idea/testData/configuration/libraryNonDefault/lib/kotlin-runtime.jar b/idea/testData/configuration/libraryNonDefault/lib/kotlin-stdlib.jar
similarity index 100%
rename from idea/testData/configuration/libraryNonDefault/lib/kotlin-runtime.jar
rename to idea/testData/configuration/libraryNonDefault/lib/kotlin-stdlib.jar
diff --git a/idea/testData/configuration/libraryNonDefault/projectFile.ipr b/idea/testData/configuration/libraryNonDefault/projectFile.ipr
index e31006eb15e..5696c089bbe 100644
--- a/idea/testData/configuration/libraryNonDefault/projectFile.ipr
+++ b/idea/testData/configuration/libraryNonDefault/projectFile.ipr
@@ -9,11 +9,11 @@
-
+
-
+
diff --git a/idea/testData/configuration/noKotlincExistsNoSettingsLatestRuntime/.idea/libraries/KotlinJavaRuntime.xml b/idea/testData/configuration/noKotlincExistsNoSettingsLatestRuntime/.idea/libraries/KotlinJavaRuntime.xml
index bcc4ed94e22..7be88eee463 100644
--- a/idea/testData/configuration/noKotlincExistsNoSettingsLatestRuntime/.idea/libraries/KotlinJavaRuntime.xml
+++ b/idea/testData/configuration/noKotlincExistsNoSettingsLatestRuntime/.idea/libraries/KotlinJavaRuntime.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/idea/testData/configuration/noKotlincExistsNoSettingsLatestRuntime/lib/kotlin-runtime.jar b/idea/testData/configuration/noKotlincExistsNoSettingsLatestRuntime/lib/kotlin-stdlib.jar
similarity index 100%
rename from idea/testData/configuration/noKotlincExistsNoSettingsLatestRuntime/lib/kotlin-runtime.jar
rename to idea/testData/configuration/noKotlincExistsNoSettingsLatestRuntime/lib/kotlin-stdlib.jar
diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt
index 38bd43f41c6..8f2a3d0ff28 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.idea.configuration
import com.intellij.openapi.util.io.FileUtil
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
import org.junit.Assert
import java.io.File
import java.nio.file.Path
@@ -18,6 +19,11 @@ abstract class AbstractConfigureKotlinInTempDirTest : AbstractConfigureKotlinTes
FileUtil.copyDir(File(projectRoot), tempDir)
+ val kotlinRuntime = File(tempDir, "lib/kotlin-stdlib.jar")
+ if (getTestName(true).toLowerCase().contains("latestruntime") && kotlinRuntime.exists()) {
+ ForTestCompileRuntime.runtimeJarForTests().copyTo(kotlinRuntime, overwrite = true)
+ }
+
val projectRoot = tempDir.path
val projectFilePath = projectRoot + "/projectFile.ipr"
diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt.173 b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt.173
index 1a4a730db83..cb28e355e03 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt.173
+++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt.173
@@ -18,6 +18,11 @@ abstract class AbstractConfigureKotlinInTempDirTest : AbstractConfigureKotlinTes
FileUtil.copyDir(File(projectRoot), tempDir)
+ val kotlinRuntime = File(tempDir, "lib/kotlin-stdlib.jar")
+ if (getTestName(true).toLowerCase().contains("latestruntime") && kotlinRuntime.exists()) {
+ ForTestCompileRuntime.runtimeJarForTests().copyTo(kotlinRuntime, overwrite = true)
+ }
+
val projectRoot = tempDir.path
val projectFilePath = projectRoot + "/projectFile.ipr"