diff --git a/build.gradle.kts b/build.gradle.kts
index 0843e16ca52..adaa3cb49d9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -535,7 +535,7 @@ tasks {
             ":compiler:test",
             ":compiler:container:test",
             ":compiler:tests-java8:test",
-            ":compiler:tests-spec:remoteRunTests",
+            ":compiler:tests-spec:test",
             ":compiler:tests-against-klib:test"
         )
         dependsOn(":plugins:jvm-abi-gen:test")
diff --git a/compiler/tests-spec/build.gradle.kts b/compiler/tests-spec/build.gradle.kts
index 97305a4f71e..0e2880fbbc9 100644
--- a/compiler/tests-spec/build.gradle.kts
+++ b/compiler/tests-spec/build.gradle.kts
@@ -28,24 +28,6 @@ val generateFeatureInteractionSpecTestData by generator("org.jetbrains.kotlin.sp
 
 val printSpecTestsStatistic by generator("org.jetbrains.kotlin.spec.utils.tasks.PrintSpecTestsStatisticKt")
 
-val remoteRunTests by task<Test> {
-    val packagePrefix = "org.jetbrains.kotlin.spec."
-    val includeTests = setOf(
-        "checkers.DiagnosticsTestSpecGenerated\$NotLinked\$Contracts*",
-        "checkers.DiagnosticsTestSpecGenerated\$NotLinked\$Annotations*",
-        "checkers.DiagnosticsTestSpecGenerated\$NotLinked\$Local_variables\$Type_parameters*",
-        "checkers.DiagnosticsTestSpecGenerated\$NotLinked\$Dfa*",
-        "codegen.BlackBoxCodegenTestSpecGenerated\$NotLinked\$Annotations\$Type_annotations*",
-        "codegen.BlackBoxCodegenTestSpecGenerated\$NotLinked\$Objects\$Inheritance*"
-    )
-
-    workingDir = rootDir
-
-    filter {
-        includeTests.forEach { includeTestsMatching(packagePrefix + it) }
-    }
-}
-
 val specConsistencyTests by task<Test> {
     workingDir = rootDir
 
diff --git a/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts b/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
index 6721db3cdd1..70024fbb05b 100644
--- a/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
+++ b/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
@@ -314,7 +314,7 @@ tasks {
         dependsOn(":compiler:test",
                   ":compiler:container:test",
                   ":compiler:tests-java8:test",
-                  ":compiler:tests-spec:remoteRunTests")
+                  ":compiler:tests-spec:test")
         dependsOn(":plugins:jvm-abi-gen:test")
     }