diff --git a/build.gradle.kts b/build.gradle.kts
index 3743f22c840..266f17a443a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -791,8 +791,25 @@ tasks {
         dependsOn(":wasm:wasm.tests:testFir")
     }
 
+    // These tests run Native compiler and will be run in many different compilation modes that the compiler supports:
+    // - different optimization modes
+    // - different cache policies
+    // - different GCs
+    // ...
     register("nativeCompilerTest") {
-        dependsOn(":native:kotlin-native-utils:test")
+        dependsOn(":native:native.tests:test")
+        dependsOn(":native:objcexport-header-generator:check")
+        dependsOn(":kotlin-atomicfu-compiler-plugin:nativeTest")
+    }
+
+    // These are unit tests of Native compiler
+    register("nativeCompilerUnitTest") {
+        dependsOn(":native:kotlin-native-utils:check")
+        if (kotlinBuildProperties.isKotlinNativeEnabled) {
+            dependsOn(":kotlin-native:Interop:Indexer:check")
+            dependsOn(":kotlin-native:Interop:StubGenerator:check")
+            dependsOn(":kotlin-native:backend.native:check")
+        }
     }
 
     register("firCompilerTest") {
@@ -847,7 +864,6 @@ tasks {
         dependsOn("gradlePluginTest")
         dependsOn("toolsTest")
         dependsOn("examplesTest")
-        dependsOn("nativeCompilerTest")
         dependsOn("incrementalCompilationTest")
         dependsOn("scriptingTest")
         dependsOn("jvmCompilerIntegrationTest")
diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle
index e799acf00bc..99ca7025172 100644
--- a/kotlin-native/backend.native/tests/build.gradle
+++ b/kotlin-native/backend.native/tests/build.gradle
@@ -180,11 +180,10 @@ tasks.named("run") {
     dependsOn(tasks.withType(FileCheckTest).matching { it.enabled })
     // Add regular gradle test tasks
     dependsOn(tasks.withType(Test).matching { it.enabled })
-    dependsOn(":kotlin-native:Interop:Indexer:check")
-    dependsOn(":kotlin-native:Interop:StubGenerator:check")
-    dependsOn(":native:kotlin-native-utils:check")
+    // TODO(KTI-1571): This task should be run by Compiler Unit Tests (Native) configuration
+    dependsOn(":nativeCompilerUnitTest")
+    // TODO(KTI-1571): This should be run by Compiler Tests (Native) configuration
     dependsOn(":native:objcexport-header-generator:check")
-    dependsOn(":kotlin-native:backend.native:check")
 }
 
 // Was a subset of tests.