diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java
index 5de0e8093e0..3e1db712081 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java
@@ -30,7 +30,10 @@ import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.JetFile;
-import org.jetbrains.kotlin.test.*;
+import org.jetbrains.kotlin.test.ConfigurationKind;
+import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.TestCaseWithTmpdir;
+import org.jetbrains.kotlin.test.TestJdkKind;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 import org.jetbrains.org.objectweb.asm.*;
 
@@ -50,7 +53,7 @@ public class AbstractLineNumberTest extends TestCaseWithTmpdir {
 
     @NotNull
     private static String getTestDataPath() {
-        return JetTestCaseBuilder.getTestDataPathBase() + "/lineNumber";
+        return JetTestUtils.getTestDataPathBase() + "/lineNumber";
     }
 
     @NotNull
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java
index 85662f29670..48a73f7d18f 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java
@@ -22,7 +22,10 @@ import com.intellij.util.Processor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment;
-import org.jetbrains.kotlin.test.*;
+import org.jetbrains.kotlin.test.ConfigurationKind;
+import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.MockLibraryUtil;
+import org.jetbrains.kotlin.test.TestJdkKind;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -71,8 +74,7 @@ public abstract class AbstractTopLevelMembersInvocationTest extends AbstractByte
 
         loadFiles(ArrayUtil.toStringArray(sourceFiles));
 
-        List<OccurrenceInfo> expected =
-                readExpectedOccurrences(JetTestCaseBuilder.getTestDataPathBase() + "/codegen/" + sourceFiles.get(0));
+        List<OccurrenceInfo> expected = readExpectedOccurrences(JetTestUtils.getTestDataPathBase() + "/codegen/" + sourceFiles.get(0));
         countAndCompareActualOccurrences(expected);
     }
 }
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
index f568f7a8528..6d922c9e310 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.test.ConfigurationKind;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 import org.jetbrains.org.objectweb.asm.ClassReader;
@@ -86,7 +85,7 @@ public abstract class CodegenTestCase extends UsefulTestCase {
 
     @NotNull
     protected String loadFile(@NotNull @TestDataFile String name) {
-        return loadFileByFullPath(JetTestCaseBuilder.getTestDataPathBase() + "/codegen/" + name);
+        return loadFileByFullPath(JetTestUtils.getTestDataPathBase() + "/codegen/" + name);
     }
 
     @NotNull
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
index 9ec3d401d6e..bb92fbe815d 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter;
 import org.jetbrains.kotlin.resolve.AnalyzingUtils;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.Variance;
@@ -85,7 +84,7 @@ public class CodegenTestFiles {
         ArrayList<JetFile> files = new ArrayList<JetFile>();
         for (String name : names) {
             try {
-                String content = JetTestUtils.doLoadFile(JetTestCaseBuilder.getTestDataPathBase() + "/codegen/", name);
+                String content = JetTestUtils.doLoadFile(JetTestUtils.getTestDataPathBase() + "/codegen/", name);
                 int i = name.lastIndexOf('/');
                 //name = name.substring(i+1);
                 JetFile file = JetTestUtils.createFile(name, content, project);
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
index fd34023fc4c..11c2720a19d 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
@@ -32,7 +32,6 @@ import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.resolve.AnalyzingUtils;
 import org.jetbrains.kotlin.resolve.BindingTraceContext;
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
@@ -133,7 +132,7 @@ public class CodegenTestUtil {
                     "-d", javaClassesTempDirectory.getPath()
             );
 
-            File javaFile = new File(JetTestCaseBuilder.getTestDataPathBase() + "/codegen/" + filename);
+            File javaFile = new File(JetTestUtils.getTestDataPathBase() + "/codegen/" + filename);
             JetTestUtils.compileJavaFiles(Collections.singleton(javaFile), options);
 
             return javaClassesTempDirectory;
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java
index a0effcb48e8..9055aaf1bcd 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java
@@ -39,7 +39,6 @@ import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.BindingContextUtils;
 import org.jetbrains.kotlin.test.ConfigurationKind;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestJdkKind;
 import org.jetbrains.kotlin.types.JetType;
@@ -91,8 +90,8 @@ public class TestlibTest extends UsefulTestCase {
         assertTrue(junitJar.exists());
         configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, junitJar);
 
-        configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, JetTestCaseBuilder.getHomeDirectory() + "/libraries/stdlib/test");
-        configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, JetTestCaseBuilder.getHomeDirectory() + "/libraries/kunit/src");
+        configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, JetTestUtils.getHomeDirectory() + "/libraries/stdlib/test");
+        configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, JetTestUtils.getHomeDirectory() + "/libraries/kunit/src");
         configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY,
                           new MessageCollectorPlainTextToStream(System.out, MessageCollectorPlainTextToStream.NON_VERBOSE));
 
