diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts
index e6f13c1..5c52b50 100644
--- a/compiler/cli/build.gradle.kts
+++ b/compiler/cli/build.gradle.kts
@@ -14,14 +14,10 @@
     compile(project(":compiler:backend"))
     compile(project(":compiler:backend.jvm"))
     compile(project(":compiler:ir.backend.common"))
-    compile(project(":compiler:ir.serialization.js"))
-    compile(project(":compiler:backend.js"))
     compile(project(":compiler:light-classes"))
     compile(project(":compiler:serialization"))
     compile(project(":compiler:plugin-api"))
     compile(project(":js:js.translator"))
-    compile(project(":js:js.serializer"))
-    compile(project(":js:js.dce"))
     compile(commonDep("org.fusesource.jansi", "jansi"))
     compile(commonDep("org.jline", "jline"))
     compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
diff --git a/compiler/cli/cli-js/build.gradle.kts b/compiler/cli/cli-js/build.gradle.kts
new file mode 100644
index 0000000..d7b6ae2
--- /dev/null
+++ b/compiler/cli/cli-js/build.gradle.kts
@@ -0,0 +1,37 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+jvmTarget = "1.8"
+
+dependencies {
+    compile(project(":compiler:util"))
+    compile(project(":compiler:cli-common"))
+    compile(project(":compiler:cli"))
+    compile(project(":compiler:frontend"))
+    compile(project(":compiler:backend-common"))
+    compile(project(":compiler:backend"))
+    compile(project(":compiler:ir.backend.common"))
+    compile(project(":compiler:ir.serialization.js"))
+    compile(project(":compiler:backend.js"))
+    compile(project(":js:js.translator"))
+    compile(project(":js:js.serializer"))
+    compile(project(":js:js.dce"))
+
+    testCompile(project(":compiler:backend"))
+    testCompile(project(":compiler:cli"))
+    testCompile(projectTests(":compiler:tests-common"))
+    testCompile(commonDep("junit:junit"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { projectDefault() }
+}
+
+testsJar {}
+
+projectTest {
+    workingDir = rootDir
+}
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java
similarity index 100%
rename from compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java
rename to compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
similarity index 100%
rename from compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
rename to compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/dce/K2JSDce.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/dce/K2JSDce.kt
similarity index 100%
rename from compiler/cli/src/org/jetbrains/kotlin/cli/js/dce/K2JSDce.kt
rename to compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/dce/K2JSDce.kt
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/internal/JSStdlibLinker.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/internal/JSStdlibLinker.kt
similarity index 100%
rename from compiler/cli/src/org/jetbrains/kotlin/cli/js/internal/JSStdlibLinker.kt
rename to compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/internal/JSStdlibLinker.kt