diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractFullPipelineModularizedTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractFullPipelineModularizedTest.kt
index eb5c5d38ec5..5b96d07d19e 100644
--- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractFullPipelineModularizedTest.kt
+++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractFullPipelineModularizedTest.kt
@@ -131,6 +131,8 @@ abstract class AbstractFullPipelineModularizedTest : AbstractModularizedTest() {
         args.reportPerf = true
         args.jvmTarget = JVM_TARGET
         args.allowKotlinPackage = true
+        args.jdkHome = moduleData.jdkHome?.absolutePath
+        args.renderInternalDiagnosticNames = true
         configureArgsUsingBuildFile(args, moduleData, tmp)
     }
 
@@ -153,7 +155,6 @@ abstract class AbstractFullPipelineModularizedTest : AbstractModularizedTest() {
         val modulesFile = tmp.toFile().resolve("modules.xml")
         modulesFile.writeText(builder.asText().toString())
         args.buildFile = modulesFile.absolutePath
-        args.jdkHome = moduleData.jdkHome?.absolutePath
     }
 
     abstract fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData)
diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt
index 819b46ff23c..bf27aad4549 100644
--- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt
+++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
 class FE1FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
     override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) {
         args.useK2 = false
+        args.useIR = true
         args.jvmDefault = "compatibility"
         args.apiVersion = API_VERSION
         args.optIn = arrayOf(
@@ -19,7 +20,6 @@ class FE1FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
             "org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
         )
         args.multiPlatform = true
-        args.renderInternalDiagnosticNames = true
         args.noStdlib = true
         args.noReflect = true
     }
diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt
index 3bd2548e3c9..71737029bca 100644
--- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt
+++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt
@@ -28,7 +28,6 @@ class FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
             "kotlin.io.path.ExperimentalPathApi",
             "org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
         )
-        args.renderInternalDiagnosticNames = true
         args.noStdlib = true
         args.noReflect = true
     }