diff --git a/compiler/testData/diagnostics/tests/properties/localLateinit/inapplicableLateinitModifier.kt b/compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/properties/localLateinit/inapplicableLateinitModifier.kt
rename to compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.kt
diff --git a/compiler/testData/diagnostics/tests/properties/localLateinit/inapplicableLateinitModifier.txt b/compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/properties/localLateinit/inapplicableLateinitModifier.txt
rename to compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.txt
diff --git a/compiler/testData/diagnostics/tests/properties/localLateinit/localLateinit.kt b/compiler/testData/diagnostics/tests/lateinit/local/localLateinit.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/properties/localLateinit/localLateinit.kt
rename to compiler/testData/diagnostics/tests/lateinit/local/localLateinit.kt
diff --git a/compiler/testData/diagnostics/tests/properties/localLateinit/localLateinit.txt b/compiler/testData/diagnostics/tests/lateinit/local/localLateinit.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/properties/localLateinit/localLateinit.txt
rename to compiler/testData/diagnostics/tests/lateinit/local/localLateinit.txt
diff --git a/compiler/testData/diagnostics/tests/properties/localLateinit/uninitialized.kt b/compiler/testData/diagnostics/tests/lateinit/local/uninitialized.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/properties/localLateinit/uninitialized.kt
rename to compiler/testData/diagnostics/tests/lateinit/local/uninitialized.kt
diff --git a/compiler/testData/diagnostics/tests/properties/localLateinit/uninitialized.txt b/compiler/testData/diagnostics/tests/lateinit/local/uninitialized.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/properties/localLateinit/uninitialized.txt
rename to compiler/testData/diagnostics/tests/lateinit/local/uninitialized.txt
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 3ff89c673e6..f24d1ffc928 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -13053,6 +13053,33 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/lateinit/setter.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("compiler/testData/diagnostics/tests/lateinit/local")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Local extends AbstractDiagnosticsTest {
+                public void testAllFilesPresentInLocal() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/lateinit/local"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+                }
+
+                @TestMetadata("inapplicableLateinitModifier.kt")
+                public void testInapplicableLateinitModifier() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localLateinit.kt")
+                public void testLocalLateinit() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/lateinit/local/localLateinit.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("uninitialized.kt")
+                public void testUninitialized() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/lateinit/local/uninitialized.kt");
+                    doTest(fileName);
+                }
+            }
         }
 
         @TestMetadata("compiler/testData/diagnostics/tests/library")
@@ -16260,33 +16287,6 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                     doTest(fileName);
                 }
             }
-
-            @TestMetadata("compiler/testData/diagnostics/tests/properties/localLateinit")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class LocalLateinit extends AbstractDiagnosticsTest {
-                public void testAllFilesPresentInLocalLateinit() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/properties/localLateinit"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
-                }
-
-                @TestMetadata("inapplicableLateinitModifier.kt")
-                public void testInapplicableLateinitModifier() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/properties/localLateinit/inapplicableLateinitModifier.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("localLateinit.kt")
-                public void testLocalLateinit() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/properties/localLateinit/localLateinit.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("uninitialized.kt")
-                public void testUninitialized() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/properties/localLateinit/uninitialized.kt");
-                    doTest(fileName);
-                }
-            }
         }
 
         @TestMetadata("compiler/testData/diagnostics/tests/qualifiedExpression")