diff --git a/build.gradle.kts b/build.gradle.kts
index 6dec62c9d6b..3968d264795 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -729,8 +729,6 @@ tasks {
     register("idea-plugin-additional-tests") {
         dependsOn("dist")
         dependsOn(
-            ":idea:idea-gradle:test",
-            ":idea:idea-gradle-native:test",
             ":idea:idea-maven:test",
             ":j2k:test",
             ":nj2k:test",
@@ -797,15 +795,33 @@ tasks {
 
 
     register("ideaPluginTest") {
+        dependsOn(
+            "gradleIdeTest",
+            "androidIdeTest",
+            "miscIdeTests"
+        )
+    }
+
+    register("miscIdeTests") {
         dependsOn(
             "idea-plugin-tests",
             "jps-tests",
             "plugins-tests",
-            "android-ide-tests",
             ":generators:test"
         )
     }
 
+    register("androidIdeTest") {
+        dependsOn("android-ide-tests")
+    }
+
+    register("gradleIdeTest") {
+        dependsOn(
+            ":idea:idea-gradle:test",
+            ":idea:idea-gradle-native:test"
+        )
+    }
+
     register("publishIdeArtifacts") {
         idePluginDependency {
             dependsOn(