diff --git a/compiler/testData/cli/fib.fib.kt b/compiler/testData/script/fib.fib.kt
similarity index 100%
rename from compiler/testData/cli/fib.fib.kt
rename to compiler/testData/script/fib.fib.kt
diff --git a/compiler/testData/cli/fib.kt b/compiler/testData/script/fib.kt
similarity index 100%
rename from compiler/testData/cli/fib.kt
rename to compiler/testData/script/fib.kt
diff --git a/compiler/testData/cli/fib.ktscript b/compiler/testData/script/fib.ktscript
similarity index 100%
rename from compiler/testData/cli/fib.ktscript
rename to compiler/testData/script/fib.ktscript
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java
index 5e1db07e257..0b5154d5e10 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java
@@ -45,4 +45,9 @@ public class K2JvmCliTest extends CliBaseTest {
     public void nonExistingSourcePath() throws Exception {
         executeCompilerCompareOutputJVM();
     }
+
+    @Test
+    public void script() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
 }
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/ScriptTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/ScriptTest.java
index ed03dc4977d..8759808d377 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/ScriptTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/ScriptTest.java
@@ -43,12 +43,7 @@ import org.junit.Test;
 import java.util.Collections;
 import java.util.List;
 
-public class ScriptTest extends CliBaseTest {
-    @Test
-    public void script() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-
+public class ScriptTest {
     @Test
     public void testScript() throws Exception {
         Class<?> aClass = compileScript("fib.ktscript", numIntParam(), Collections.<JetScriptDefinition>emptyList());
@@ -85,7 +80,7 @@ public class ScriptTest extends CliBaseTest {
             CompilerConfiguration configuration =
                     JetTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_AND_ANNOTATIONS, TestJdkKind.MOCK_JDK);
             configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector);
-            configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, "compiler/testData/cli/" + scriptPath);
+            configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, "compiler/testData/script/" + scriptPath);
             configuration.addAll(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY, scriptDefinitions);
             configuration.put(JVMConfigurationKeys.SCRIPT_PARAMETERS, scriptParameters);