diff --git a/compiler/testData/checkLocalVariablesTable/inlineProperty.kt b/compiler/testData/checkLocalVariablesTable/inlineProperty.kt
deleted file mode 100644
index de3716cba82..00000000000
--- a/compiler/testData/checkLocalVariablesTable/inlineProperty.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-class A {
-    inline val s: Int
-        get() = 1
-}
-
-// METHOD : A.getS()I
-// VARIABLE : NAME=this TYPE=LA; INDEX=0
-// VARIABLE : NAME=$i$f$getS TYPE=I INDEX=1
diff --git a/compiler/testData/checkLocalVariablesTable/jvmOverloads.kt b/compiler/testData/checkLocalVariablesTable/jvmOverloads.kt
deleted file mode 100644
index f4393056636..00000000000
--- a/compiler/testData/checkLocalVariablesTable/jvmOverloads.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// WITH_RUNTIME
-class C {
-    @kotlin.jvm.JvmOverloads fun foo(firstParam: Int, secondParam: String = "") {
-    }
-}
-
-// METHOD : C.foo(I)V
-// VARIABLE : NAME=this TYPE=LC; INDEX=0
-// VARIABLE : NAME=firstParam TYPE=I INDEX=1
diff --git a/compiler/testData/checkLocalVariablesTable/receiverParameter.kt b/compiler/testData/checkLocalVariablesTable/receiverParameter.kt
deleted file mode 100644
index bdce356a13f..00000000000
--- a/compiler/testData/checkLocalVariablesTable/receiverParameter.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-class A() {
-    fun String.test() {
-
-    }
-}
-
-
-// METHOD : A.test(Ljava/lang/String;)V
-// VARIABLE : NAME=this TYPE=LA; INDEX=0
-// VARIABLE : NAME=$this$test TYPE=Ljava/lang/String; INDEX=1
diff --git a/compiler/testData/debug/localVariables/inlineProperty.kt b/compiler/testData/debug/localVariables/inlineProperty.kt
new file mode 100644
index 00000000000..bfe59934a1f
--- /dev/null
+++ b/compiler/testData/debug/localVariables/inlineProperty.kt
@@ -0,0 +1,21 @@
+// FILE: test.kt
+class A {
+    inline val s: Int
+        get() = 1
+}
+
+fun box() {
+    val a = A()
+    var y = a.s
+    y++
+}
+
+// LOCAL VARIABLES
+// TestKt:8:
+// A:2:
+// TestKt:8:
+// TestKt:9: a:A=A
+// TestKt:4: a:A=A, this_$iv:A=A, $i$f$getS:int=0:int
+// TestKt:9: a:A=A
+// TestKt:10: a:A=A, y:int=1:int
+// TestKt:11: a:A=A, y:int=2:int
\ No newline at end of file
diff --git a/compiler/testData/debug/localVariables/jvmOverloads.kt b/compiler/testData/debug/localVariables/jvmOverloads.kt
new file mode 100644
index 00000000000..66ebeaabc6e
--- /dev/null
+++ b/compiler/testData/debug/localVariables/jvmOverloads.kt
@@ -0,0 +1,19 @@
+// FILE: test.kt
+// WITH_RUNTIME
+class C {
+    @kotlin.jvm.JvmOverloads fun foo(firstParam: Int, secondParam: String = "") {
+    }
+}
+
+fun box() {
+    C().foo(4)
+}
+
+// LOCAL VARIABLES
+// TestKt:9:
+// C:3:
+// TestKt:9:
+// C:4:
+// C:5: firstParam:int=4:int, secondParam:java.lang.String="":java.lang.String
+// C:4:
+// TestKt:10:
\ No newline at end of file
diff --git a/compiler/testData/debug/localVariables/receiverParameter.kt b/compiler/testData/debug/localVariables/receiverParameter.kt
new file mode 100644
index 00000000000..5f7ffae8567
--- /dev/null
+++ b/compiler/testData/debug/localVariables/receiverParameter.kt
@@ -0,0 +1,13 @@
+// FILE: test.kt
+fun String.test() {
+
+}
+
+fun box() {
+    "OK".test()
+}
+
+// LOCAL VARIABLES
+// TestKt:7:
+// TestKt:4: $this$test:java.lang.String="OK":java.lang.String
+// TestKt:8:
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java
index 397fab7b8b7..eb4e6c9fd13 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java
@@ -59,11 +59,6 @@ public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVar
         runTest("compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt");
     }
 
