diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt
index fde454631ee..da49368ed68 100644
--- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt
+++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt
@@ -822,10 +822,10 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
                 }
             }
 
-            (allSourceSetToCompilations[sourceSet]?.all { it.isTestModule }
-                ?: if (!isHMPPEnabled && sourceSet.name == KotlinSourceSet.COMMON_TEST_SOURCE_SET_NAME) true else null)?.let { isTest ->
+            allSourceSetToCompilations[sourceSet]?.all { it.isTestModule }?.let { isTest ->
                 sourceSet.isTestModule = isTest
             }
+            
             (allSourceSetToCompilations[sourceSet])?.let { compilations ->
                 val platforms = compilations.map { it.platform }
                 sourceSet.actualPlatforms.addSimplePlatforms(platforms)