diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index f629b6ff80f..19ff06e0534 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -16,6 +16,7 @@
 
 import groovy.json.JsonOutput
 import org.jetbrains.kotlin.*
+import org.jetbrains.kotlin.konan.target.KonanTarget
 
 buildscript {
     repositories {
@@ -2612,7 +2613,7 @@ if (isMac()) {
                 args "-lobjc", '-fobjc-arc'
                 args '-fPIC', '-shared', '-o', "$buildDir/libobjcsmoke.dylib"
             }
-            if (project.testTarget == 'ios_x64') {
+            if (project.target instanceof KonanTarget.IOS_X64) {
                 UtilsKt.codesign(project, "$buildDir/libobjcsmoke.dylib")
             }
         }
diff --git a/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt b/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt
index 938faa75801..77db38e7c17 100644
--- a/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt
+++ b/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt
@@ -1,13 +1,10 @@
 package org.jetbrains.kotlin
 
-import org.gradle.api.Action
 import org.gradle.api.DefaultTask
-import org.gradle.api.Project
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.api.tasks.TaskAction
-import org.gradle.process.ExecSpec
 
 import org.jetbrains.kotlin.konan.target.*
 
diff --git a/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/Utils.kt b/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
index 7274106a7d6..cf810fd0e56 100644
--- a/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
+++ b/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
@@ -2,11 +2,11 @@ package org.jetbrains.kotlin
 
 import org.gradle.api.Project
 import org.jetbrains.kotlin.konan.target.HostManager
+import org.jetbrains.kotlin.konan.target.KonanTarget
 import org.jetbrains.kotlin.konan.target.PlatformManager
 
-fun Project.platformManager() = rootProject.findProperty("platformManager") as PlatformManager
-
-fun Project.testTarget() = platformManager().targetManager(project.findProperty("testTarget") as String?).target
+fun Project.platformManager() = findProperty("platformManager") as PlatformManager
+fun Project.testTarget() = findProperty("target") as KonanTarget
 
 /**
  * Ad-hoc signing of the specified path