diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt
index ad4ba982e00..d2d8e2b450b 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt
@@ -20,6 +20,7 @@ import com.intellij.openapi.externalSystem.service.project.manage.ContentRootDat
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.DependencyScope
 import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.util.containers.stream
@@ -77,19 +78,27 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             }
             val androidModel = AndroidModuleModel.get(module) ?: continue
             val variantName = androidModel.selectedVariant.name
-            val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
-            val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
-            for (sourceSet in mainCompilation.sourceSets) {
-                if (sourceSet.platform != KotlinPlatform.ANDROID) {
-                    val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
-                    val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
-                        (it.data as? ModuleData)?.id == sourceSetId
-                    }?.data as? ModuleData ?: continue
-                    val sourceSetModule = modelsProvider.findIdeModule(sourceSetData) ?: continue
-                    rootModel.addModuleOrderEntry(sourceSetModule)
+            val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
+            for (activeSourceSetInfo in activeSourceSetInfos) {
+                val activeCompilation = activeSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+                for (sourceSet in activeCompilation.sourceSets) {
+                    if (sourceSet.platform != KotlinPlatform.ANDROID) {
+                        val sourceSetId = activeSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
+                        val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
+                            (it.data as? ModuleData)?.id == sourceSetId
+                        }?.data as? ModuleData ?: continue
+                        val sourceSetModule = modelsProvider.findIdeModule(sourceSetData) ?: continue
+                        val existingEntry = rootModel.findModuleOrderEntry(sourceSetModule)
+                        val dependencyScope = if (activeSourceSetInfo.isTestModule) DependencyScope.TEST else DependencyScope.COMPILE
+                        if (existingEntry != null && existingEntry.scope == dependencyScope) continue
+                        rootModel.addModuleOrderEntry(sourceSetModule).also { it.scope = dependencyScope }
+                    }
                 }
             }
-            KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
+            val mainSourceSetInfo = activeSourceSetInfos.firstOrNull { it.kotlinModule.name == variantName }
+            if (mainSourceSetInfo != null) {
+                KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
+            }
 
             val kotlinFacet = KotlinFacet.get(module)
             if (kotlinFacet != null) {
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.173 b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.173
index 27ce9a89b49..4c17f9e9e5c 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.173
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.173
@@ -19,6 +19,7 @@ import com.intellij.openapi.externalSystem.service.project.manage.ContentRootDat
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.DependencyScope
 import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.util.containers.stream
@@ -76,19 +77,27 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             }
             val androidModel = AndroidModuleModel.get(module) ?: continue
             val variantName = androidModel.selectedVariant.name
-            val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
-            val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
-            for (sourceSet in mainCompilation.sourceSets) {
-                if (sourceSet.platform != KotlinPlatform.ANDROID) {
-                    val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
-                    val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
-                        (it.data as? ModuleData)?.id == sourceSetId
-                    }?.data as? ModuleData ?: continue
-                    val sourceSetModule = modelsProvider.findIdeModule(sourceSetData) ?: continue
-                    rootModel.addModuleOrderEntry(sourceSetModule)
+            val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
+            for (activeSourceSetInfo in activeSourceSetInfos) {
+                val activeCompilation = activeSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+                for (sourceSet in activeCompilation.sourceSets) {
+                    if (sourceSet.platform != KotlinPlatform.ANDROID) {
+                        val sourceSetId = activeSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
+                        val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
+                            (it.data as? ModuleData)?.id == sourceSetId
+                        }?.data as? ModuleData ?: continue
+                        val sourceSetModule = modelsProvider.findIdeModule(sourceSetData) ?: continue
+                        val existingEntry = rootModel.findModuleOrderEntry(sourceSetModule)
+                        val dependencyScope = if (activeSourceSetInfo.isTestModule) DependencyScope.TEST else DependencyScope.COMPILE
+                        if (existingEntry != null && existingEntry.scope == dependencyScope) continue
+                        rootModel.addModuleOrderEntry(sourceSetModule).also { it.scope = dependencyScope }
+                    }
                 }
             }
-            KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
+            val mainSourceSetInfo = activeSourceSetInfos.firstOrNull { it.kotlinModule.name == variantName }
+            if (mainSourceSetInfo != null) {
+                KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
+            }
 
             val kotlinFacet = KotlinFacet.get(module)
             if (kotlinFacet != null) {
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.181 b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.181
index a079e127dc9..50a56c27b60 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.181
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.181
@@ -20,6 +20,7 @@ import com.intellij.openapi.externalSystem.service.project.manage.ContentRootDat
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.DependencyScope
 import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.util.containers.stream
@@ -77,19 +78,27 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             }
             val androidModel = AndroidModuleModel.get(module) ?: continue
             val variantName = androidModel.selectedVariant.name
