diff --git a/compiler/tests/org/jetbrains/jet/CompileStdlibTest.java b/compiler/tests/org/jetbrains/jet/CompileStdlibTest.java
index c960df45c3a..4978cdc4737 100644
--- a/compiler/tests/org/jetbrains/jet/CompileStdlibTest.java
+++ b/compiler/tests/org/jetbrains/jet/CompileStdlibTest.java
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet;
 
-import org.jetbrains.jet.codegen.ForTestCompileRuntime;
+import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
 import org.junit.Test;
 
 /**
diff --git a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
index 50a30e00cb9..390b757ad79 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen;
 
+import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.compiler.CompileEnvironment;
 import org.jetbrains.jet.lang.psi.JetPsiUtil;
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
index f3214341c65..698d6adf2da 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
@@ -21,6 +21,7 @@ import gnu.trove.THashSet;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.compiler.CompileSession;
 import org.jetbrains.jet.compiler.MessageRenderer;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ForTestCompileRuntime.java b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/ForTestCompileRuntime.java
rename to compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
index ae8afb2ffba..2c8695de3bd 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ForTestCompileRuntime.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.jet.codegen.forTestCompile;
 
 import com.google.common.io.Files;
 import com.intellij.openapi.util.Pair;
diff --git a/compiler/tests/org/jetbrains/jet/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/compiler/CompileEnvironmentTest.java
index 8cfd67a22df..30f90dfda8c 100644
--- a/compiler/tests/org/jetbrains/jet/compiler/CompileEnvironmentTest.java
+++ b/compiler/tests/org/jetbrains/jet/compiler/CompileEnvironmentTest.java
@@ -19,7 +19,7 @@ package org.jetbrains.jet.compiler;
 import com.intellij.openapi.util.io.FileUtil;
 import junit.framework.TestCase;
 import org.jetbrains.jet.cli.KotlinCompiler;
-import org.jetbrains.jet.codegen.ForTestCompileRuntime;
+import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.parsing.JetParsingTest;
 import org.junit.Assert;
 
diff --git a/idea/tests/org/jetbrains/jet/plugin/JetWithJdkAndRuntimeLightProjectDescriptor.java b/idea/tests/org/jetbrains/jet/plugin/JetWithJdkAndRuntimeLightProjectDescriptor.java
index 72f54c74cbc..6fb7f67364d 100644
--- a/idea/tests/org/jetbrains/jet/plugin/JetWithJdkAndRuntimeLightProjectDescriptor.java
+++ b/idea/tests/org/jetbrains/jet/plugin/JetWithJdkAndRuntimeLightProjectDescriptor.java
@@ -29,7 +29,7 @@ import com.intellij.testFramework.LightProjectDescriptor;
 import org.apache.commons.lang.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ForTestCompileRuntime;
+import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
 
 /**
 * @author Evgeny Gerashchenko