diff --git a/compiler/daemon/daemon-client/build.gradle.kts b/compiler/daemon/daemon-client/build.gradle.kts
index e185c9afeb1..28253d8a4b4 100644
--- a/compiler/daemon/daemon-client/build.gradle.kts
+++ b/compiler/daemon/daemon-client/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     compileOnly(project(":compiler:daemon-common"))
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(commonDep("net.rubygrapefruit", "native-platform"))
-    fatJarContents(project(":compiler:daemon-common"))
+    fatJarContents(project(":compiler:daemon-common")) { isTransitive = false }
     fatJarContents(commonDep("net.rubygrapefruit", "native-platform"))
     nativePlatformVariants.forEach {
         fatJarContents(commonDep("net.rubygrapefruit", "native-platform", "-$it"))
diff --git a/compiler/frontend.script/build.gradle.kts b/compiler/frontend.script/build.gradle.kts
index e4f09c4663f..d19c97ce414 100644
--- a/compiler/frontend.script/build.gradle.kts
+++ b/compiler/frontend.script/build.gradle.kts
@@ -7,9 +7,10 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compile(projectDist(":kotlin-stdlib"))
-    compile(project(":kotlin-reflect-api"))
+    compileOnly(project(":kotlin-reflect-api"))
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    runtime(project(":kotlin-reflect"))
 }
 
 sourceSets {
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
index e3afbfb4526..f0ff1ce3037 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
@@ -10,8 +10,7 @@ dependencies {
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     runtime(projectDist(":kotlin-stdlib"))
     runtime(projectDist(":kotlin-reflect"))
-    // TODO: find out whether it is important, and if yes - why it breaks tests and how to fix it
-//    runtime(projectRuntimeJar(":kotlin-compiler"))
+    runtime(projectRuntimeJar(":kotlin-compiler"))
 
     testCompile(project(":compiler:backend"))
     testCompile(project(":compiler:cli"))
diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts
index a8ee43e850d..453599ae77d 100644
--- a/prepare/compiler-client-embeddable/build.gradle.kts
+++ b/prepare/compiler-client-embeddable/build.gradle.kts
@@ -24,16 +24,13 @@ val testStdlibJar by configurations.creating
 val testScriptRuntimeJar by configurations.creating
 val archives by configurations
 
-val projectsToInclude = listOf(
-        ":compiler:cli-common",
-        ":compiler:daemon-common",
-        ":kotlin-daemon-client")
-
 dependencies {
-    projectsToInclude.forEach {
-        jarContents(project(it)) { isTransitive = false }
-        testCompile(project(it))
-    }
+    jarContents(project(":compiler:cli-common")) { isTransitive = false }
+    jarContents(project(":compiler:daemon-common")) { isTransitive = false }
+    jarContents(projectRuntimeJar(":kotlin-daemon-client"))
+    testCompile(project(":compiler:cli-common"))
+    testCompile(project(":compiler:daemon-common"))
+    testCompile(project(":kotlin-daemon-client"))
     testCompile(commonDep("junit:junit"))
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
@@ -51,7 +48,9 @@ sourceSets {
 }
 
 projectTest {
-    dependsOnTaskIfExistsRec("dist", project = rootProject)
+    dependsOn(":kotlin-compiler:dist",
+              ":kotlin-stdlib:dist",
+              ":kotlin-script-runtime:dist")
     workingDir = File(rootDir, "libraries/tools/kotlin-compiler-client-embeddable-test/src")
     doFirst {
         systemProperty("kotlin.test.script.classpath", the<JavaPluginConvention>().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator))