diff --git a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java
index b336c1398d8..ae9b50f4075 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java
+++ b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java
@@ -81,7 +81,7 @@ public class KotlinAndJavaCheckerTest extends KotlinDaemonAnalyzerTestCase {
 
     @Override
     protected Sdk getTestProjectJdk() {
-        return PluginTestCaseBase.jdkFromIdeaHome();
+        return PluginTestCaseBase.mockJdk();
     }
 
     @Override
diff --git a/idea/tests/org/jetbrains/kotlin/idea/JetJdkAndLibraryProjectDescriptor.java b/idea/tests/org/jetbrains/kotlin/idea/JetJdkAndLibraryProjectDescriptor.java
index 434364d9d2c..a6704f10e66 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/JetJdkAndLibraryProjectDescriptor.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/JetJdkAndLibraryProjectDescriptor.java
@@ -49,7 +49,7 @@ public class JetJdkAndLibraryProjectDescriptor implements LightProjectDescriptor
 
     @Override
     public Sdk getSdk() {
-        return PluginTestCaseBase.jdkFromIdeaHome();
+        return PluginTestCaseBase.mockJdk();
     }
 
     @Override
diff --git a/idea/tests/org/jetbrains/kotlin/idea/JetLightProjectDescriptor.java b/idea/tests/org/jetbrains/kotlin/idea/JetLightProjectDescriptor.java
index c9ef2d61f00..031541c22f8 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/JetLightProjectDescriptor.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/JetLightProjectDescriptor.java
@@ -37,7 +37,7 @@ public class JetLightProjectDescriptor implements LightProjectDescriptor {
 
     @Override
     public Sdk getSdk() {
-        return PluginTestCaseBase.jdkFromIdeaHome();
+        return PluginTestCaseBase.mockJdk();
     }
 
     @Override
diff --git a/idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java b/idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java
index a9f6fca115f..560415c4f2d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java
@@ -50,7 +50,7 @@ public class PluginTestCaseBase {
         return sdk;
     }
 
-    public static Sdk jdkFromIdeaHome() {
+    public static Sdk mockJdk() {
         return getSdk("compiler/testData/mockJDK/jre");
     }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt
index 4ef807cbf79..ab1de1fb7f0 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt
@@ -70,7 +70,7 @@ public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase
                 if (isWithRuntime) {
                     ConfigLibraryUtil.configureKotlinRuntime(
                             myFixture.getModule(),
-                            if (fullJdk) PluginTestCaseBase.fullJdk() else PluginTestCaseBase.jdkFromIdeaHome()
+                            if (fullJdk) PluginTestCaseBase.fullJdk() else PluginTestCaseBase.mockJdk()
                     )
                 }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.java b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.java
index cefb9fef7cc..b93dede0b4b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.java
@@ -219,6 +219,6 @@ public abstract class AbstractHierarchyTest extends KotlinHierarchyViewTestBase
 
     @Override
     protected Sdk getTestProjectJdk() {
-        return PluginTestCaseBase.jdkFromIdeaHome();
+        return PluginTestCaseBase.mockJdk();
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java
index 7b89e63ceb9..13f84a55301 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java
@@ -117,7 +117,7 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase {
 
         try {
             if (isWithRuntime) {
-                ConfigLibraryUtil.configureKotlinRuntime(getModule(), PluginTestCaseBase.jdkFromIdeaHome());
+                ConfigLibraryUtil.configureKotlinRuntime(getModule(), PluginTestCaseBase.mockJdk());
             }
 
             DirectiveBasedActionUtils.checkForUnexpectedErrors((JetFile) getFile());
diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationTest.java
index 9ef868055bf..ac1fa3d9904 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationTest.java
@@ -70,7 +70,7 @@ public class JetGotoImplementationTest extends LightCodeInsightTestCase {
 
     @Override
     protected Sdk getProjectJDK() {
-        return PluginTestCaseBase.jdkFromIdeaHome();
+        return PluginTestCaseBase.mockJdk();
     }
 
     protected void doTest() {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
index a394877bb37..ba8bbb05c5d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
@@ -74,7 +74,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer
 
         boolean withRuntime = InTextDirectivesUtils.isDirectiveDefined(originalFileText, "// WITH_RUNTIME");
         if (withRuntime) {
-            ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.jdkFromIdeaHome());
+            ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.mockJdk());
         }
 
         try {
@@ -142,7 +142,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer
         }
         finally {
             if (withRuntime) {
-                ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.jdkFromIdeaHome());
+                ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.mockJdk());
             }
         }
     }
@@ -212,7 +212,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer
 
     @Override
     protected Sdk getTestProjectJdk() {
-        return PluginTestCaseBase.jdkFromIdeaHome();
+        return PluginTestCaseBase.mockJdk();
     }
 
     @Override
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
index a5482d59775..63fda4d6c19 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
@@ -167,7 +167,7 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
 
     @Override
     protected Sdk getProjectJDK() {
-        return PluginTestCaseBase.jdkFromIdeaHome();
+        return PluginTestCaseBase.mockJdk();
     }
 
     protected static Sdk getFullJavaJDK() {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java
index 918e36d3f67..c9e97b004d7 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java
@@ -976,6 +976,6 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
 
     @Override
     protected Sdk getTestProjectJdk() {
-        return PluginTestCaseBase.jdkFromIdeaHome();
+        return PluginTestCaseBase.mockJdk();
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt
index 6f340c34c1b..8f91dda61cc 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt
@@ -185,7 +185,7 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe
 
         val addKotlinRuntime = InTextDirectivesUtils.findStringWithPrefixes(file.getText(), "// WITH_RUNTIME") != null
         if (addKotlinRuntime) {
-            ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.jdkFromIdeaHome())
+            ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.mockJdk())
         }
 
         try {
@@ -200,7 +200,7 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe
         }
         finally {
             if (addKotlinRuntime) {
-                ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.jdkFromIdeaHome())
+                ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.mockJdk())
             }
         }
     }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt
