diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 2b2c48abc80..6f45e9598cc 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -66,7 +66,7 @@ dependencies {
     testCompile(projectTests(":generators:test-generator"))
     testCompile(project(":compiler:ir.ir2cfg"))
     testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward
-    testCompileOnly(project(":kotlin-daemon-client"))
+    testCompileOnly(projectRuntimeJar(":kotlin-daemon-client"))
     testCompileOnly(project(":kotlin-reflect-api"))
     otherCompilerModules.forEach {
         testCompileOnly(project(it))
diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts
index b51cff6d205..b7956db0e6a 100644
--- a/compiler/compiler-runner/build.gradle.kts
+++ b/compiler/compiler-runner/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     compileOnly(project(":kotlin-preloader"))
     compileOnly(project(":compiler:frontend.java"))
     compileOnly(project(":compiler:daemon-common"))
-    compile(project(":kotlin-daemon-client"))
+    compile(projectRuntimeJar(":kotlin-daemon-client"))
     compileOnly(project(":compiler:util"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable"))
diff --git a/compiler/daemon/daemon-client/build.gradle.kts b/compiler/daemon/daemon-client/build.gradle.kts
index 16604b5680a..28e2ee893c2 100644
--- a/compiler/daemon/daemon-client/build.gradle.kts
+++ b/compiler/daemon/daemon-client/build.gradle.kts
@@ -30,6 +30,8 @@ sourceSets {
     "test" {}
 }
 
+noDefaultJar()
+
 runtimeJar(task<ShadowJar>("shadowJar")) {
     from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
     fromEmbeddedComponents()
diff --git a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
index b17380c1eee..98095f00d97 100644
--- a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
+++ b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     testCompile(project(":kotlin-stdlib"))
     testCompile(project(":kotlin-script-runtime"))
     testCompile(project(":kotlin-script-util"))
-    testCompile(project(":kotlin-daemon-client"))
+    testCompile(projectRuntimeJar(":kotlin-daemon-client"))
     testCompile(projectRuntimeJar(":kotlin-compiler-embeddable"))
     testCompile(commonDep("junit:junit"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts
index b652a3f5300..c3705743ba7 100644
--- a/libraries/tools/kotlin-script-util/build.gradle.kts
+++ b/libraries/tools/kotlin-script-util/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     compile(project(":kotlin-script-runtime"))
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":compiler:daemon-common"))
-    compile(project(":kotlin-daemon-client"))
+    compile(projectRuntimeJar(":kotlin-daemon-client"))
     compileOnly("com.jcabi:jcabi-aether:0.10.1")
     compileOnly("org.sonatype.aether:aether-api:1.13.1")
     compileOnly("org.apache.maven:maven-core:3.0.3")
diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts
index 1b30a8894e3..85ed4967ce3 100644
--- a/plugins/source-sections/source-sections-compiler/build.gradle.kts
+++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     testCompile(project(":compiler:cli-common"))
     testCompile(project(":compiler:frontend.java"))
     testCompile(project(":compiler:daemon-common"))
-    testCompile(project(":kotlin-daemon-client"))
+    testCompile(projectRuntimeJar(":kotlin-daemon-client"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
     testCompile(intellijCoreDep()) { includeJars("intellij-core") }
diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts
index 7adf17e5548..722d59906c6 100644
--- a/prepare/compiler-client-embeddable/build.gradle.kts
+++ b/prepare/compiler-client-embeddable/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     jarContents(projectRuntimeJar(":kotlin-daemon-client"))
     testCompile(project(":compiler:cli-common"))
     testCompile(project(":compiler:daemon-common"))
-    testCompile(project(":kotlin-daemon-client"))
+    testCompile(projectRuntimeJar(":kotlin-daemon-client"))
     testCompile(commonDep("junit:junit"))
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
diff --git a/prepare/jps-plugin/build.gradle.kts b/prepare/jps-plugin/build.gradle.kts
index 741a833e7f9..9b0d6a86092 100644
--- a/prepare/jps-plugin/build.gradle.kts
+++ b/prepare/jps-plugin/build.gradle.kts
@@ -10,7 +10,6 @@ val projectsToShadow = listOf(
         ":kotlin-build-common",
         ":compiler:cli-common",
         ":kotlin-compiler-runner",
-        ":kotlin-daemon-client",
         ":compiler:daemon-common",
         ":core:descriptors",
         ":core:descriptors.jvm",
@@ -28,6 +27,7 @@ dependencies {
     projectsToShadow.forEach {
         embeddedComponents(project(it)) { isTransitive = false }
     }
+    embeddedComponents(projectRuntimeJar(":kotlin-daemon-client"))
 }
 
 runtimeJar<ShadowJar>(task<ShadowJar>("jar")) {