diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 2ea61ed8142..9d9f8c7edea 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -18968,8 +18968,7 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
 
                 @TestMetadata("smartCastOfNullableExpressionWithExpectedType.kt")
                 public void testSmartCastOfNullableExpressionWithExpectedType() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/castchecks/smartCastOfNullableExpressionWithExpectedType.kt");
-                    doTest(fileName);
+                    runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/smartCastOfNullableExpressionWithExpectedType.kt");
                 }
 
                 @TestMetadata("variables.kt")
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
index a5e2ebef6fe..cd682a42a66 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
@@ -18968,8 +18968,7 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
 
                 @TestMetadata("smartCastOfNullableExpressionWithExpectedType.kt")
                 public void testSmartCastOfNullableExpressionWithExpectedType() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/castchecks/smartCastOfNullableExpressionWithExpectedType.kt");
-                    doTest(fileName);
+                    runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/smartCastOfNullableExpressionWithExpectedType.kt");
                 }
 
                 @TestMetadata("variables.kt")
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/DumpDeclarationsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/DumpDeclarationsTestGenerated.java
index a8b6afcde7e..45b9958b29d 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/DumpDeclarationsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/DumpDeclarationsTestGenerated.java
@@ -51,8 +51,7 @@ public class DumpDeclarationsTestGenerated extends AbstractDumpDeclarationsTest
 
     @TestMetadata("intermediateAbstractSuspendFunction.kt")
     public void testIntermediateAbstractSuspendFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.kt");
-        doTest(fileName);
+        runTest("compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.kt");
     }
 
     @TestMetadata("localClasses.kt")
diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
index 12586e4dd04..4e3a798ab1d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
@@ -2166,38 +2166,37 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class MainFunctionReturnUnit extends AbstractLocalInspectionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInMainFunctionReturnUnit() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/mainFunctionReturnUnit"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("notMain.kt")
         public void testNotMain() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/mainFunctionReturnUnit/notMain.kt");
-            doTest(fileName);
+            runTest("idea/testData/inspectionsLocal/mainFunctionReturnUnit/notMain.kt");
         }
 
         @TestMetadata("notUnit1.kt")
         public void testNotUnit1() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/mainFunctionReturnUnit/notUnit1.kt");
-            doTest(fileName);
+            runTest("idea/testData/inspectionsLocal/mainFunctionReturnUnit/notUnit1.kt");
         }
 
         @TestMetadata("notUnit2.kt")
         public void testNotUnit2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/mainFunctionReturnUnit/notUnit2.kt");
-            doTest(fileName);
+            runTest("idea/testData/inspectionsLocal/mainFunctionReturnUnit/notUnit2.kt");
         }
 
         @TestMetadata("notUnit3.kt")
         public void testNotUnit3() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/mainFunctionReturnUnit/notUnit3.kt");
-            doTest(fileName);
+            runTest("idea/testData/inspectionsLocal/mainFunctionReturnUnit/notUnit3.kt");
         }
 
         @TestMetadata("unit.kt")
         public void testUnit() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/mainFunctionReturnUnit/unit.kt");
-            doTest(fileName);
+            runTest("idea/testData/inspectionsLocal/mainFunctionReturnUnit/unit.kt");
         }
     }
 
@@ -3667,20 +3666,17 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
 
         @TestMetadata("putLambdaHasLabeledReturn.kt")
         public void testPutLambdaHasLabeledReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/replacePutWithAssignment/putLambdaHasLabeledReturn.kt");
-            doTest(fileName);
+            runTest("idea/testData/inspectionsLocal/replacePutWithAssignment/putLambdaHasLabeledReturn.kt");
         }
 
         @TestMetadata("putLambdaHasLabeledReturn2.kt")
         public void testPutLambdaHasLabeledReturn2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/replacePutWithAssignment/putLambdaHasLabeledReturn2.kt");
