diff --git a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts
index 0319564ac95..9460825d01a 100644
--- a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts
@@ -4,6 +4,10 @@ plugins {
     kotlin("jvm")
 }
 
+repositories {
+    maven(kotlinNativeRepo)
+}
+
 dependencies {
     compile(gradleApi())
     compile(project(":kotlin-gradle-plugin-api"))
diff --git a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/mppNativeBinaryDSLCodegen.kt b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/mppNativeBinaryDSLCodegen.kt
index e650a2b0320..b39abe7a689 100644
--- a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/mppNativeBinaryDSLCodegen.kt
+++ b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/mppNativeBinaryDSLCodegen.kt
@@ -127,7 +127,7 @@ fun generateAbstractKotlinNativeBinaryContainer() {
         binaryType("an Objective-C framework","Framework", "FRAMEWORK", "framework"),
         binaryType(
             "a test executable",
-            "Test",
+            "TestExecutable",
             "TEST",
             "test",
             defaultBaseName = "\"test\""
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/AbstractKotlinNativeBinaryContainer.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/AbstractKotlinNativeBinaryContainer.kt
index 695755902d3..7d86a4eb877 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/AbstractKotlinNativeBinaryContainer.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/AbstractKotlinNativeBinaryContainer.kt
@@ -143,30 +143,30 @@ abstract class AbstractKotlinNativeBinaryContainer : DomainObjectSet<NativeBinar
     fun findFramework(buildType: String): Framework? = findFramework("", buildType)
 
     /** Returns a test executable with the given [namePrefix] and the given build type. Throws an exception if there is no such binary.*/
-    abstract fun getTest(namePrefix: String, buildType: NativeBuildType): Test
+    abstract fun getTest(namePrefix: String, buildType: NativeBuildType): TestExecutable
 
     /** Returns a test executable with the given [namePrefix] and the given build type. Throws an exception if there is no such binary.*/
-    fun getTest(namePrefix: String, buildType: String): Test =
+    fun getTest(namePrefix: String, buildType: String): TestExecutable =
         getTest(namePrefix, NativeBuildType.valueOf(buildType.toUpperCase()))
 
     /** Returns a test executable with the empty name prefix and the given build type. Throws an exception if there is no such binary.*/
-    fun getTest(buildType: NativeBuildType): Test = getTest("", buildType)
+    fun getTest(buildType: NativeBuildType): TestExecutable = getTest("", buildType)
 
     /** Returns a test executable with the empty name prefix and the given build type. Throws an exception if there is no such binary.*/
-    fun getTest(buildType: String): Test =  getTest("", buildType)
+    fun getTest(buildType: String): TestExecutable =  getTest("", buildType)
 
     /** Returns a test executable with the given [namePrefix] and the given build type. Returns null if there is no such binary. */
-    abstract fun findTest(namePrefix: String, buildType: NativeBuildType): Test?
+    abstract fun findTest(namePrefix: String, buildType: NativeBuildType): TestExecutable?
 
     /** Returns a test executable with the given [namePrefix] and the given build type. Returns null if there is no such binary. */
-    fun findTest(namePrefix: String, buildType: String): Test? =
+    fun findTest(namePrefix: String, buildType: String): TestExecutable? =
         findTest(namePrefix, NativeBuildType.valueOf(buildType.toUpperCase()))
 
     /** Returns a test executable with the empty name prefix and the given build type. Returns null if there is no such binary. */
-    fun findTest(buildType: NativeBuildType): Test? = findTest("", buildType)
+    fun findTest(buildType: NativeBuildType): TestExecutable? = findTest("", buildType)
 
     /** Returns a test executable with the empty name prefix and the given build type. Returns null if there is no such binary. */
-    fun findTest(buildType: String): Test? = findTest("", buildType)
+    fun findTest(buildType: String): TestExecutable? = findTest("", buildType)
 
     /** Creates an executable with the given [namePrefix] for each build type and configures it. */
     @JvmOverloads
@@ -293,15 +293,15 @@ abstract class AbstractKotlinNativeBinaryContainer : DomainObjectSet<NativeBinar
     fun test(
         namePrefix: String,
         buildTypes: Collection<NativeBuildType> = NativeBuildType.DEFAULT_BUILD_TYPES,
-        configure: Test.() -> Unit = {}
-    ) = createBinaries(namePrefix, namePrefix, NativeOutputKind.TEST, buildTypes, ::Test, configure)
+        configure: TestExecutable.() -> Unit = {}
+    ) = createBinaries(namePrefix, namePrefix, NativeOutputKind.TEST, buildTypes, ::TestExecutable, configure)
 
     /** Creates a test executable with the empty name prefix for each build type and configures it. */
     @JvmOverloads
     fun test(
         buildTypes: Collection<NativeBuildType> = NativeBuildType.DEFAULT_BUILD_TYPES,
-        configure: Test.() -> Unit = {}
-    ) = createBinaries("", "test", NativeOutputKind.TEST, buildTypes, ::Test, configure)
+        configure: TestExecutable.() -> Unit = {}
+    ) = createBinaries("", "test", NativeOutputKind.TEST, buildTypes, ::TestExecutable, configure)
 
     /** Creates a test executable with the given [namePrefix] for each build type and configures it. */
     @JvmOverloads
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinNativeBinaryContainer.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinNativeBinaryContainer.kt
index caac810d3d0..96ba9f11719 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinNativeBinaryContainer.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinNativeBinaryContainer.kt
@@ -92,7 +92,7 @@ open class KotlinNativeBinaryContainer @Inject constructor(
     override fun getFramework(namePrefix: String, buildType: NativeBuildType): Framework =
         getBinary(namePrefix, buildType, NativeOutputKind.FRAMEWORK)
 
-    override fun getTest(namePrefix: String, buildType: NativeBuildType): Test =
+    override fun getTest(namePrefix: String, buildType: NativeBuildType): TestExecutable =
         getBinary(namePrefix, buildType, NativeOutputKind.TEST)
 
     override fun findExecutable(namePrefix: String, buildType: NativeBuildType): Executable? {
@@ -109,7 +109,7 @@ open class KotlinNativeBinaryContainer @Inject constructor(
     override fun findFramework(namePrefix: String, buildType: NativeBuildType): Framework? =
         findBinary(namePrefix, buildType, NativeOutputKind.FRAMEWORK)
 
-    override fun findTest(namePrefix: String, buildType: NativeBuildType): Test? =
+    override fun findTest(namePrefix: String, buildType: NativeBuildType): TestExecutable? =
         findBinary(namePrefix, buildType, NativeOutputKind.TEST)
     // endregion.
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt
index 8254a0640e1..c37d82bf280 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt
@@ -121,7 +121,7 @@ open class KotlinNativeTargetConfigurator(
             destinationDir = binary.outputDirectory
             addCompilerPlugins()
 
-            if (binary !is Test) {
+            if (binary !is TestExecutable) {
                 tasks.maybeCreate(target.artifactsTaskName).dependsOn(this)
                 tasks.maybeCreate(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(this)
             }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt
index 99892aa386a..71e7e5be95d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt
@@ -130,7 +130,7 @@ class Executable constructor(
         get() = runTaskName?.let { project.tasks.getByName(it) as AbstractExecTask<*> }
 }
 
-class Test(
+class TestExecutable(
     name: String,
     baseName: String,
     buildType: NativeBuildType,
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index 83fd8b9ed17..4c194ab1e93 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -364,7 +364,7 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile() {
 
     @get:Input
     val processTests: Boolean
-        get() = binary is Test
+        get() = binary is TestExecutable
 
     @get:InputFiles
     val exportLibraries: FileCollection