diff --git a/compiler/fir/modularized-tests/build.gradle.kts b/compiler/fir/modularized-tests/build.gradle.kts
new file mode 100644
index 00000000000..a0fc2e5cf74
--- /dev/null
+++ b/compiler/fir/modularized-tests/build.gradle.kts
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) }
+    testRuntime(intellijDep())
+
+    testCompile(commonDep("junit:junit"))
+    testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
+    testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
+    testCompile(projectTests(":compiler:tests-common"))
+
+    testCompileOnly(project(":kotlin-reflect-api"))
+    testRuntime(project(":kotlin-reflect"))
+    testCompile(projectTests(":compiler:fir:resolve"))
+    testCompile(project(":compiler:fir:resolve"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { projectDefault() }
+}
+
+projectTest {
+    workingDir = rootDir
+    jvmArgs!!.removeIf { it.contains("-Xmx") }
+    maxHeapSize = "3g"
+}
+
+testsJar()
\ No newline at end of file
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
similarity index 100%
rename from compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
rename to compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt
similarity index 100%
rename from compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt
rename to compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt
diff --git a/settings.gradle b/settings.gradle
index 5c49c744bb8..8414c16dd69 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -35,6 +35,7 @@ include ":kotlin-build-common",
         ":compiler:fir:fir2ir",
         ":compiler:fir:resolve",
         ":compiler:fir:java",
+        ":compiler:fir:modularized-tests",
         ":compiler:frontend",
         ":compiler:frontend.common",
         ":compiler:frontend.java",