diff --git a/compiler/tests/org/jetbrains/jet/CompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/compiler/CompileJavaAgainstKotlinTest.java
similarity index 96%
rename from compiler/tests/org/jetbrains/jet/CompileJavaAgainstKotlinTest.java
rename to compiler/tests/org/jetbrains/jet/compiler/CompileJavaAgainstKotlinTest.java
index 6d75ca56e6b..69456d27b41 100644
--- a/compiler/tests/org/jetbrains/jet/CompileJavaAgainstKotlinTest.java
+++ b/compiler/tests/org/jetbrains/jet/compiler/CompileJavaAgainstKotlinTest.java
@@ -1,4 +1,4 @@
-package org.jetbrains.jet;
+package org.jetbrains.jet.compiler;
 
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.io.FileUtil;
@@ -8,11 +8,11 @@ import com.intellij.psi.impl.PsiFileFactoryImpl;
 import com.intellij.testFramework.LightVirtualFile;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.JetTestCaseBuilder;
+import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.codegen.ClassBuilderFactory;
 import org.jetbrains.jet.codegen.ClassFileFactory;
 import org.jetbrains.jet.codegen.GenerationState;
-import org.jetbrains.jet.compiler.CompileEnvironment;
-import org.jetbrains.jet.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.plugin.JetLanguage;
diff --git a/compiler/tests/org/jetbrains/jet/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/compiler/NamespaceComparator.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/NamespaceComparator.java
rename to compiler/tests/org/jetbrains/jet/compiler/NamespaceComparator.java
index a8b913c3aa6..02f316a61b6 100644
--- a/compiler/tests/org/jetbrains/jet/NamespaceComparator.java
+++ b/compiler/tests/org/jetbrains/jet/compiler/NamespaceComparator.java
@@ -1,4 +1,4 @@
-package org.jetbrains.jet;
+package org.jetbrains.jet.compiler;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.codegen.PropertyCodegen;
diff --git a/compiler/tests/org/jetbrains/jet/ReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java
similarity index 94%
rename from compiler/tests/org/jetbrains/jet/ReadJavaBinaryClassTest.java
rename to compiler/tests/org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java
index 66e4ddf1ded..d476f78cce2 100644
--- a/compiler/tests/org/jetbrains/jet/ReadJavaBinaryClassTest.java
+++ b/compiler/tests/org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java
@@ -1,17 +1,14 @@
-package org.jetbrains.jet;
+package org.jetbrains.jet.compiler;
 
-import com.google.common.base.Predicates;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.CharsetToolkit;
-import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiFileFactory;
 import com.intellij.psi.impl.PsiFileFactoryImpl;
 import com.intellij.testFramework.LightVirtualFile;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ClassBuilderFactory;
-import org.jetbrains.jet.codegen.GenerationState;
-import org.jetbrains.jet.compiler.JetCoreEnvironment;
+import org.jetbrains.jet.JetTestCaseBuilder;
+import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.lang.JetSemanticServices;
 import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
diff --git a/compiler/tests/org/jetbrains/jet/ReadKotlinBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/compiler/ReadKotlinBinaryClassTest.java
similarity index 72%
rename from compiler/tests/org/jetbrains/jet/ReadKotlinBinaryClassTest.java
rename to compiler/tests/org/jetbrains/jet/compiler/ReadKotlinBinaryClassTest.java
index 82fdc19e162..494d09d013d 100644
--- a/compiler/tests/org/jetbrains/jet/ReadKotlinBinaryClassTest.java
+++ b/compiler/tests/org/jetbrains/jet/compiler/ReadKotlinBinaryClassTest.java
@@ -1,4 +1,4 @@
-package org.jetbrains.jet;
+package org.jetbrains.jet.compiler;
 
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.io.FileUtil;
@@ -8,51 +8,23 @@ import com.intellij.psi.impl.PsiFileFactoryImpl;
 import com.intellij.testFramework.LightVirtualFile;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.JetTestCaseBuilder;
+import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.codegen.ClassBuilderFactory;
 import org.jetbrains.jet.codegen.ClassFileFactory;
 import org.jetbrains.jet.codegen.GenerationState;
-import org.jetbrains.jet.codegen.PropertyCodegen;
-import org.jetbrains.jet.compiler.CompileEnvironment;
-import org.jetbrains.jet.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.lang.JetSemanticServices;
-import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
-import org.jetbrains.jet.lang.descriptors.ClassKind;
-import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
-import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
-import org.jetbrains.jet.lang.descriptors.Modality;
-import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
-import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
-import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
-import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
-import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTraceContext;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
 import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
-import org.jetbrains.jet.lang.resolve.scopes.JetScope;
-import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver;
-import org.jetbrains.jet.lang.types.JetType;
-import org.jetbrains.jet.lang.types.TypeProjection;
-import org.jetbrains.jet.lang.types.Variance;
 import org.jetbrains.jet.plugin.JetLanguage;
 import org.junit.Assert;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
 import java.io.File;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 /**
  * Compile Kotlin and then parse model from .class files.
diff --git a/compiler/tests/org/jetbrains/jet/TestCaseWithTmpdir.java b/compiler/tests/org/jetbrains/jet/compiler/TestCaseWithTmpdir.java
similarity index 84%
rename from compiler/tests/org/jetbrains/jet/TestCaseWithTmpdir.java
rename to compiler/tests/org/jetbrains/jet/compiler/TestCaseWithTmpdir.java
index 7e28a7cf679..fc503564e16 100644
--- a/compiler/tests/org/jetbrains/jet/TestCaseWithTmpdir.java
+++ b/compiler/tests/org/jetbrains/jet/compiler/TestCaseWithTmpdir.java
@@ -1,6 +1,7 @@
-package org.jetbrains.jet;
+package org.jetbrains.jet.compiler;
 
 import com.intellij.testFramework.UsefulTestCase;
+import org.jetbrains.jet.JetTestUtils;
 
 import java.io.File;
 
diff --git a/compiler/tests/org/jetbrains/jet/WriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/compiler/WriteSignatureTest.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/WriteSignatureTest.java
rename to compiler/tests/org/jetbrains/jet/compiler/WriteSignatureTest.java
index c019cfa67ed..0d3f8c608fe 100644
--- a/compiler/tests/org/jetbrains/jet/WriteSignatureTest.java
+++ b/compiler/tests/org/jetbrains/jet/compiler/WriteSignatureTest.java
@@ -1,4 +1,4 @@
-package org.jetbrains.jet;
+package org.jetbrains.jet.compiler;
 
 import com.google.common.io.Closeables;
 import com.google.common.io.Files;
@@ -11,11 +11,11 @@ import com.intellij.testFramework.LightVirtualFile;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.JetTestCaseBuilder;
+import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.codegen.ClassBuilderFactory;
 import org.jetbrains.jet.codegen.ClassFileFactory;
 import org.jetbrains.jet.codegen.GenerationState;
-import org.jetbrains.jet.compiler.CompileEnvironment;
-import org.jetbrains.jet.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;