-            val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
-            val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
-            for (sourceSet in mainCompilation.sourceSets) {
-                if (sourceSet.platform != KotlinPlatform.ANDROID) {
-                    val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
-                    val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
-                        (it.data as? ModuleData)?.id == sourceSetId
-                    }?.data as? ModuleData ?: continue
-                    val sourceSetModule = modelsProvider.findIdeModule(sourceSetData) ?: continue
-                    rootModel.addModuleOrderEntry(sourceSetModule)
+            val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
+            for (activeSourceSetInfo in activeSourceSetInfos) {
+                val activeCompilation = activeSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+                for (sourceSet in activeCompilation.sourceSets) {
+                    if (sourceSet.platform != KotlinPlatform.ANDROID) {
+                        val sourceSetId = activeSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
+                        val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
+                            (it.data as? ModuleData)?.id == sourceSetId
+                        }?.data as? ModuleData ?: continue
+                        val sourceSetModule = modelsProvider.findIdeModule(sourceSetData) ?: continue
+                        val existingEntry = rootModel.findModuleOrderEntry(sourceSetModule)
+                        val dependencyScope = if (activeSourceSetInfo.isTestModule) DependencyScope.TEST else DependencyScope.COMPILE
+                        if (existingEntry != null && existingEntry.scope == dependencyScope) continue
+                        rootModel.addModuleOrderEntry(sourceSetModule).also { it.scope = dependencyScope }
+                    }
                 }
             }
-            KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
+            val mainSourceSetInfo = activeSourceSetInfos.firstOrNull { it.kotlinModule.name == variantName }
+            if (mainSourceSetInfo != null) {
+                KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
+            }
 
             val kotlinFacet = KotlinFacet.get(module)
             if (kotlinFacet != null) {
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as31 b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as31
index 016857f15f3..5ca15c74876 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as31
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as31
@@ -22,6 +22,7 @@ import com.intellij.openapi.externalSystem.service.project.manage.ContentRootDat
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.DependencyScope
 import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.util.containers.stream
@@ -90,19 +91,27 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             }
             val androidModel = AndroidModuleModel.get(module) ?: continue
             val variantName = androidModel.selectedVariant.name
-            val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
-            val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
-            for (sourceSet in mainCompilation.sourceSets) {
-                if (sourceSet.platform != KotlinPlatform.ANDROID) {
-                    val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
-                    val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
-                        (it.data as? ModuleData)?.id == sourceSetId
-                    }?.data as? ModuleData ?: continue
-                    val sourceSetModule = modelsProvider.findIdeModule(sourceSetData) ?: continue
-                    rootModel.addModuleOrderEntry(sourceSetModule)
+            val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
+            for (activeSourceSetInfo in activeSourceSetInfos) {
+                val activeCompilation = activeSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+                for (sourceSet in activeCompilation.sourceSets) {
+                    if (sourceSet.platform != KotlinPlatform.ANDROID) {
+                        val sourceSetId = activeSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
+                        val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
+                            (it.data as? ModuleData)?.id == sourceSetId
+                        }?.data as? ModuleData ?: continue
+                        val sourceSetModule = modelsProvider.findIdeModule(sourceSetData) ?: continue
+                        val existingEntry = rootModel.findModuleOrderEntry(sourceSetModule)
+                        val dependencyScope = if (activeSourceSetInfo.isTestModule) DependencyScope.TEST else DependencyScope.COMPILE
+                        if (existingEntry != null && existingEntry.scope == dependencyScope) continue
+                        rootModel.addModuleOrderEntry(sourceSetModule).also { it.scope = dependencyScope }
+                    }
                 }
             }
-            KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
+            val mainSourceSetInfo = activeSourceSetInfos.firstOrNull { it.kotlinModule.name == variantName }
+            if (mainSourceSetInfo != null) {
+                KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
+            }
 
             val kotlinFacet = KotlinFacet.get(module)
             if (kotlinFacet != null) {
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as32 b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as32
index ad4ba982e00..d2d8e2b450b 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as32
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as32
@@ -20,6 +20,7 @@ import com.intellij.openapi.externalSystem.service.project.manage.ContentRootDat
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.DependencyScope
 import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.util.containers.stream
@@ -77,19 +78,27 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             }
             val androidModel = AndroidModuleModel.get(module) ?: continue
             val variantName = androidModel.selectedVariant.name
