diff --git a/community-resources/src/META-INF/IdeaPlugin.xml b/community-resources/src/META-INF/IdeaPlugin.xml
index c653cef81a37..260b5f3a88df 100644
--- a/community-resources/src/META-INF/IdeaPlugin.xml
+++ b/community-resources/src/META-INF/IdeaPlugin.xml
@@ -19,6 +19,5 @@
   <module value="com.intellij.modules.idea"/>
   <module value="com.intellij.modules.idea.community"/>
   <module value="com.intellij.modules.java-capable"/>
-  <module value="com.intellij.modules.android-capable"/>
   <module value="com.intellij.modules.python-core-capable"/>
 </idea-plugin>
diff --git a/platform/platform-tests/testData/plugins/sort/ultimatePlugins.xml b/platform/platform-tests/testData/plugins/sort/ultimatePlugins.xml
index 5e0c94e6d28d..0ba22ab787a6 100644
--- a/platform/platform-tests/testData/plugins/sort/ultimatePlugins.xml
+++ b/platform/platform-tests/testData/plugins/sort/ultimatePlugins.xml
@@ -104,7 +104,7 @@
     <id>-com-android-tools-idea-smali-</id>
     <name>Smali Support</name>
     <depends>com.intellij.modules.lang</depends>
-    <depends>com.intellij.modules.android-capable</depends>
+    <depends>com.intellij.modules.java-capable</depends>
   </idea-plugin>
   <idea-plugin url="file://out/intellij.java.guiForms.designer/META-INF/plugin.xml">
     <id>-com-intellij-uiDesigner-</id>
@@ -264,7 +264,6 @@
     <module value="com.intellij.modules.idea"/>
     <module value="com.intellij.modules.idea.ultimate"/>
     <module value="com.intellij.modules.java-capable"/>
-    <module value="com.intellij.modules.android-capable"/>
     <module value="com.intellij.modules.php-capable"/>
     <module value="com.intellij.modules.ruby-capable"/>
     <module value="com.intellij.modules.c-capable"/>
@@ -1183,7 +1182,7 @@
   <idea-plugin url="file://out/intellij.android.plugin/META-INF/plugin.xml">
     <id>-org-jetbrains-android-</id>
     <name>Android Support</name>
-    <depends>com.intellij.modules.android-capable</depends>
+    <depends>com.intellij.modules.java-capable</depends>
     <depends>com.intellij.modules.java</depends>
     <depends>-org-intellij-intelliLang-</depends>
     <depends>-JUnit-</depends>