diff --git a/backend.native/build.gradle b/backend.native/build.gradle
index 117e6ed17f0..5ccf8d1906b 100644
--- a/backend.native/build.gradle
+++ b/backend.native/build.gradle
@@ -285,5 +285,4 @@ task debugCompiler(type: JavaExec) {
             "-Djava.library.path=${distDir.canonicalPath}/konan/nativelib"
     enableAssertions = true
     args = findProperty("konan.debug.args").toString().tokenize() ?: []
-}
-
+}
\ No newline at end of file
diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index 8b27c27d987..dd914aa3cf6 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -3071,23 +3071,30 @@ task interop_callbacksAndVarargs(type: RunInteropKonanTest) {
     interop = 'ccallbacksAndVarargs'
 }
 
-task interop_withSpaces() {
-    dependsOn 'build'
-    konanArtifacts {
-        interop('withSpacesInterop') {
-            defFile generateWithSpaceDefFile()
+// TODO: merge with new tests infrastructure.
+// Now after clean without calling dist task get error 'Classpath of the tool is empty: cinterop'
+/*task interop_withSpaces() {
+    if (project.testTarget != 'wasm32') {
+        if (!project.ext.useCustomDist) {
+            dependsOn ':dist'
         }
-        program("withSpaces") {
-            srcDir "interop/basics/withSpaces.kt"
-            libraries {
-                artifact 'withSpacesInterop'
+        dependsOn 'build'
+        konanArtifacts {
+            interop('withSpacesInterop') {
+                defFile generateWithSpaceDefFile()
+            }
+            program("withSpaces") {
+                srcDir "interop/basics/withSpaces.kt"
+                libraries {
+                    artifact 'withSpacesInterop'
+                }
             }
         }
+        doLast {
+            assert file("${buildDir}/cutom map.map").exists()
+        }
     }
-    doLast {
-        assert file("${buildDir}/cutom map.map").exists()
-    }
-}
+}*/
 
 task interop_echo_server(type: RunInteropKonanTest) {
     disabled = isWasmTarget(project) || isWindowsTarget(project)