diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/KotlinNativeTestSuite.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/KotlinNativeTestSuite.kt
index b7f9967bcd1..ff5abcbaa74 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/KotlinNativeTestSuite.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/KotlinNativeTestSuite.kt
@@ -41,6 +41,7 @@ open class KotlinNativeTestSuite @Inject constructor(
 
     init {
         getImplementationDependencies().extendsFrom(testedComponent.getImplementationDependencies())
+        konanTargets.set(project.provider { testedComponent.konanTargets.get() })
     }
 
     override fun getDisplayName(): DisplayName = Describables.withTypeAndName("Kotlin/Native test suite", name)
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativePlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativePlugin.kt
index c1886d26cf3..04c6a88a596 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativePlugin.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativePlugin.kt
@@ -175,9 +175,11 @@ class KotlinNativePlugin @Inject constructor(val attributesFactory: ImmutableAtt
                         objects
                 )
 
-                val binary = component.addTestExecutable(variantIdentity)
-                if (target == HostManager.host) {
-                    component.testBinary.set(binary)
+                if (hostManager.isEnabled(target)) {
+                    val binary = component.addTestExecutable(variantIdentity)
+                    if (target == HostManager.host) {
+                        component.testBinary.set(binary)
+                    }
                 }
             }
             component.binaries.realizeNow()