diff --git a/klib/build.gradle b/klib/build.gradle
index ff3f7e02de7..970cd4d1aa6 100644
--- a/klib/build.gradle
+++ b/klib/build.gradle
@@ -58,4 +58,11 @@ test {
     dependsOn 'cleanTest'
     systemProperty('konan.home', getProperty("konan.home"))
     dependsOn konanArtifacts.collect { it.getByTarget('host') }
+    if (useCustomDist) {
+        // Use the klib utility from the distribution
+        def distClasspath = fileTree("${project.getProperty("konan.home")}/konan/lib") {
+            include "**/*.jar"
+        }
+        classpath = distClasspath + sourceSets.test.runtimeClasspath - sourceSets.main.runtimeClasspath
+    }
 }
\ No newline at end of file
diff --git a/klib/src/test/kotlin/org/jetbrains/kotlin/cli/klib/test/ContentsTest.kt b/klib/src/test/kotlin/org/jetbrains/kotlin/cli/klib/test/ContentsTest.kt
index 6c105976aa0..33038b0c529 100644
--- a/klib/src/test/kotlin/org/jetbrains/kotlin/cli/klib/test/ContentsTest.kt
+++ b/klib/src/test/kotlin/org/jetbrains/kotlin/cli/klib/test/ContentsTest.kt
@@ -16,11 +16,11 @@
 
 package org.jetbrains.kotlin.cli.klib.test
 
+import com.intellij.openapi.util.text.StringUtil
 import kotlin.test.*
 import org.jetbrains.kotlin.cli.klib.*
 import org.jetbrains.kotlin.konan.target.Distribution
 import org.jetbrains.kotlin.konan.target.HostManager
-import org.jetbrains.kotlin.preprocessor.convertLineSeparators
 import java.nio.file.Paths
 
 class ContentsTest {
@@ -35,8 +35,8 @@ class ContentsTest {
             println(output.trim().toString())
         }
         assertEquals(
-                expected().convertLineSeparators(),
-                output.trim().toString().convertLineSeparators(),
+                StringUtil.convertLineSeparators(expected()),
+                StringUtil.convertLineSeparators(output.trim().toString()),
                 "klib contents test failed for library: $library"
         )
     }