index 767358c1d5a..b5522d5aba8 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt
@@ -80,7 +80,7 @@ public abstract class AbstractJetMoveTest : KotlinMultiFileTestCase() {
 
         val withRuntime = config["withRuntime"]?.getAsBoolean() ?: false
         if (withRuntime) {
-            ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.jdkFromIdeaHome())
+            ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.mockJdk())
         }
 
         doTest({ rootDir, rootAfter ->
@@ -114,7 +114,7 @@ public abstract class AbstractJetMoveTest : KotlinMultiFileTestCase() {
                 EditorFactory.getInstance()!!.releaseEditor(editor)
 
                 if (withRuntime) {
-                    ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.jdkFromIdeaHome())
+                    ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.mockJdk())
                 }
             }
         },
diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt
index bb8729ee067..71b1d07038e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt
@@ -102,7 +102,7 @@ class RunConfigurationTest: CodeInsightTestCase() {
         val createModuleResult = configureModule(moduleDirPath("module"), baseDir)
         val srcDir = createModuleResult.srcDir
 
-        configureRuntime(createModuleResult.module, PluginTestCaseBase.jdkFromIdeaHome())
+        configureRuntime(createModuleResult.module, PluginTestCaseBase.mockJdk())
 
         try {
             val expectedClasses = ArrayList<String>()
@@ -132,7 +132,7 @@ class RunConfigurationTest: CodeInsightTestCase() {
             Assert.assertEquals(expectedClasses, actualClasses)
         }
         finally {
-            ConfigLibraryUtil.unConfigureKotlinRuntime(createModuleResult.module, PluginTestCaseBase.jdkFromIdeaHome())
+            ConfigLibraryUtil.unConfigureKotlinRuntime(createModuleResult.module, PluginTestCaseBase.mockJdk())
         }
     }
 
@@ -184,7 +184,7 @@ class RunConfigurationTest: CodeInsightTestCase() {
     }
 
     override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/run/"
-    override fun getTestProjectJdk() = PluginTestCaseBase.jdkFromIdeaHome()
+    override fun getTestProjectJdk() = PluginTestCaseBase.mockJdk()
 
     private class CreateModuleResult(
             val module: Module,