diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
index 71831d5136b..8f28d40ad3c 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
@@ -34,6 +34,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.config.KotlinCompilerVersion;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestCaseWithTmpdir;
+import org.jetbrains.kotlin.utils.KotlinPaths;
 import org.jetbrains.kotlin.utils.PathUtil;
 
 import java.io.File;
@@ -134,9 +135,13 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir {
     }
 
     public static File getCompilerLib() {
-        File file = PathUtil.getKotlinPathsForDistDirectory().getLibPath().getAbsoluteFile();
-        assertTrue("Lib directory doesn't exist. Run 'ant dist'", file.isDirectory());
-        return file;
+        return getKotlinPaths().getLibPath().getAbsoluteFile();
+    }
+
+    public static KotlinPaths getKotlinPaths() {
+        KotlinPaths paths = PathUtil.getKotlinPathsForDistDirectory();
+        assertTrue("Compiler dist not found. Build 'dist' target.", paths.getLibPath().isDirectory());
+        return paths;
     }
 
     private static class OutputListener extends ProcessAdapter {
diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
index db10be507ed..d6bf2fad863 100644
--- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.daemon.common.*
 import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase
 import org.jetbrains.kotlin.progress.CompilationCanceledStatus
 import org.jetbrains.kotlin.test.KotlinTestUtils
+import org.jetbrains.kotlin.utils.KotlinPaths
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.PrintStream
@@ -50,20 +51,16 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
 
     data class CompilerResults(val resultCode: Int, val out: String)
 
-    val compilerClassPath = listOf(
-        File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar")
-    )
-    val scriptingCompilerClassPath = listOf(
-        File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-scripting-compiler.jar"),
-        File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-scripting-common.jar"),
-        File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-scripting-jvm.jar")
-    )
+    val compilerClassPath = getKotlinPaths().classPath(KotlinPaths.ClassPaths.Compiler)
+
+    val compilerWithScriptingClassPath = getKotlinPaths().classPath(KotlinPaths.ClassPaths.CompilerWithScripting)
+
     val daemonClientClassPath = listOf( File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-daemon-client.jar"),
                                         File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar"))
     val compilerId by lazy(LazyThreadSafetyMode.NONE) { CompilerId.makeCompilerId(compilerClassPath) }
 
     val compilerWithScriptingId by lazy(LazyThreadSafetyMode.NONE) {
-        CompilerId.makeCompilerId(compilerClassPath + scriptingCompilerClassPath)
+        CompilerId.makeCompilerId(compilerWithScriptingClassPath)
     }
 
     private fun compileOnDaemon(clientAliveFile: File, compilerId: CompilerId, daemonJVMOptions: DaemonJVMOptions, daemonOptions: DaemonOptions, vararg args: String): CompilerResults {