diff --git a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy
index a34fc5f1d77..b0e9f30dae5 100644
--- a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy
+++ b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy
@@ -141,7 +141,7 @@ class KonanProject {
             |plugins { id 'konan' }
             |
             |konan.targets = [${targets.collect { "'$it'" }.join(", ")}]
-            """.stripMargin()
+            |""".stripMargin()
         )
         compilationTasks = [":compileKonan", ":build"]
         return result
diff --git a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/LibrarySpecification.groovy b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/LibrarySpecification.groovy
index e660aa7abf0..0782e3553c1 100644
--- a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/LibrarySpecification.groovy
+++ b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/LibrarySpecification.groovy
@@ -234,7 +234,6 @@ class LibrarySpecification extends BaseKonanSpecification {
                 .build()
     }
 
-    @Ignore // TODO: Ignored due to an error with recursive klibs
     def 'Plugin should support library dependencies in the same project'() {
         expect:
         def project = KonanProject.createEmpty(projectDirectory) { KonanProject it ->
@@ -255,7 +254,6 @@ class LibrarySpecification extends BaseKonanSpecification {
                 .build()
     }
 
-    @Ignore  // TODO: Ignored due to an error with recursive klibs
     def 'Plugin should support library dependencies from other projects'() {
         expect:
         def project = KonanProject.createEmpty(projectDirectory)
@@ -272,11 +270,15 @@ class LibrarySpecification extends BaseKonanSpecification {
 
         subproject2.addCompilerArtifact("bar", "fun bar() { println(43) }", ArtifactType.LIBRARY)
         subproject2.addSetting("bar", "noDefaultLibs", "true")
-        subproject2.addLibraryToArtifact("bar", "rootProject.project('subproject1'), foo")
+        subproject2.addLibraryToArtifactCustom(
+                "bar", "artifact rootProject.project('subproject1'), 'foo'"
+        )
 
         project.addCompilerArtifact("main" ,"fun main(args: Array<String>) { foo(); bar() }")
         project.addSetting("main", "noDefaultLibs", "true" )
-        project.addLibraryToArtifact("main", "project(subproject2), bar")
+        project.addLibraryToArtifactCustom(
+                "main", "artifact project('subproject2'), 'bar'"
+        )
 
         project.createRunner()
                 .withArguments(KonanProject.compilationTask("main"))