diff --git a/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___dependency_resolution_tests.xml b/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___dependency_resolution_tests.xml
index 0df55c44baa..6dffbe05180 100644
--- a/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___dependency_resolution_tests.xml
+++ b/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___dependency_resolution_tests.xml
@@ -10,9 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":kotlin-gradle-plugin:functionalTest" />
-          <option value="--tests" />
-          <option value="&quot;org.jetbrains.kotlin.gradle.ide.*&quot;" />
+          <option value=":kotlin-gradle-plugin:functionalIdeTest" />
         </list>
       </option>
       <option name="vmOptions" />
diff --git a/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___regression.xml b/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___regression.xml
index 1c1a1ff9a15..0d958d14438 100644
--- a/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___regression.xml
+++ b/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___regression.xml
@@ -10,9 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":kotlin-gradle-plugin:functionalTest" />
-          <option value="--tests" />
-          <option value="&quot;org.jetbrains.kotlin.gradle.regression.*&quot;" />
+          <option value=":kotlin-gradle-plugin:functionalRegressionTest" />
         </list>
       </option>
       <option name="vmOptions" />
diff --git a/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___unit.xml b/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___unit.xml
index 00a09244fa6..0067896ddc8 100644
--- a/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___unit.xml
+++ b/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___unit.xml
@@ -10,9 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":kotlin-gradle-plugin:functionalTest" />
-          <option value="--tests" />
-          <option value="&quot;org.jetbrains.kotlin.gradle.unit.*&quot;" />
+          <option value=":kotlin-gradle-plugin:functionalUnitTest" />
         </list>
       </option>
       <option name="vmOptions" />
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
index d9927f8a03d..5060d863c53 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
@@ -251,6 +251,24 @@ if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
                     extendsFrom(configurations.getByName(testSourceSet.runtimeOnlyConfigurationName))
                 }
 
+                targets.create("functionalRegressionTest") {
+                    testTask.configure {
+                        include("**/org/jetbrains/kotlin/gradle/regression/**")
+                    }
+                }
+
+                targets.create("functionalIdeTest") {
+                    testTask.configure {
+                        include("**/org/jetbrains/kotlin/gradle/ide/**")
+                    }
+                }
+
+                targets.create("functionalUnitTest") {
+                    testTask.configure {
+                        include("**/org/jetbrains/kotlin/gradle/unit/**")
+                    }
+                }
+
                 targets.all {
                     testTask.configure {
                         dependsOnKotlinGradlePluginInstall()