diff --git a/plugins/kotlin/gradle/gradle-tooling/impl/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinTargetBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/impl/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinTargetBuilder.kt
index e585f5b46eef..127f89b82260 100644
--- a/plugins/kotlin/gradle/gradle-tooling/impl/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinTargetBuilder.kt
+++ b/plugins/kotlin/gradle/gradle-tooling/impl/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinTargetBuilder.kt
@@ -148,11 +148,12 @@ object KotlinTargetBuilder : KotlinMultiplatformComponentBuilder<KotlinTargetRef
         val getJvmTargetName = jvmTestTaskClass.getDeclaredMethodOrNull("getTargetName") ?: return emptyList()
 
         /**
-         * Only run this branch for the 'KotlinAndroidTarget'  maintained in KGP:
-         * This target can be identified checking the 'presetName' here.
+         * Only run this branch for the 'KotlinAndroidTarget' maintained in KGP:
+         * This target can be identified by checking the 'presetName' here.
          * The External Android target will not have any presetName as it is using the external target API instead of presets.
+         * 'KotlinTargetReflection.presetName' is always 'null' starting Kotlin 2.2.0 release.
          */
-        if (target.presetName == "android") {
+        if (target.presetName == "android" || target.platformType == "androidJvm") {
             val androidUnitTestClass = gradleTarget.testTaskClass("com.android.build.gradle.tasks.factory.AndroidUnitTest")
                 ?: return emptyList()
 
diff --git a/plugins/kotlin/idea/tests/testData/gradle/multiplatform/core/features/misc/dependencyOnStdlibFromPlatformSourceSets/dependencies.txt b/plugins/kotlin/idea/tests/testData/gradle/multiplatform/core/features/misc/dependencyOnStdlibFromPlatformSourceSets/dependencies.txt
index 6ec0416bf1ff..54217b785661 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/multiplatform/core/features/misc/dependencyOnStdlibFromPlatformSourceSets/dependencies.txt
+++ b/plugins/kotlin/idea/tests/testData/gradle/multiplatform/core/features/misc/dependencyOnStdlibFromPlatformSourceSets/dependencies.txt
@@ -6,7 +6,6 @@ my-app.commonMain
 
 my-app.commonTest
     commonMain (friend, TEST)
-    org.jetbrains.kotlin:kotlin-stdlib:commonMain:{{KGP_VERSION}} (TEST)
 
 my-app.jsMain
     commonMain (refines, COMPILE)