diff --git a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
index 722a1017a72..f95c12cf957 100644
--- a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
+++ b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
@@ -32,7 +32,6 @@ import org.intellij.lang.annotations.Language;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.cli.common.KotlinVersion;
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.Tmpdir;
 import org.jetbrains.kotlin.utils.PathUtil;
@@ -47,7 +46,7 @@ import java.util.regex.Pattern;
 import static org.junit.Assert.*;
 
 public abstract class KotlinIntegrationTestBase {
-    protected static final File INTEGRATION_TEST_DATA_BASE_DIR = new File(JetTestCaseBuilder.getTestDataPathBase(), "integration");
+    protected static final File INTEGRATION_TEST_DATA_BASE_DIR = new File(JetTestUtils.getTestDataPathBase(), "integration");
 
     @Rule
     public final Tmpdir tmpdir = new Tmpdir();
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java
index 5512ebd7617..4457a14b807 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler;
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
 import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.junit.Assert;
 
@@ -45,7 +44,7 @@ public class CompileEnvironmentTest extends TestCase {
             File resultJar = new File(tempDir, "result.jar");
             ExitCode rv = new K2JVMCompiler().exec(
                     System.out,
-                    "-module", JetTestCaseBuilder.getTestDataPathBase() + "/compiler/smoke/Smoke.ktm",
+                    "-module", JetTestUtils.getTestDataPathBase() + "/compiler/smoke/Smoke.ktm",
                     "-d", resultJar.getAbsolutePath(),
                     "-no-stdlib",
                     "-classpath", stdlib.getAbsolutePath(),
@@ -82,7 +81,7 @@ public class CompileEnvironmentTest extends TestCase {
             File jdkAnnotations = JetTestUtils.getJdkAnnotationsJar();
             ExitCode exitCode = new K2JVMCompiler().exec(
                     System.out,
-                    JetTestCaseBuilder.getTestDataPathBase() + "/compiler/smoke/Smoke.kt",
+                    JetTestUtils.getTestDataPathBase() + "/compiler/smoke/Smoke.kt",
                     "-d", out.getAbsolutePath(),
                     "-no-stdlib",
                     "-classpath", stdlib.getAbsolutePath(),
diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java
index 596768a83fe..fed49c37a82 100644
--- a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.IfNotParsed;
 import org.jetbrains.kotlin.psi.JetElement;
 import org.jetbrains.kotlin.psi.JetPsiFactory;
 import org.jetbrains.kotlin.psi.JetVisitorVoid;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
+import org.jetbrains.kotlin.test.JetTestUtils;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -45,7 +45,7 @@ public abstract class AbstractJetParsingTest extends ParsingTestCase {
 
     @Override
     protected String getTestDataPath() {
-        return JetTestCaseBuilder.getHomeDirectory();
+        return JetTestUtils.getHomeDirectory();
     }
 
     public AbstractJetParsingTest() {
diff --git a/compiler/tests/org/jetbrains/kotlin/test/JetLiteFixture.java b/compiler/tests/org/jetbrains/kotlin/test/JetLiteFixture.java
index a13349a2819..3977ffe0a29 100644
--- a/compiler/tests/org/jetbrains/kotlin/test/JetLiteFixture.java
+++ b/compiler/tests/org/jetbrains/kotlin/test/JetLiteFixture.java
@@ -48,7 +48,7 @@ public abstract class JetLiteFixture extends KotlinTestWithEnvironment {
     }
 
     protected String getTestDataPath() {
-        return JetTestCaseBuilder.getTestDataPathBase();
+        return JetTestUtils.getTestDataPathBase();
     }
 
     @Override
diff --git a/compiler/tests/org/jetbrains/kotlin/test/JetTestCaseBuilder.java b/compiler/tests/org/jetbrains/kotlin/test/JetTestCaseBuilder.java
deleted file mode 100644
index 07686d27976..00000000000
--- a/compiler/tests/org/jetbrains/kotlin/test/JetTestCaseBuilder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.test;
-
-import com.intellij.openapi.util.io.FileUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.utils.PathUtil;
-
-import java.io.File;
-
-public abstract class JetTestCaseBuilder {
-    @NotNull
-    public static String getTestDataPathBase() {
-        return getHomeDirectory() + "/compiler/testData";
-    }
-
-    @NotNull
-    public static String getHomeDirectory() {
-        File resourceRoot = PathUtil.getResourcePathForClass(JetTestCaseBuilder.class);
-        return FileUtil.toSystemIndependentName(resourceRoot.getParentFile().getParentFile().getParent());
-    }
-}
diff --git a/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java b/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java
index 731fe18c4a2..6d6ed0b79cc 100644
--- a/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java
+++ b/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java
@@ -58,10 +58,10 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.diagnostics.Errors;
 import org.jetbrains.kotlin.diagnostics.Severity;
 import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.lexer.JetTokens;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap;
-import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.BindingTrace;
@@ -280,21 +280,32 @@ public class JetTestUtils {
                 EnvironmentConfigFiles.JVM_CONFIG_FILES);
     }
 
+    @NotNull
+    public static String getTestDataPathBase() {
+        return getHomeDirectory() + "/compiler/testData";
+    }
+
+    @NotNull
+    public static String getHomeDirectory() {
+        File resourceRoot = PathUtil.getResourcePathForClass(JetTestUtils.class);
+        return FileUtil.toSystemIndependentName(resourceRoot.getParentFile().getParentFile().getParent());
+    }
+
     public static File findMockJdkRtJar() {
-        return new File(JetTestCaseBuilder.getHomeDirectory(), "compiler/testData/mockJDK/jre/lib/rt.jar");
+        return new File(getHomeDirectory(), "compiler/testData/mockJDK/jre/lib/rt.jar");
     }
 
     public static File findAndroidApiJar() {
-        return new File(JetTestCaseBuilder.getHomeDirectory(), "dependencies/android.jar");
+        return new File(getHomeDirectory(), "dependencies/android.jar");
     }
 
     public static File getAnnotationsJar() {
-        return new File(JetTestCaseBuilder.getHomeDirectory(), "compiler/testData/mockJDK/jre/lib/annotations.jar");
+        return new File(getHomeDirectory(), "compiler/testData/mockJDK/jre/lib/annotations.jar");
     }
 
     @NotNull
     public static File getJdkAnnotationsJar() {
-        File jdkAnnotations = new File(JetTestCaseBuilder.getHomeDirectory(), "dependencies/annotations/kotlin-jdk-annotations.jar");
+        File jdkAnnotations = new File(getHomeDirectory(), "dependencies/annotations/kotlin-jdk-annotations.jar");
         if (!jdkAnnotations.exists()) {
             throw new RuntimeException("Kotlin JDK annotations jar not found; please run 'ant dist' to build it");
         }
@@ -303,7 +314,7 @@ public class JetTestUtils {
 
     @NotNull
     public static File getAndroidSdkAnnotationsJar() {
-        File androidSdkAnnotations = new File(JetTestCaseBuilder.getHomeDirectory(), "dependencies/annotations/kotlin-android-sdk-annotations.jar");
+        File androidSdkAnnotations = new File(getHomeDirectory(), "dependencies/annotations/kotlin-android-sdk-annotations.jar");
         if (!androidSdkAnnotations.exists()) {
             throw new RuntimeException("Kotlin Android SDK annotations jar not found; please run 'ant dist' to build it");
         }
diff --git a/compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java
index 3f3611fdc9c..78fb8f6f0e1 100644
--- a/compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.resolve.OverloadUtil;
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
 import org.jetbrains.kotlin.test.ConfigurationKind;
 import org.jetbrains.kotlin.test.JetLiteFixture;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 import org.jetbrains.kotlin.test.JetTestUtils;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
@@ -55,13 +54,7 @@ public class JetOverloadTest extends JetLiteFixture {
         super.tearDown();
     }
 
-    @Override
-    protected String getTestDataPath() {
-        return JetTestCaseBuilder.getTestDataPathBase();
-    }
-
     public void testBasic() throws Exception {
-
         assertNotOverloadable(
                 "fun a() : Int",
                 "fun a() : Int");
diff --git a/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java
index c8662de615c..d1c955ec56b 100644
--- a/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.resolve.OverridingUtil;
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
 import org.jetbrains.kotlin.test.ConfigurationKind;
 import org.jetbrains.kotlin.test.JetLiteFixture;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 import org.jetbrains.kotlin.test.JetTestUtils;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
@@ -55,11 +54,6 @@ public class JetOverridingTest extends JetLiteFixture {
         super.tearDown();
     }
 
-    @Override
-    protected String getTestDataPath() {
-        return JetTestCaseBuilder.getTestDataPathBase();
-    }
-
     public void testBasic() throws Exception {
         assertOverridable(
                 "fun a() : Int",
diff --git a/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java
index 34eeab2792d..e6d5cdba952 100644
--- a/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java
@@ -41,7 +41,6 @@ import org.jetbrains.kotlin.resolve.scopes.*;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver;
 import org.jetbrains.kotlin.test.ConfigurationKind;
 import org.jetbrains.kotlin.test.JetLiteFixture;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices;
@@ -94,11 +93,6 @@ public class JetTypeCheckerTest extends JetLiteFixture {
         super.tearDown();
     }
 
-    @Override
-    protected String getTestDataPath() {
-        return JetTestCaseBuilder.getTestDataPathBase();
-    }
-
     public void testConstants() throws Exception {
         assertType("1", builtIns.getIntType());
         assertType("0x1", builtIns.getIntType());
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java
index 730ebf545cf..fc846a87877 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java
+++ b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java
@@ -23,7 +23,6 @@ import com.siyeh.ig.bugs.StaticCallOnSubclassInspection;
 import com.siyeh.ig.bugs.StaticFieldReferenceOnSubclassInspection;
 import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase;
 import org.jetbrains.kotlin.idea.PluginTestCaseBase;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 
 public class KotlinAndJavaCheckerTest extends KotlinDaemonAnalyzerTestCase {
     @Override
@@ -42,7 +41,7 @@ public class KotlinAndJavaCheckerTest extends KotlinDaemonAnalyzerTestCase {
 
     @Override
     protected String getTestDataPath() {
-        return JetTestCaseBuilder.getHomeDirectory() + "/idea/testData/kotlinAndJavaChecker/";
+        return PluginTestCaseBase.getTestDataPathBase() + "/kotlinAndJavaChecker/";
     }
 
     public void testName() throws Exception {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java
index 79f635bc412..7e7b1dd49f9 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode;
 import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
+import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
 import java.io.File;
@@ -50,7 +50,7 @@ public abstract class JetLightCodeInsightFixtureTestCase extends LightCodeInsigh
     protected void setUp() throws Exception {
         super.setUp();
         ((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities();
-        VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
 
         kotlinInternalModeOriginalValue = KotlinInternalMode.OBJECT$.getEnabled();
         KotlinInternalMode.OBJECT$.setEnabled(true);
@@ -59,7 +59,7 @@ public abstract class JetLightCodeInsightFixtureTestCase extends LightCodeInsigh
     @Override
     protected void tearDown() throws Exception {
         KotlinInternalMode.OBJECT$.setEnabled(kotlinInternalModeOriginalValue);
-        VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
 
         Set<JetFile> builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources();
         FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(getProject())).getFileManager();
diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinCodeInsightTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinCodeInsightTestCase.java
index d3fc805596d..92ed373c973 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/KotlinCodeInsightTestCase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinCodeInsightTestCase.java
@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea;
 
 import com.intellij.codeInsight.CodeInsightTestCase;
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
+import org.jetbrains.kotlin.test.JetTestUtils;
 
 public abstract class KotlinCodeInsightTestCase extends CodeInsightTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
     }
 
     @Override
     protected void tearDown() throws Exception {
-        VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
         super.tearDown();
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinCompletionTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinCompletionTestCase.java
index 7337a222a4b..0913ddd3ebd 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/KotlinCompletionTestCase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinCompletionTestCase.java
@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea;
 
 import com.intellij.codeInsight.completion.CompletionTestCase;
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
+import org.jetbrains.kotlin.test.JetTestUtils;
 
 abstract public class KotlinCompletionTestCase extends CompletionTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
     }
 
     @Override
     protected void tearDown() throws Exception {
-        VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
         super.tearDown();
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java
index 7aa438cdd84..5ec59412de9 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java
@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea;
 
 import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase;
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
+import org.jetbrains.kotlin.test.JetTestUtils;
 
 abstract public class KotlinDaemonAnalyzerTestCase extends DaemonAnalyzerTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
     }
 
     @Override
     protected void tearDown() throws Exception {
-        VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
         super.tearDown();
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java
index cbd472878ad..7d97a3c675b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java
@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea;
 
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
 import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestBase;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
+import org.jetbrains.kotlin.test.JetTestUtils;
 
 public abstract class KotlinHierarchyViewTestBase extends HierarchyViewTestBase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
     }
 
     @Override
     protected void tearDown() throws Exception {
-        VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
         super.tearDown();
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java
index 924a89ddab5..fcc8054276d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java
@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea;
 
 import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase;
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
+import org.jetbrains.kotlin.test.JetTestUtils;
 
 abstract public class KotlinLightQuickFixTestCase extends LightQuickFixTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
     }
 
     @Override
     protected void tearDown() throws Exception {
-        VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
         super.tearDown();
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinMultiFileTestCase.kt b/idea/tests/org/jetbrains/kotlin/idea/KotlinMultiFileTestCase.kt
index 3149c51d107..dc913d2b835 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/KotlinMultiFileTestCase.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinMultiFileTestCase.kt
@@ -18,16 +18,16 @@ package org.jetbrains.kotlin.idea
 
 import com.intellij.refactoring.MultiFileTestCase
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
-import org.jetbrains.kotlin.test.JetTestCaseBuilder
+import org.jetbrains.kotlin.test.JetTestUtils
 
 public abstract class KotlinMultiFileTestCase : MultiFileTestCase() {
     override fun setUp() {
         super.setUp()
-        VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory())
+        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory())
     }
 
     override fun tearDown() {
-        VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory())
+        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory())
         super.tearDown()
     }
-}
\ No newline at end of file
+}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java b/idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java
index ab47e5c7989..a9f6fca115f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java
@@ -25,7 +25,6 @@ import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 import org.jetbrains.kotlin.test.JetTestUtils;
 
 import java.io.File;
@@ -38,7 +37,7 @@ public class PluginTestCaseBase {
 
     @NotNull
     public static String getTestDataPathBase() {
-        return JetTestCaseBuilder.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE;
+        return JetTestUtils.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE;
     }
 
     private static Sdk getSdk(String sdkHome) {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt
index 32ce0b04336..c7a581e4adb 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt
@@ -29,12 +29,12 @@ import com.intellij.codeInspection.ex.InspectionManagerEx
 import com.intellij.testFramework.InspectionTestUtil
 import com.intellij.codeInspection.InspectionManager
 import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
-import org.jetbrains.kotlin.test.JetTestCaseBuilder
 import org.jetbrains.kotlin.test.ConfigLibraryUtil
 import com.intellij.testFramework.IdeaTestUtil
 import com.intellij.openapi.projectRoots.JavaSdk
 import com.intellij.openapi.projectRoots.Sdk
 import org.apache.commons.lang.SystemUtils;
+import org.jetbrains.kotlin.test.JetTestUtils
 
 public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase() {
     override fun getProjectDescriptor(): LightProjectDescriptor = JetLightProjectDescriptor.INSTANCE
@@ -50,7 +50,7 @@ public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase
         val srcDir = inspectionsTestDir.getParentFile()!!
 
         with(myFixture) {
-            setTestDataPath("${JetTestCaseBuilder.getHomeDirectory()}/$srcDir")
+            setTestDataPath("${JetTestUtils.getHomeDirectory()}/$srcDir")
 
             val psiFiles = srcDir
                     .listFiles { it.getName().endsWith(".kt") }!!
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
index 8790fa1abf3..3e787ab201b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
@@ -42,7 +42,6 @@ import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.test.ConfigLibraryUtil;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.MockLibraryUtil;
 
@@ -75,7 +74,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
 
         UsefulTestCase.edt(new Runnable() {
             @Override
@@ -111,7 +110,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
 
     @Override
     protected void tearDown() throws Exception {
-        VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
         super.tearDown();
     }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt
index f9975824c5d..33baa6abff7 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt
@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder
 import com.intellij.testFramework.LightProjectDescriptor
 import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor
 import java.io.File
-import org.jetbrains.kotlin.test.JetTestCaseBuilder
 import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest
+import org.jetbrains.kotlin.test.JetTestUtils
 
 class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() {
 
@@ -35,6 +35,6 @@ class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() {
     }
 
     override fun getProjectDescriptor(): LightProjectDescriptor {
-        return JetJdkAndLibraryProjectDescriptor(File(JetTestCaseBuilder.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin"))
+        return JetJdkAndLibraryProjectDescriptor(File(JetTestUtils.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin"))
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
index c0d4c348901..2546c386f93 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.decompiler.textBuilder
 
 import com.intellij.testFramework.LightProjectDescriptor
-import org.jetbrains.kotlin.test.JetTestCaseBuilder
 import com.intellij.psi.PsiManager
 import org.junit.Assert
 import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor
@@ -29,11 +28,12 @@ import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass.Ki
 import org.jetbrains.kotlin.idea.decompiler.AbstractInternalCompiledClassesTest
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.findClassFileByName
 import org.jetbrains.kotlin.idea.decompiler.JetClsFile
+import org.jetbrains.kotlin.test.JetTestUtils
 
 public class DecompiledTextForWrongAbiVersionTest : AbstractInternalCompiledClassesTest() {
 
     override fun getProjectDescriptor(): LightProjectDescriptor {
-        return JetJdkAndLibraryProjectDescriptor(File(JetTestCaseBuilder.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin"))
+        return JetJdkAndLibraryProjectDescriptor(File(JetTestUtils.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin"))
     }
 
     fun testPackagePartIsInvisibleWrongAbiVersion() = doTestNoPsiFilesAreBuiltForSyntheticClass(PACKAGE_PART)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
index 5f573ceac5c..237b14387ab 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.idea.PluginTestCaseBase;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.test.ConfigLibraryUtil;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
+import org.jetbrains.kotlin.test.JetTestUtils;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -199,6 +199,6 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer
 
     @Override
     protected String getTestDataPath() {
-        return JetTestCaseBuilder.getHomeDirectory() + "/";
+        return JetTestUtils.getHomeDirectory() + "/";
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
index 4ce29a528d7..77b57aec2f8 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable
 
 import com.intellij.ide.DataManager
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.test.JetTestCaseBuilder
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractKotlinFunctionHandler
 import java.io.File
@@ -138,7 +137,7 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe
         val afterFile = File("$path.after")
         val conflictFile = File("$path.conflicts")
 
-        fixture.setTestDataPath("${JetTestCaseBuilder.getHomeDirectory()}/${mainFile.getParent()}")
+        fixture.setTestDataPath("${JetTestUtils.getHomeDirectory()}/${mainFile.getParent()}")
 
         val file = fixture.configureByFile(mainFile.getName()) as JetFile
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java
index 478ad5fc077..6d214f38a13 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies;
 import org.jetbrains.kotlin.idea.PluginTestCaseBase;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
+import org.jetbrains.kotlin.test.JetTestUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,12 +36,12 @@ public class BuiltInsReferenceResolverTest extends ResolveTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
     }
 
     @Override
     protected void tearDown() throws Exception {
-        VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
         super.tearDown();
     }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt
index 6213194e11b..6d92866dc98 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.test.JetTestCaseBuilder
 import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.psi.JetExpression
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
@@ -46,7 +45,7 @@ import org.jetbrains.kotlin.idea.JetFileType
 import com.intellij.openapi.util.io.FileUtil
 
 public abstract class AbstractPartialBodyResolveTest : JetLightCodeInsightFixtureTestCase() {
-    override fun getTestDataPath() = JetTestCaseBuilder.getHomeDirectory()
+    override fun getTestDataPath() = JetTestUtils.getHomeDirectory()
     override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 
     public fun doTest(testPath: String) {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java
index dd739fc58de..189d85ea50c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
+import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.ReferenceUtils;
 import org.jetbrains.kotlin.test.util.UtilPackage;
 import org.junit.Assert;
@@ -66,12 +66,12 @@ public abstract class AbstractReferenceResolveTest extends LightPlatformCodeInsi
     protected void setUp() throws Exception {
         super.setUp();
         ((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities();
-        VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
     }
 
     @Override
     protected void tearDown() throws Exception {
-        VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
 
         Set<JetFile> builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources();
         FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(getProject())).getFileManager();
diff --git a/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt b/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt
index b3030209e4c..68d6dd02073 100644
--- a/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt
@@ -22,13 +22,13 @@ import com.intellij.openapi.application.ApplicationManager
 import java.io.File
 import com.intellij.openapi.command.CommandProcessor
 import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences
-import org.jetbrains.kotlin.test.JetTestCaseBuilder
 import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase
 import com.intellij.codeInsight.CodeInsightSettings
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
+import org.jetbrains.kotlin.test.JetTestUtils
 
 public abstract class AbstractShortenRefsTest : JetLightCodeInsightFixtureTestCase() {
-    override fun getTestDataPath() = JetTestCaseBuilder.getHomeDirectory()
+    override fun getTestDataPath() = JetTestUtils.getHomeDirectory()
     override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 
     protected fun doTest(testPath: String) {
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt
index 684b8a92aaf..fd2aa244c27 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt
+++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt
@@ -27,21 +27,21 @@ import org.jetbrains.kotlin.diagnostics.Severity
 import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
-import org.jetbrains.kotlin.test.JetTestCaseBuilder
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
+import org.jetbrains.kotlin.test.JetTestUtils
 
 public abstract class AbstractJavaToKotlinConverterTest : LightCodeInsightFixtureTestCase() {
     override fun setUp() {
         super.setUp()
 
-        VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory())
+        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory())
 
         addFile("KotlinApi.kt", "kotlinApi")
         addFile("JavaApi.java", "javaApi")
     }
 
     override fun tearDown() {
-        VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory())
+        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory())
         super.tearDown()
     }