diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLocalVariableTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLocalVariableTestGenerated.java
new file mode 100644
index 00000000000..b7df7a286e1
--- /dev/null
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLocalVariableTestGenerated.java
@@ -0,0 +1,333 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.test.runners.codegen;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.util.KtTestUtil;
+import org.jetbrains.kotlin.test.TargetBackend;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("compiler/testData/debug/localVariables")
+@TestDataPath("$PROJECT_ROOT")
+public class FirLocalVariableTestGenerated extends AbstractFirLocalVariableTest {
+    @Test
+    public void testAllFilesPresentInLocalVariables() throws Exception {
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+    }
+
+    @Test
+    @TestMetadata("catchClause.kt")
+    public void testCatchClause() throws Exception {
+        runTest("compiler/testData/debug/localVariables/catchClause.kt");
+    }
+
+    @Test
+    @TestMetadata("copyFunction.kt")
+    public void testCopyFunction() throws Exception {
+        runTest("compiler/testData/debug/localVariables/copyFunction.kt");
+    }
+
+    @Test
+    @TestMetadata("destructuringInFor.kt")
+    public void testDestructuringInFor() throws Exception {
+        runTest("compiler/testData/debug/localVariables/destructuringInFor.kt");
+    }
+
+    @Test
+    @TestMetadata("destructuringInLambdas.kt")
+    public void testDestructuringInLambdas() throws Exception {
+        runTest("compiler/testData/debug/localVariables/destructuringInLambdas.kt");
+    }
+
+    @Test
+    @TestMetadata("emptyFun.kt")
+    public void testEmptyFun() throws Exception {
+        runTest("compiler/testData/debug/localVariables/emptyFun.kt");
+    }
+
+    @Test
+    @TestMetadata("inlineProperty.kt")
+    public void testInlineProperty() throws Exception {
+        runTest("compiler/testData/debug/localVariables/inlineProperty.kt");
+    }
+
+    @Test
+    @TestMetadata("jvmOverloads.kt")
+    public void testJvmOverloads() throws Exception {
+        runTest("compiler/testData/debug/localVariables/jvmOverloads.kt");
+    }
+
+    @Test
+    @TestMetadata("localFun.kt")
+    public void testLocalFun() throws Exception {
+        runTest("compiler/testData/debug/localVariables/localFun.kt");
+    }
+
+    @Test
+    @TestMetadata("localFunUnused.kt")
+    public void testLocalFunUnused() throws Exception {
+        runTest("compiler/testData/debug/localVariables/localFunUnused.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally.kt")
+    public void testTryFinally() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally10.kt")
+    public void testTryFinally10() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally10.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally11.kt")
+    public void testTryFinally11() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally11.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally12.kt")
+    public void testTryFinally12() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally12.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally13.kt")
+    public void testTryFinally13() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally13.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally14.kt")
+    public void testTryFinally14() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally14.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally15.kt")
+    public void testTryFinally15() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally15.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally16.kt")
+    public void testTryFinally16() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally16.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally17.kt")
+    public void testTryFinally17() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally17.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally2.kt")
+    public void testTryFinally2() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally2.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally3.kt")
+    public void testTryFinally3() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally3.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally4.kt")
+    public void testTryFinally4() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally4.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally5.kt")
+    public void testTryFinally5() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally5.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally6.kt")
+    public void testTryFinally6() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally6.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally7.kt")
+    public void testTryFinally7() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally7.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally8.kt")
+    public void testTryFinally8() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally8.kt");
+    }
+
+    @Test
+    @TestMetadata("tryFinally9.kt")
+    public void testTryFinally9() throws Exception {
+        runTest("compiler/testData/debug/localVariables/tryFinally9.kt");
+    }
+
+    @Test
+    @TestMetadata("underscoreNames.kt")
+    public void testUnderscoreNames() throws Exception {
+        runTest("compiler/testData/debug/localVariables/underscoreNames.kt");
+    }
+
+    @Nested
+    @TestMetadata("compiler/testData/debug/localVariables/receiverMangling")
+    @TestDataPath("$PROJECT_ROOT")
+    public class ReceiverMangling {
+        @Test
+        public void testAllFilesPresentInReceiverMangling() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables/receiverMangling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        }
+
+        @Test
+        @TestMetadata("capturedThisField.kt")
+        public void testCapturedThisField() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt");
+        }
+
+        @Test
+        @TestMetadata("labeledThisParameterLabel.kt")
+        public void testLabeledThisParameterLabel() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/labeledThisParameterLabel.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaWithExtensionReceiver.kt")
+        public void testLambdaWithExtensionReceiver() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/lambdaWithExtensionReceiver.kt");
+        }
+
+        @Test
+        @TestMetadata("receiverParameter.kt")
+        public void testReceiverParameter() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/receiverParameter.kt");
+        }
+
+        @Test
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/simple.kt");
+        }
+
+        @Test
+        @TestMetadata("simpleCapturedReceiver.kt")
+        public void testSimpleCapturedReceiver() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiver.kt");
+        }
+
+        @Test
+        @TestMetadata("simpleCapturedReceiverWithLabel.kt")
+        public void testSimpleCapturedReceiverWithLabel() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithLabel.kt");
+        }
+
+        @Test
+        @TestMetadata("simpleCapturedReceiverWithParenthesis.kt")
+        public void testSimpleCapturedReceiverWithParenthesis() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithParenthesis.kt");
+        }
+    }
+
+    @Nested
+    @TestMetadata("compiler/testData/debug/localVariables/suspend")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Suspend {
+        @Test
+        public void testAllFilesPresentInSuspend() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables/suspend"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        }
+
+        @Test
+        @TestMetadata("inlineLocalsStateMachineTransform.kt")
+        public void testInlineLocalsStateMachineTransform() throws Exception {
+            runTest("compiler/testData/debug/localVariables/suspend/inlineLocalsStateMachineTransform.kt");
+        }
+
+        @Test
+        @TestMetadata("localsStateMachineTransform.kt")
+        public void testLocalsStateMachineTransform() throws Exception {
+            runTest("compiler/testData/debug/localVariables/suspend/localsStateMachineTransform.kt");
+        }
+
+        @Test
+        @TestMetadata("mergeLvt.kt")
+        public void testMergeLvt() throws Exception {
+            runTest("compiler/testData/debug/localVariables/suspend/mergeLvt.kt");
+        }
+
+        @Test
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/debug/localVariables/suspend/simple.kt");
+        }
+
+        @Test
+        @TestMetadata("underscoreNames.kt")
+        public void testUnderscoreNames() throws Exception {
+            runTest("compiler/testData/debug/localVariables/suspend/underscoreNames.kt");
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/debug/localVariables/suspend/completion")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Completion {
+            @Test
+            public void testAllFilesPresentInCompletion() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables/suspend/completion"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @Test
+            @TestMetadata("nonStaticSimple.kt")
+            public void testNonStaticSimple() throws Exception {
+                runTest("compiler/testData/debug/localVariables/suspend/completion/nonStaticSimple.kt");
+            }
+
+            @Test
+            @TestMetadata("nonStaticStateMachine.kt")
+            public void testNonStaticStateMachine() throws Exception {
+                runTest("compiler/testData/debug/localVariables/suspend/completion/nonStaticStateMachine.kt");
+            }
+
+            @Test
+            @TestMetadata("staticSimple.kt")
+            public void testStaticSimple() throws Exception {
+                runTest("compiler/testData/debug/localVariables/suspend/completion/staticSimple.kt");
+            }
+
+            @Test
+            @TestMetadata("staticSimpleReceiver.kt")
+            public void testStaticSimpleReceiver() throws Exception {
+                runTest("compiler/testData/debug/localVariables/suspend/completion/staticSimpleReceiver.kt");
+            }
+
+            @Test
+            @TestMetadata("staticStateMachine.kt")
+            public void testStaticStateMachine() throws Exception {
+                runTest("compiler/testData/debug/localVariables/suspend/completion/staticStateMachine.kt");
+            }
+
+            @Test
+            @TestMetadata("staticStateMachineReceiver.kt")
+            public void testStaticStateMachineReceiver() throws Exception {
+                runTest("compiler/testData/debug/localVariables/suspend/completion/staticStateMachineReceiver.kt");
+            }
+        }
+    }
+}
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractLocalVariableTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractLocalVariableTest.kt
index 8162835f3ca..cd19f9b22ca 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractLocalVariableTest.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractLocalVariableTest.kt
@@ -16,6 +16,9 @@ import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackend
 import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter
 import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
 import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact
