diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index 5c1f383bf69..1dd9a8d2383 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -113,17 +113,18 @@ task installTestLibrary(type: KlibInstall) {
     repo = rootProject.file("${project.property("konan.home")}/klib/common")
 }
 
-// TODO: use lastSuccessful teamcity build.
+// Gets tests from the same Kotlin compiler build
 task update_external_tests() {
     doLast {
         // Unzip.
         delete temporaryDir
         copy {
-            configurations.update_tests.asFileTree.each {
-                from(zipTree(it)) {
-                    include 'compiler/**'
+//            configurations.update_tests.asFileTree.each {
+//                from(zipTree(it)) {
+            from(zipTree(file('/Users/ppunegov/ws/kotlin/dist/kotlin-test-data.zip'))) {
+
+                include 'compiler/**'
                 }
-            }
             into(temporaryDir)
         }
 
diff --git a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
index 11e4fdcbe2a..5fbcc9ed7f0 100644
--- a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+++ b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
@@ -647,6 +647,9 @@ class RunExternalTestGroup extends RunStandaloneKonanTest {
         def result = super.buildCompileList()
         for (String filePath : result) {
             def text = project.file(filePath).text
+            if (text.contains('COROUTINES_PACKAGE')) {
+                text.replaceAll('COROUTINES_PACKAGE', 'kotlin.coroutines.experimental')
+            }
             def pkg = null
             if (text =~ packagePattern) {
                 pkg = (text =~ packagePattern)[0][1]
@@ -778,6 +781,8 @@ fun runTest() {
             for (String s : ignoredBackends) {
                 if (s.contains("NATIVE")) { return false }
             }
+            // No ignored backends. Check if test is targeted to FULL_JDK
+            if (!findLinesWithPrefixesRemoved(text, "// FULL_JDK").isEmpty()) { return false }
             return true
         }
     }