diff --git a/build.gradle.kts b/build.gradle.kts
index b291eee91fa..5921e26b299 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -546,7 +546,18 @@ tasks {
         dependsOn(":compiler:fir:fir2ir:test")
         dependsOn(":compiler:fir:lightTree:test")
     }
-    
+
+    register("firAllTest") {
+        dependsOn(
+            ":compiler:fir:psi2fir:test",
+            ":compiler:fir:lightTree:test",
+            ":compiler:fir:resolve:test",
+            ":compiler:fir:fir2ir:test",
+            ":compiler:firBlackBox:test",
+            ":idea:firTest"
+        )
+    }
+
     register("compilerFrontendVisualizerTest") {
         dependsOn("compiler:visualizer:test")
     }
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 3ca128f2cf8..4ef2ea5e2e2 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -118,3 +118,11 @@ projectTest(parallel = true) {
 val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateCompilerTestsKt")
 
 testsJar()
+
+projectTest("firBlackBoxTest", parallel = true) {
+    dependsOn(":dist")
+    workingDir = rootDir
+    filter {
+        includeTestsMatching("org.jetbrains.kotlin.codegen.ir.FirBlackBoxCodegenTestGenerated")
+    }
+}
\ No newline at end of file
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 22846191771..bc84895afe5 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -183,6 +183,15 @@ projectTest(parallel = true) {
     workingDir = rootDir
 }
 
+projectTest("firTest", parallel = true) {
+    dependsOn(":dist")
+    workingDir = rootDir
+    filter {
+        includeTestsMatching("org.jetbrains.kotlin.idea.fir.*")
+        includeTestsMatching("org.jetbrains.kotlin.idea.resolve.FirReferenceResolveTestGenerated")
+    }
+}
+
 configureFormInstrumentation()
 
 testsJar()
\ No newline at end of file