-    @TestMetadata("inlineProperty.kt")
-    public void testInlineProperty() throws Exception {
-        runTest("compiler/testData/checkLocalVariablesTable/inlineProperty.kt");
-    }
-
     @TestMetadata("inlineSimple.kt")
     public void testInlineSimple() throws Exception {
         runTest("compiler/testData/checkLocalVariablesTable/inlineSimple.kt");
@@ -84,11 +79,6 @@ public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVar
         runTest("compiler/testData/checkLocalVariablesTable/itInReturnedLambda.kt");
     }
 
-    @TestMetadata("jvmOverloads.kt")
-    public void testJvmOverloads() throws Exception {
-        runTest("compiler/testData/checkLocalVariablesTable/jvmOverloads.kt");
-    }
-
     @TestMetadata("kt11117.kt")
     public void testKt11117() throws Exception {
         runTest("compiler/testData/checkLocalVariablesTable/kt11117.kt");
@@ -109,11 +99,6 @@ public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVar
         runTest("compiler/testData/checkLocalVariablesTable/objectInLocalPropertyDelegate.kt");
     }
 
-    @TestMetadata("receiverParameter.kt")
-    public void testReceiverParameter() throws Exception {
-        runTest("compiler/testData/checkLocalVariablesTable/receiverParameter.kt");
-    }
-
     @TestMetadata("underscoreNames.kt")
     public void testUnderscoreNames() throws Exception {
         runTest("compiler/testData/checkLocalVariablesTable/underscoreNames.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/IrLocalVariableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/IrLocalVariableTestGenerated.java
index bc52c5cb9f9..0d21fd5dcd3 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/IrLocalVariableTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/IrLocalVariableTestGenerated.java
@@ -55,12 +55,30 @@ public class IrLocalVariableTestGenerated extends AbstractIrLocalVariableTest {
         runTest("compiler/testData/debug/localVariables/destructuringInLambdas.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("receiverParameter.kt")
+    public void testReceiverParameter() throws Exception {
+        runTest("compiler/testData/debug/localVariables/receiverParameter.kt");
+    }
+
     @Test
     @TestMetadata("underscoreNames.kt")
     public void testUnderscoreNames() throws Exception {
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/LocalVariableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/LocalVariableTestGenerated.java
index bdef17af544..5554f976e50 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/LocalVariableTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/LocalVariableTestGenerated.java
@@ -55,12 +55,30 @@ public class LocalVariableTestGenerated extends AbstractLocalVariableTest {
         runTest("compiler/testData/debug/localVariables/destructuringInLambdas.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("receiverParameter.kt")
+    public void testReceiverParameter() throws Exception {
+        runTest("compiler/testData/debug/localVariables/receiverParameter.kt");
+    }
+
     @Test
     @TestMetadata("underscoreNames.kt")
     public void testUnderscoreNames() throws Exception {
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCheckLocalVariablesTableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCheckLocalVariablesTableTestGenerated.java
index 9919c31b77c..18a8246b391 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCheckLocalVariablesTableTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCheckLocalVariablesTableTestGenerated.java
@@ -59,11 +59,6 @@ public class IrCheckLocalVariablesTableTestGenerated extends AbstractIrCheckLoca
         runTest("compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt");
     }
 
-    @TestMetadata("inlineProperty.kt")
-    public void testInlineProperty() throws Exception {
-        runTest("compiler/testData/checkLocalVariablesTable/inlineProperty.kt");
-    }
-
     @TestMetadata("inlineSimple.kt")
     public void testInlineSimple() throws Exception {
         runTest("compiler/testData/checkLocalVariablesTable/inlineSimple.kt");
@@ -84,11 +79,6 @@ public class IrCheckLocalVariablesTableTestGenerated extends AbstractIrCheckLoca
         runTest("compiler/testData/checkLocalVariablesTable/itInReturnedLambda.kt");
     }
 
-    @TestMetadata("jvmOverloads.kt")
-    public void testJvmOverloads() throws Exception {
-        runTest("compiler/testData/checkLocalVariablesTable/jvmOverloads.kt");
-    }
-
     @TestMetadata("kt11117.kt")
     public void testKt11117() throws Exception {
         runTest("compiler/testData/checkLocalVariablesTable/kt11117.kt");
@@ -109,11 +99,6 @@ public class IrCheckLocalVariablesTableTestGenerated extends AbstractIrCheckLoca
         runTest("compiler/testData/checkLocalVariablesTable/objectInLocalPropertyDelegate.kt");
     }
 
-    @TestMetadata("receiverParameter.kt")
-    public void testReceiverParameter() throws Exception {
-        runTest("compiler/testData/checkLocalVariablesTable/receiverParameter.kt");
-    }
-
     @TestMetadata("underscoreNames.kt")
     public void testUnderscoreNames() throws Exception {
         runTest("compiler/testData/checkLocalVariablesTable/underscoreNames.kt");