diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileJavaAgainstKotlinTest.java
index fd39c244798..7d9083cf1cf 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileJavaAgainstKotlinTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileJavaAgainstKotlinTest.java
@@ -30,6 +30,7 @@ import org.jetbrains.jet.codegen.*;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 import org.jetbrains.jet.plugin.JetLanguage;
+import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.junit.Assert;
 
 import javax.tools.JavaCompiler;
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileKotlinAgainstKotlinTest.java
index 82e270d5d4a..afaecdc384b 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileKotlinAgainstKotlinTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileKotlinAgainstKotlinTest.java
@@ -31,6 +31,7 @@ import org.jetbrains.jet.codegen.*;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 import org.jetbrains.jet.plugin.JetLanguage;
+import org.jetbrains.jet.test.TestCaseWithTmpdir;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -42,7 +43,7 @@ import java.net.URLClassLoader;
 /**
  * @author Stepan Koltsov
  */
-public class CompileKotlinAgainstKotlinTest extends TestCaseWithTmpdir  {
+public class CompileKotlinAgainstKotlinTest extends TestCaseWithTmpdir {
 
     private final File ktAFile;
     private final File ktBFile;
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/JavaDescriptorResolverTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/JavaDescriptorResolverTest.java
index 638c6f61599..05cb66a2d8f 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/JavaDescriptorResolverTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/JavaDescriptorResolverTest.java
@@ -29,6 +29,7 @@ import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
 import org.jetbrains.jet.lang.resolve.name.Name;
+import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.junit.Assert;
 
 import java.io.File;
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadJavaBinaryClassTest.java
index 1471046c390..29616f66bf4 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadJavaBinaryClassTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadJavaBinaryClassTest.java
@@ -37,6 +37,7 @@ import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.plugin.JetLanguage;
+import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.junit.Assert;
 
 import javax.tools.JavaCompiler;
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadKotlinBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadKotlinBinaryClassTest.java
index 8f3a49ff3a2..5347244c4c4 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadKotlinBinaryClassTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadKotlinBinaryClassTest.java
@@ -40,6 +40,7 @@ import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.plugin.JetLanguage;
+import org.jetbrains.jet.test.TestCaseWithTmpdir;
 
 import java.io.File;
 
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/WriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/WriteSignatureTest.java
index a162a6d43b9..6b484c8f44a 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/WriteSignatureTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/WriteSignatureTest.java
@@ -34,6 +34,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
 import org.jetbrains.jet.plugin.JetLanguage;
+import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.junit.Assert;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassReader;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTest.java b/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTest.java
index 9d2015794bd..7fd1052dd98 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTest.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
-import org.jetbrains.jet.cli.jvm.compiler.TestCaseWithTmpdir;
+import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 import org.jetbrains.jet.plugin.JetLanguage;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/WriteAccessFlagsTest.java b/compiler/tests/org/jetbrains/jet/codegen/WriteAccessFlagsTest.java
index 5a4b391e295..0ea5bcf630b 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/WriteAccessFlagsTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/WriteAccessFlagsTest.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
-import org.jetbrains.jet.cli.jvm.compiler.TestCaseWithTmpdir;
+import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 import org.jetbrains.jet.plugin.JetLanguage;
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/TestCaseWithTmpdir.java b/compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdir.java
similarity index 95%
rename from compiler/tests/org/jetbrains/jet/cli/jvm/compiler/TestCaseWithTmpdir.java
rename to compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdir.java
index c3b7635b3a1..d8c9d4269f6 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/TestCaseWithTmpdir.java
+++ b/compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdir.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cli.jvm.compiler;
+package org.jetbrains.jet.test;
 
 import com.intellij.testFramework.UsefulTestCase;
 import org.jetbrains.jet.JetTestUtils;
diff --git a/compiler/tests/org/jetbrains/jet/TestCaseWithTmpdirIndependentFromIdea.java b/compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdirIndependentFromIdea.java
similarity index 93%
rename from compiler/tests/org/jetbrains/jet/TestCaseWithTmpdirIndependentFromIdea.java
rename to compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdirIndependentFromIdea.java
index 4f1d01b1c8c..eae1c41a6ab 100644
--- a/compiler/tests/org/jetbrains/jet/TestCaseWithTmpdirIndependentFromIdea.java
+++ b/compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdirIndependentFromIdea.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet;
+package org.jetbrains.jet.test;
 
 import com.intellij.openapi.util.io.FileUtil;
+import org.jetbrains.jet.JetTestUtils;
 import org.junit.After;
 import org.junit.Before;