diff --git a/compiler/testData/diagnostics/tests/LateInit.kt b/compiler/testData/diagnostics/tests/lateinit/modifierApplicability.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/LateInit.kt
rename to compiler/testData/diagnostics/tests/lateinit/modifierApplicability.kt
diff --git a/compiler/testData/diagnostics/tests/LateInit.txt b/compiler/testData/diagnostics/tests/lateinit/modifierApplicability.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/LateInit.txt
rename to compiler/testData/diagnostics/tests/lateinit/modifierApplicability.txt
diff --git a/compiler/testData/diagnostics/tests/LateInitSetter.kt b/compiler/testData/diagnostics/tests/lateinit/setter.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/LateInitSetter.kt
rename to compiler/testData/diagnostics/tests/lateinit/setter.kt
diff --git a/compiler/testData/diagnostics/tests/LateInitSetter.txt b/compiler/testData/diagnostics/tests/lateinit/setter.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/LateInitSetter.txt
rename to compiler/testData/diagnostics/tests/lateinit/setter.txt
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index aaf5f32c788..e6d3a70f706 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -410,18 +410,6 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
             doTest(fileName);
         }
 
-        @TestMetadata("LateInit.kt")
-        public void testLateInit() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LateInit.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("LateInitSetter.kt")
-        public void testLateInitSetter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LateInitSetter.kt");
-            doTest(fileName);
-        }
-
         @TestMetadata("LiteralAsResult.kt")
         public void testLiteralAsResult() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LiteralAsResult.kt");
@@ -12839,6 +12827,27 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
             }
         }
 
+        @TestMetadata("compiler/testData/diagnostics/tests/lateinit")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Lateinit extends AbstractDiagnosticsTest {
+            public void testAllFilesPresentInLateinit() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/lateinit"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+            }
+
+            @TestMetadata("modifierApplicability.kt")
+            public void testModifierApplicability() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/lateinit/modifierApplicability.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("setter.kt")
+            public void testSetter() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/lateinit/setter.kt");
+                doTest(fileName);
+            }
+        }
+
         @TestMetadata("compiler/testData/diagnostics/tests/library")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)