diff --git a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
index 717532261557..cf9eb32b89f5 100644
--- a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
@@ -112,6 +112,13 @@ abstract class BaseIdeaProperties extends ProductProperties {
 
     productLayout.platformLayoutCustomizer = { PlatformLayout layout ->
       layout.customize {
+        for (String name : JAVA_IDE_API_MODULES) {
+          withModule(name)
+        }
+        for (String name : JAVA_IDE_IMPLEMENTATION_MODULES) {
+          withModule(name)
+        }
+
         //todo currently intellij.platform.testFramework included into idea.jar depends on this jar so it cannot be moved to java plugin
         withModule("intellij.java.rt", "idea_rt.jar", null)
 
diff --git a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
index 4ffa9f047c3a..15111be4c92a 100644
--- a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
@@ -36,12 +36,6 @@ class IdeaCommunityProperties extends BaseIdeaProperties {
     productLayout.platformLayoutCustomizer = { PlatformLayout layout ->
       commonCustomizer.accept(layout)
       layout.customize {
-        for (String name : JAVA_IDE_API_MODULES) {
-          withModule(name)
-        }
-        for (String name : JAVA_IDE_IMPLEMENTATION_MODULES) {
-          withModule(name)
-        }
         withModule("intellij.platform.duplicates.analysis")
         withModule("intellij.platform.structuralSearch")
       }