-            doTest(fileName);
+            runTest("idea/testData/inspectionsLocal/replacePutWithAssignment/putLambdaHasLabeledReturn2.kt");
         }
 
         @TestMetadata("putLambdaHasLabeledReturn3.kt")
         public void testPutLambdaHasLabeledReturn3() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/replacePutWithAssignment/putLambdaHasLabeledReturn3.kt");
-            doTest(fileName);
+            runTest("idea/testData/inspectionsLocal/replacePutWithAssignment/putLambdaHasLabeledReturn3.kt");
         }
 
         @TestMetadata("putOnParameter.kt")
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index c91f3f69b43..a389112034b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -8765,20 +8765,17 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
 
         @TestMetadata("notBlock.kt")
         public void testNotBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/notBlock.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/invertIfCondition/notBlock.kt");
         }
 
         @TestMetadata("notBlock2.kt")
         public void testNotBlock2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/notBlock2.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/invertIfCondition/notBlock2.kt");
         }
 
         @TestMetadata("notBlock3.kt")
         public void testNotBlock3() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/notBlock3.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/invertIfCondition/notBlock3.kt");
         }
 
         @TestMetadata("notIn.kt")
@@ -9110,38 +9107,37 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JoinArgumentList extends AbstractIntentionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInJoinArgumentList() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/joinArgumentList"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("hasLineBreakBeforeFirstArg.kt")
         public void testHasLineBreakBeforeFirstArg() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinArgumentList/hasLineBreakBeforeFirstArg.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/joinArgumentList/hasLineBreakBeforeFirstArg.kt");
         }
 
         @TestMetadata("hasLineBreaks.kt")
         public void testHasLineBreaks() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinArgumentList/hasLineBreaks.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/joinArgumentList/hasLineBreaks.kt");
         }
 
         @TestMetadata("noArg.kt")
         public void testNoArg() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinArgumentList/noArg.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/joinArgumentList/noArg.kt");
         }
 
         @TestMetadata("noLineBreak.kt")
         public void testNoLineBreak() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinArgumentList/noLineBreak.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/joinArgumentList/noLineBreak.kt");
         }
 
         @TestMetadata("oneArg.kt")
         public void testOneArg() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinArgumentList/oneArg.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/joinArgumentList/oneArg.kt");
         }
     }
 
@@ -9282,38 +9278,37 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JoinParameterList extends AbstractIntentionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInJoinParameterList() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/joinParameterList"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("hasLineBreakBeforeFirstParam.kt")
         public void testHasLineBreakBeforeFirstParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinParameterList/hasLineBreakBeforeFirstParam.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/joinParameterList/hasLineBreakBeforeFirstParam.kt");
         }
 
         @TestMetadata("hasLineBreaks.kt")
         public void testHasLineBreaks() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinParameterList/hasLineBreaks.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/joinParameterList/hasLineBreaks.kt");
         }
 
         @TestMetadata("noLineBreak.kt")
         public void testNoLineBreak() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinParameterList/noLineBreak.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/joinParameterList/noLineBreak.kt");
         }
 
         @TestMetadata("noParam.kt")
         public void testNoParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinParameterList/noParam.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/joinParameterList/noParam.kt");
         }
 
         @TestMetadata("oneParam.kt")
         public void testOneParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinParameterList/oneParam.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/joinParameterList/oneParam.kt");
         }
     }
 
@@ -10767,20 +10762,22 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class MoveDeclarationToSeparateFile extends AbstractIntentionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInMoveDeclarationToSeparateFile() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveDeclarationToSeparateFile"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("extendSealed.kt")
         public void testExtendSealed() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveDeclarationToSeparateFile/extendSealed.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/moveDeclarationToSeparateFile/extendSealed.kt");
         }
 
         @TestMetadata("sealed.kt")
         public void testSealed() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveDeclarationToSeparateFile/sealed.kt");
-            doTest(fileName);
+            runTest("idea/testData/intentions/moveDeclarationToSeparateFile/sealed.kt");
         }
     }