diff --git a/java/java-runtime/resources/intellij.java.rt.xml b/java/java-runtime/resources/intellij.java.rt.xml
index f88619559144..2d42e19b4950 100644
--- a/java/java-runtime/resources/intellij.java.rt.xml
+++ b/java/java-runtime/resources/intellij.java.rt.xml
@@ -1,2 +1,4 @@
+<!-- @skip-dependency-generation -->
+<!-- not clear - junit4 is a provided dependency -->
 <idea-plugin visibility="public">
 </idea-plugin>
\ No newline at end of file
diff --git a/platform/find/resources/intellij.platform.find.xml b/platform/find/resources/intellij.platform.find.xml
index d783a860770f..28746fbec195 100644
--- a/platform/find/resources/intellij.platform.find.xml
+++ b/platform/find/resources/intellij.platform.find.xml
@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin visibility="internal">
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.libraries.kotlinx.serialization.core"/>
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/resources/intellij.platform.jewel.intUi.standalone.xml b/platform/jewel/int-ui/int-ui-standalone/src/main/resources/intellij.platform.jewel.intUi.standalone.xml
index a5882482d818..038db731b91b 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/resources/intellij.platform.jewel.intUi.standalone.xml
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/resources/intellij.platform.jewel.intUi.standalone.xml
@@ -1,6 +1,6 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <module name="intellij.platform.jewel.ui" />
-    <module name="intellij.platform.jewel.foundation" />
+    <module name="intellij.platform.jewel.ui"/>
+    <module name="intellij.platform.jewel.foundation"/>
   </dependencies>
 </idea-plugin>
diff --git a/platform/kernel/intellij.platform.kernel.impl/resources/intellij.platform.kernel.impl.xml b/platform/kernel/intellij.platform.kernel.impl/resources/intellij.platform.kernel.impl.xml
index b75eea3a4a28..75198ae6baef 100644
--- a/platform/kernel/intellij.platform.kernel.impl/resources/intellij.platform.kernel.impl.xml
+++ b/platform/kernel/intellij.platform.kernel.impl/resources/intellij.platform.kernel.impl.xml
@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin visibility="internal">
   <extensions defaultExtensionNs="com.intellij">
     <applicationInitializedListener implementation="com.intellij.platform.kernel.impl.KernelApplicationInitializedListener"/>
   </extensions>
diff --git a/platform/managed-cache/managed.cache/resources/intellij.platform.managed.cache.xml b/platform/managed-cache/managed.cache/resources/intellij.platform.managed.cache.xml
index 32973ca136e0..ad38f1e06883 100644
--- a/platform/managed-cache/managed.cache/resources/intellij.platform.managed.cache.xml
+++ b/platform/managed-cache/managed.cache/resources/intellij.platform.managed.cache.xml
@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin visibility="internal">
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.libraries.kotlinx.coroutines.core"/>
diff --git a/platform/platform-api/resources/intellij.platform.ide.xml b/platform/platform-api/resources/intellij.platform.ide.xml
index 4ac1292dcfce..4b592bcc0e19 100644
--- a/platform/platform-api/resources/intellij.platform.ide.xml
+++ b/platform/platform-api/resources/intellij.platform.ide.xml
@@ -1,4 +1,4 @@
-<idea-plugin visibility="internal">
+<idea-plugin visibility="public">
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.libraries.caffeine"/>
diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.testFrameworks.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.testFrameworks.xml
deleted file mode 100644
index 5608ba86c817..000000000000
--- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.testFrameworks.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
-<!-- Source: see moduleSet("libraries.testFrameworks") function in CommunityModuleSets.kt -->
-<!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
-<idea-plugin>
-  <content namespace="jetbrains">
-    <module name="intellij.libraries.assertj.core"/>
-    <module name="intellij.libraries.hamcrest"/>
-    <module name="intellij.libraries.junit4"/>
-    <module name="intellij.libraries.kotlinTest"/>
-    <module name="intellij.libraries.junit5"/>
-    <module name="intellij.libraries.junit5.jupiter"/>
-    <module name="intellij.libraries.junit5.launcher"/>
-    <module name="intellij.libraries.junit5.vintage"/>
-  </content>
-</idea-plugin>
\ No newline at end of file
diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.platform.testFrameworks.core.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.platform.testFrameworks.core.xml
new file mode 100644
index 000000000000..777bb954e878
--- /dev/null
+++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.platform.testFrameworks.core.xml
@@ -0,0 +1,13 @@
+<!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
+<!-- Source: see moduleSet("platform.testFrameworks.core") function in CommunityModuleSets.kt -->
+<!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
+<idea-plugin>
+  <content namespace="jetbrains">
+    <module name="intellij.platform.testFramework"/>
+    <module name="intellij.platform.testFramework.common"/>
+    <module name="intellij.platform.testFramework.core"/>
+    <module name="intellij.platform.testFramework.impl"/>
+    <module name="intellij.platform.testFramework.teamCity"/>
+  </content>
+</idea-plugin>
\ No newline at end of file
diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.platform.testFrameworks.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.platform.testFrameworks.junit5.xml
similarity index 55%
rename from platform/platform-resources/generated/META-INF/intellij.moduleSets.platform.testFrameworks.xml
rename to platform/platform-resources/generated/META-INF/intellij.moduleSets.platform.testFrameworks.junit5.xml
index 9822b47d5d33..4b3350ccadad 100644
--- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.platform.testFrameworks.xml
+++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.platform.testFrameworks.junit5.xml
@@ -1,15 +1,14 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
 <!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
-<!-- Source: see moduleSet("platform.testFrameworks") function in CommunityModuleSets.kt -->
+<!-- Source: see moduleSet("platform.testFrameworks.junit5") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
   <content namespace="jetbrains">
-    <module name="intellij.java.testFramework"/>
-    <module name="intellij.java.testFramework.backend"/>
-    <module name="intellij.java.testFramework.shared"/>
     <module name="intellij.platform.testFramework.junit5"/>
+    <module name="intellij.platform.testFramework.junit5.projectStructure"/>
     <module name="intellij.platform.testFramework.junit5.codeInsight"/>
-    <module name="intellij.tools.ide.starter"/>
-    <module name="intellij.tools.ide.util.common"/>
+    <module name="intellij.platform.testFramework.junit5._test"/>
+    <module name="intellij.platform.testFramework.junit5.eel._test"/>
+    <module name="intellij.platform.testFramework.junit5.wsl._test"/>
   </content>
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/grazie/src/main/resources/intellij.grazie.core.xml b/plugins/grazie/src/main/resources/intellij.grazie.core.xml
index f1ef2bd116da..51e80c9033eb 100644
--- a/plugins/grazie/src/main/resources/intellij.grazie.core.xml
+++ b/plugins/grazie/src/main/resources/intellij.grazie.core.xml
@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin visibility="internal">
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.libraries.ai.grazie.spell.gec.engine.local"/>