diff --git a/kotlin-native/backend.native/tests/interop/embedStaticLibraries/embedStaticLibraries.def b/kotlin-native/backend.native/tests/interop/embedStaticLibraries/embedStaticLibraries.def
index da241a53021..15f734d660a 100644
--- a/kotlin-native/backend.native/tests/interop/embedStaticLibraries/embedStaticLibraries.def
+++ b/kotlin-native/backend.native/tests/interop/embedStaticLibraries/embedStaticLibraries.def
@@ -1,2 +1,2 @@
-libraryPaths = kotlin-native/backend.native/tests/build/embedStaticLibraries
+libraryPaths = build/embedStaticLibraries
 staticLibraries = 3.a 4.a
diff --git a/kotlin-native/backend.native/tests/interop/kt43502/kt43502.def b/kotlin-native/backend.native/tests/interop/kt43502/kt43502.def
index 80d7119aac0..8eb28428103 100644
--- a/kotlin-native/backend.native/tests/interop/kt43502/kt43502.def
+++ b/kotlin-native/backend.native/tests/interop/kt43502/kt43502.def
@@ -1,2 +1,2 @@
-libraryPaths = kotlin-native/backend.native/tests/build/kt43502
+libraryPaths = build/kt43502
 staticLibraries = kt43502.a
\ No newline at end of file
diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
index d08a93970e2..a9ec7f0b1ef 100644
--- a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
+++ b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
@@ -58,7 +58,10 @@ internal abstract class KonanCliRunner(
     }
 
     protected val blacklistProperties: Set<String> =
-        setOf("java.endorsed.dirs")
+        setOf(
+                "java.endorsed.dirs", // Fix for KT-25887
+                "user.dir"            // Don't propagate the working dir of the current Gradle process
+        )
 
     override val classpath: FileCollection =
             project.fileTree("$konanHome/konan/lib/")