diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt
index ea84c75306d..eea68cef8c6 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt
@@ -16,15 +16,12 @@
 
 package org.jetbrains.kotlin.jps.build
 
-import org.jetbrains.jps.model.JpsDummyElement
 import org.jetbrains.jps.model.JpsModuleRootModificationUtil
 import org.jetbrains.jps.model.JpsProject
 import org.jetbrains.jps.model.java.JpsJavaDependencyScope
 import org.jetbrains.jps.model.java.JpsJavaLibraryType
-import org.jetbrains.jps.model.java.JpsJavaSdkType
 import org.jetbrains.jps.model.library.JpsLibrary
 import org.jetbrains.jps.model.library.JpsOrderRootType
-import org.jetbrains.jps.model.library.sdk.JpsSdk
 import org.jetbrains.jps.model.module.JpsModule
 import org.jetbrains.jps.util.JpsPathUtil
 import java.io.File
@@ -38,14 +35,6 @@ abstract class AbstractKotlinJpsBuildTestCase : BaseKotlinJpsBuildTestCase() {
         return workDir
     }
 
-    override fun addJdk(name: String, path: String?): JpsSdk<JpsDummyElement> {
-        val homePath = System.getProperty("java.home")
-        val versionString = System.getProperty("java.version")
-        val jdk = myModel.global.addSdk(name, homePath, versionString, JpsJavaSdkType.INSTANCE)
-        jdk.addRoot(JpsPathUtil.pathToUrl(path), JpsOrderRootType.COMPILED)
-        return jdk.properties
-    }
-
     protected fun addKotlinMockRuntimeDependency(): JpsLibrary {
         return addDependency(KotlinJpsLibrary.MockRuntime)
     }
diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt
index cfa2b8b85b9..dbb288bfd4d 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt
@@ -16,9 +16,16 @@
 
 package org.jetbrains.kotlin.jps.build
 
+import com.intellij.openapi.vfs.StandardFileSystems
 import com.intellij.util.ThrowableRunnable
+import com.intellij.util.io.URLUtil
 import org.jetbrains.jps.builders.JpsBuildTestCase
+import org.jetbrains.jps.model.JpsDummyElement
+import org.jetbrains.jps.model.java.JpsJavaSdkType
 import org.jetbrains.jps.model.library.JpsLibrary
+import org.jetbrains.jps.model.library.JpsOrderRootType
+import org.jetbrains.jps.model.library.sdk.JpsSdk
+import org.jetbrains.jps.util.JpsPathUtil
 import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner
 import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest
 import org.jetbrains.kotlin.test.runTest
@@ -43,6 +50,14 @@ abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() {
         )
     }
 
+    override fun addJdk(name: String, path: String?): JpsSdk<JpsDummyElement> {
+        val homePath = System.getProperty("java.home")
+        val versionString = System.getProperty("java.version")
+        val jdk = myModel.global.addSdk(name, homePath, versionString, JpsJavaSdkType.INSTANCE)
+        jdk.addRoot(JpsPathUtil.pathToUrl(path), JpsOrderRootType.COMPILED)
+        return jdk.properties
+    }
+
     private val libraries = mutableMapOf<String, JpsLibrary>()
 
     protected fun requireLibrary(library: KotlinJpsLibrary) = libraries.getOrPut(library.id) {