diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/ScriptTest.java b/compiler/tests/org/jetbrains/jet/ScriptTest.java
similarity index 96%
rename from compiler/tests/org/jetbrains/jet/cli/jvm/ScriptTest.java
rename to compiler/tests/org/jetbrains/jet/ScriptTest.java
index 8759808d377..b3c05f14371 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/ScriptTest.java
+++ b/compiler/tests/org/jetbrains/jet/ScriptTest.java
@@ -14,18 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cli.jvm;
+package org.jetbrains.jet;
 
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.Disposer;
 import junit.framework.Assert;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.TestJdkKind;
 import org.jetbrains.jet.cli.common.CLIConfigurationKeys;
 import org.jetbrains.jet.cli.common.messages.*;
+import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.cli.jvm.compiler.KotlinToJVMBytecodeCompiler;
 import org.jetbrains.jet.codegen.CompilationException;
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/CliBaseTest.java b/compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/cli/jvm/CliBaseTest.java
rename to compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java
index d6fe425fe58..6ca3cf393f3 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/CliBaseTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cli.jvm;
+package org.jetbrains.jet.cli;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.ArrayUtil;
@@ -25,6 +25,7 @@ import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.cli.common.CLICompiler;
 import org.jetbrains.jet.cli.common.ExitCode;
 import org.jetbrains.jet.cli.js.K2JSCompiler;
+import org.jetbrains.jet.cli.jvm.K2JVMCompiler;
 import org.jetbrains.jet.test.Tmpdir;
 import org.jetbrains.jet.utils.ExceptionUtils;
 import org.junit.Rule;
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/CliCommonTest.java b/compiler/tests/org/jetbrains/jet/cli/CliCommonTest.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/cli/jvm/CliCommonTest.java
rename to compiler/tests/org/jetbrains/jet/cli/CliCommonTest.java
index e5130f7dcbb..67e9897d06f 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/CliCommonTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/CliCommonTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cli.jvm;
+package org.jetbrains.jet.cli;
 
 import junit.framework.Assert;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/K2JsCliTest.java b/compiler/tests/org/jetbrains/jet/cli/js/K2JsCliTest.java
similarity index 94%
rename from compiler/tests/org/jetbrains/jet/cli/jvm/K2JsCliTest.java
rename to compiler/tests/org/jetbrains/jet/cli/js/K2JsCliTest.java
index 0693dae5807..27f3ef5998d 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/K2JsCliTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/js/K2JsCliTest.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cli.jvm;
+package org.jetbrains.jet.cli.js;
 
 import junit.framework.Assert;
+import org.jetbrains.jet.cli.CliBaseTest;
 import org.junit.Test;
 
 import java.io.File;
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java
index 0b5154d5e10..1404b9c6994 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java
@@ -17,6 +17,7 @@
 package org.jetbrains.jet.cli.jvm;
 
 import junit.framework.Assert;
+import org.jetbrains.jet.cli.CliBaseTest;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.junit.Test;