diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt
index 970fcb890a2..75f5bacb284 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt
@@ -77,6 +77,18 @@ class KotlinMultiplatformPlugin : Plugin<Project> {
 
         project.plugins.apply(JavaBasePlugin::class.java)
 
+        if (project.hasKpmModel) {
+            setupFragmentsMetadataForKpmModules(project)
+            setupKpmModulesPublication(project)
+            registerDefaultVariantFactories(project)
+            with(project.kpmModules) {
+                create(KotlinGradleModule.MAIN_MODULE_NAME) {
+                    it.makePublic()
+                }
+                create(KotlinGradleModule.TEST_MODULE_NAME)
+            }
+        }
+
         val targetsContainer = project.container(KotlinTarget::class.java)
         val kotlinMultiplatformExtension = project.extensions.getByType(KotlinMultiplatformExtension::class.java)
         val targetsFromPreset = TargetFromPresetExtension(kotlinMultiplatformExtension)
@@ -134,13 +146,6 @@ class KotlinMultiplatformPlugin : Plugin<Project> {
                 }
             }
         }
-
-        if (project.hasKpmModel) {
-            setupFragmentsMetadataForKpmModules(project)
-            setupKpmModulesPublication(project)
-            registerDefaultVariantFactories(project)
-            project.kpmModules.matching { it.name == KotlinGradleModule.MAIN_MODULE_NAME }.all { it.makePublic() }
-        }
     }
 
     private fun exportProjectStructureMetadataForOtherBuilds(