diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java
index 2824db60d7c..56bb170ee0e 100644
--- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java
+++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java
@@ -256,42 +256,6 @@ public class FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated ext
         runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClass3.kt");
     }
 
-    @Test
-    @TestMetadata("nestedClassFromSupertypes.kt")
-    public void testNestedClassFromSupertypes() throws Exception {
-        runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes.kt");
-    }
-
-    @Test
-    @TestMetadata("nestedClassFromSupertypes2.kt")
-    public void testNestedClassFromSupertypes2() throws Exception {
-        runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes2.kt");
-    }
-
-    @Test
-    @TestMetadata("nestedClassFromSupertypes3.kt")
-    public void testNestedClassFromSupertypes3() throws Exception {
-        runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes3.kt");
-    }
-
-    @Test
-    @TestMetadata("nestedClassFromSupertypes4.kt")
-    public void testNestedClassFromSupertypes4() throws Exception {
-        runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes4.kt");
-    }
-
-    @Test
-    @TestMetadata("nestedClassFromSupertypes5.kt")
-    public void testNestedClassFromSupertypes5() throws Exception {
-        runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes5.kt");
-    }
-
-    @Test
-    @TestMetadata("nestedClassFromSupertypes6.kt")
-    public void testNestedClassFromSupertypes6() throws Exception {
-        runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes6.kt");
-    }
-
     @Test
     @TestMetadata("parameterTypeTopLevelTypeLoses.kt")
     public void testParameterTypeTopLevelTypeLoses() throws Exception {
@@ -441,4 +405,50 @@ public class FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated ext
     public void testVariable2() throws Exception {
         runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/variable2.kt");
     }
+
+    @Nested
+    @TestMetadata("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    public class NestedClasses {
+        @Test
+        public void testAllFilesPresentInNestedClasses() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        }
+
+        @Test
+        @TestMetadata("nestedClassFromSupertypes.kt")
+        public void testNestedClassFromSupertypes() throws Exception {
+            runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes.kt");
+        }
+
+        @Test
+        @TestMetadata("nestedClassFromSupertypes2.kt")
+        public void testNestedClassFromSupertypes2() throws Exception {
+            runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes2.kt");
+        }
+
+        @Test
+        @TestMetadata("nestedClassFromSupertypes3.kt")
+        public void testNestedClassFromSupertypes3() throws Exception {
+            runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes3.kt");
+        }
+
+        @Test
+        @TestMetadata("nestedClassFromSupertypes4.kt")
+        public void testNestedClassFromSupertypes4() throws Exception {
+            runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes4.kt");
+        }
+
+        @Test
+        @TestMetadata("nestedClassFromSupertypes5.kt")
+        public void testNestedClassFromSupertypes5() throws Exception {
+            runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes5.kt");
+        }
+
+        @Test
+        @TestMetadata("nestedClassFromSupertypes6.kt")
+        public void testNestedClassFromSupertypes6() throws Exception {
+            runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes6.kt");
+        }
+    }
 }
diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java
index e8568fae4d0..28af2064540 100644
--- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java
+++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java
@@ -256,42 +256,6 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceShortenerTestGenera
         runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClass3.kt");
     }
 
-    @Test
-    @TestMetadata("nestedClassFromSupertypes.kt")
-    public void testNestedClassFromSupertypes() throws Exception {
-        runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes.kt");
-    }
-
-    @Test
-    @TestMetadata("nestedClassFromSupertypes2.kt")
-    public void testNestedClassFromSupertypes2() throws Exception {
-        runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes2.kt");
-    }
-
-    @Test
-    @TestMetadata("nestedClassFromSupertypes3.kt")
-    public void testNestedClassFromSupertypes3() throws Exception {
-        runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes3.kt");
-    }
-
-    @Test
-    @TestMetadata("nestedClassFromSupertypes4.kt")
-    public void testNestedClassFromSupertypes4() throws Exception {
-        runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes4.kt");
-    }
-
-    @Test
-    @TestMetadata("nestedClassFromSupertypes5.kt")
-    public void testNestedClassFromSupertypes5() throws Exception {
-        runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes5.kt");
-    }
-
-    @Test
-    @TestMetadata("nestedClassFromSupertypes6.kt")
-    public void testNestedClassFromSupertypes6() throws Exception {
-        runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes6.kt");
-    }
-
     @Test
     @TestMetadata("parameterTypeTopLevelTypeLoses.kt")
     public void testParameterTypeTopLevelTypeLoses() throws Exception {
@@ -441,4 +405,50 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceShortenerTestGenera
     public void testVariable2() throws Exception {
         runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/variable2.kt");
     }
+
+    @Nested
+    @TestMetadata("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    public class NestedClasses {
+        @Test
+        public void testAllFilesPresentInNestedClasses() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        }
+
+        @Test
+        @TestMetadata("nestedClassFromSupertypes.kt")
+        public void testNestedClassFromSupertypes() throws Exception {
+            runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes.kt");
+        }
+
+        @Test
+        @TestMetadata("nestedClassFromSupertypes2.kt")
+        public void testNestedClassFromSupertypes2() throws Exception {
+            runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes2.kt");
+        }
+
+        @Test
+        @TestMetadata("nestedClassFromSupertypes3.kt")
+        public void testNestedClassFromSupertypes3() throws Exception {
+            runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes3.kt");
+        }
+
+        @Test
+        @TestMetadata("nestedClassFromSupertypes4.kt")
+        public void testNestedClassFromSupertypes4() throws Exception {
+            runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes4.kt");
+        }
+
+        @Test
+        @TestMetadata("nestedClassFromSupertypes5.kt")
+        public void testNestedClassFromSupertypes5() throws Exception {
+            runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes5.kt");
+        }
+
+        @Test
+        @TestMetadata("nestedClassFromSupertypes6.kt")
+        public void testNestedClassFromSupertypes6() throws Exception {
+            runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes6.kt");
+        }
+    }
 }
diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes.kt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes.kt
rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes.kt
diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes.txt
similarity index 100%
rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes.txt
rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes.txt
diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes2.kt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes2.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes2.kt
rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes2.kt
diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes2.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes2.txt
similarity index 100%
rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes2.txt
rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes2.txt
diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes3.kt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes3.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes3.kt
rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes3.kt
diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes3.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes3.txt
similarity index 100%
rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes3.txt
rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes3.txt
diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes4.kt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes4.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes4.kt
rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes4.kt
diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes4.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes4.txt
similarity index 100%
rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes4.txt
rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes4.txt
diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes5.kt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes5.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes5.kt
rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes5.kt
diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes5.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes5.txt
similarity index 100%
rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes5.txt
rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes5.txt
diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes6.kt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes6.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes6.kt
rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes6.kt
diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes6.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes6.txt
similarity index 100%
rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes6.txt
rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes6.txt