-            val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
-            val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
-            for (sourceSet in mainCompilation.sourceSets) {
-                if (sourceSet.platform != KotlinPlatform.ANDROID) {
-                    val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
-                    val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
-                        (it.data as? ModuleData)?.id == sourceSetId
-                    }?.data as? ModuleData ?: continue
-                    val sourceSetModule = modelsProvider.findIdeModule(sourceSetData) ?: continue
-                    rootModel.addModuleOrderEntry(sourceSetModule)
+            val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
+            for (activeSourceSetInfo in activeSourceSetInfos) {
+                val activeCompilation = activeSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+                for (sourceSet in activeCompilation.sourceSets) {
+                    if (sourceSet.platform != KotlinPlatform.ANDROID) {
+                        val sourceSetId = activeSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
+                        val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
+                            (it.data as? ModuleData)?.id == sourceSetId
+                        }?.data as? ModuleData ?: continue
+                        val sourceSetModule = modelsProvider.findIdeModule(sourceSetData) ?: continue
+                        val existingEntry = rootModel.findModuleOrderEntry(sourceSetModule)
+                        val dependencyScope = if (activeSourceSetInfo.isTestModule) DependencyScope.TEST else DependencyScope.COMPILE
+                        if (existingEntry != null && existingEntry.scope == dependencyScope) continue
+                        rootModel.addModuleOrderEntry(sourceSetModule).also { it.scope = dependencyScope }
+                    }
                 }
             }
-            KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
+            val mainSourceSetInfo = activeSourceSetInfos.firstOrNull { it.kotlinModule.name == variantName }
+            if (mainSourceSetInfo != null) {
+                KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
+            }
 
             val kotlinFacet = KotlinFacet.get(module)
             if (kotlinFacet != null) {
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt
index 3242a03f721..6f841b4dfde 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt
@@ -365,6 +365,19 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
                     val targetSourceSet = mppModel.sourceSets[targetSourceSetName] ?: continue
                     sourceSetGraph.putEdge(sourceSet, targetSourceSet)
                 }
+                // Workaround: Non-android source sets have commonMain/commonTest in their dependsOn
+                // Remove when the same is implemented for Android modules as well
+                if (sourceSet.platform == KotlinPlatform.ANDROID) {
+                    val commonSourceSetName = if (sourceSet.isTestModule) {
+                        KotlinSourceSet.COMMON_TEST_SOURCE_SET_NAME
+                    } else {
+                        KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME
+                    }
+                    val commonSourceSet = mppModel.sourceSets[commonSourceSetName]
+                    if (commonSourceSet != null && commonSourceSet != sourceSet) {
+                        sourceSetGraph.putEdge(sourceSet, commonSourceSet)
+                    }
+                }
             }
             val closedSourceSetGraph = Graphs.transitiveClosure(sourceSetGraph)
             for (sourceSet in closedSourceSetGraph.nodes()) {
@@ -375,16 +388,18 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
                     getSiblingKotlinModuleData(sourceSet, gradleModule, ideModule, resolverCtx)
                 } ?: continue
                 val dependeeSourceSets = closedSourceSetGraph.successors(sourceSet)
-                val sourceSetInfo = if (isAndroid) {
-                    ideModule.kotlinAndroidSourceSets?.firstOrNull {
+                val sourceSetInfos = if (isAndroid) {
+                    ideModule.kotlinAndroidSourceSets?.filter {
                         (it.kotlinModule as? KotlinCompilation)?.sourceSets?.contains(sourceSet) ?: false
-                    }
+                    } ?: emptyList()
                 } else {
-                    fromDataNode.kotlinSourceSet
+                    listOfNotNull(fromDataNode.kotlinSourceSet)
                 }
-                if (sourceSetInfo != null && sourceSetInfo.kotlinModule is KotlinCompilation) {
-                    val selfName = sourceSetInfo.kotlinModule.fullName()
-                    sourceSetInfo.addSourceSets(dependeeSourceSets, selfName, gradleModule, resolverCtx)
+                for (sourceSetInfo in sourceSetInfos) {
+                    if (sourceSetInfo.kotlinModule is KotlinCompilation) {
+                        val selfName = sourceSetInfo.kotlinModule.fullName()
+                        sourceSetInfo.addSourceSets(dependeeSourceSets, selfName, gradleModule, resolverCtx)
+                    }
                 }
                 if (sourceSet.platform == KotlinPlatform.ANDROID) continue
                 for (dependeeSourceSet in dependeeSourceSets) {