+import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter
+import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade
+import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact
 import org.jetbrains.kotlin.test.model.*
 
 open class AbstractIrLocalVariableTest : AbstractLocalVariableTestBase<ClassicFrontendOutputArtifact, IrBackendInput>(
@@ -56,3 +59,22 @@ open class AbstractLocalVariableTest : AbstractLocalVariableTestBase<ClassicFron
         builder.configureDumpHandlersForCodegenTest()
     }
 }
+
+open class AbstractFirLocalVariableTest : AbstractLocalVariableTestBase<FirOutputArtifact, IrBackendInput>(
+    FrontendKinds.FIR,
+    TargetBackend.JVM_IR
+) {
+    override val frontendFacade: Constructor<FrontendFacade<FirOutputArtifact>>
+        get() = ::FirFrontendFacade
+
+    override val frontendToBackendConverter: Constructor<Frontend2BackendConverter<FirOutputArtifact, IrBackendInput>>
+        get() = ::Fir2IrResultsConverter
+
+    override val backendFacade: Constructor<BackendFacade<IrBackendInput, BinaryArtifacts.Jvm>>
+        get() = ::JvmIrBackendFacade
+
+    override fun configure(builder: TestConfigurationBuilder) {
+        super.configure(builder)
+        builder.configureDumpHandlersForCodegenTest()
+    }
+}
diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
index 431e91a82f6..627dc694f48 100644
--- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
@@ -226,6 +226,10 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
             testClass<AbstractFirSteppingTest> {
                 model("debug/stepping")
             }
+
+            testClass<AbstractFirLocalVariableTest> {
+                model("debug/localVariables")
+            }
         }
 
         testGroup(testsRoot = "compiler/fir/fir2ir/tests-gen", testDataRoot = "compiler/fir/fir2ir/testData") {