diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
index 743a440ef49..39b473dab0d 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
@@ -13718,48 +13718,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt");
         }
 
-        @Test
-        @TestMetadata("delegateToAnother.kt")
-        public void testDelegateToAnother() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherCustom.kt")
-        public void testDelegateToAnotherCustom() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherCustom.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherMutable.kt")
-        public void testDelegateToAnotherMutable() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherMutable.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherWithSideEffects.kt")
-        public void testDelegateToAnotherWithSideEffects() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherWithSideEffects.kt");
-        }
-
         @Test
         @TestMetadata("delegateToConstructorParameter.kt")
         public void testDelegateToConstructorParameter() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateToConstructorParameter.kt");
         }
 
-        @Test
-        @TestMetadata("delegateToGenericJavaProperty.kt")
-        public void testDelegateToGenericJavaProperty() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToGenericJavaProperty.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToOpenProperty.kt")
-        public void testDelegateToOpenProperty() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToOpenProperty.kt");
-        }
-
         @Test
         @TestMetadata("delegateWithPrivateSet.kt")
         public void testDelegateWithPrivateSet() throws Exception {
@@ -14012,6 +13976,52 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt");
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/codegen/box/delegatedProperty/delegateToAnother")
+        @TestDataPath("$PROJECT_ROOT")
+        public class DelegateToAnother {
+            @Test
+            public void testAllFilesPresentInDelegateToAnother() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/delegatedProperty/delegateToAnother"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @Test
+            @TestMetadata("custom.kt")
+            public void testCustom() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/custom.kt");
+            }
+
+            @Test
+            @TestMetadata("genericJavaProperty.kt")
+            public void testGenericJavaProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/genericJavaProperty.kt");
+            }
+
+            @Test
+            @TestMetadata("mutable.kt")
+            public void testMutable() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/mutable.kt");
+            }
+
+            @Test
+            @TestMetadata("openProperty.kt")
+            public void testOpenProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/openProperty.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/simple.kt");
+            }
+
+            @Test
+            @TestMetadata("withSideEffects.kt")
+            public void testWithSideEffects() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/withSideEffects.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/codegen/box/delegatedProperty/local")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToAnotherCustom.kt b/compiler/testData/codegen/box/delegatedProperty/delegateToAnother/custom.kt
similarity index 100%
rename from compiler/testData/codegen/box/delegatedProperty/delegateToAnotherCustom.kt
rename to compiler/testData/codegen/box/delegatedProperty/delegateToAnother/custom.kt
diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToGenericJavaProperty.kt b/compiler/testData/codegen/box/delegatedProperty/delegateToAnother/genericJavaProperty.kt
similarity index 100%
rename from compiler/testData/codegen/box/delegatedProperty/delegateToGenericJavaProperty.kt
rename to compiler/testData/codegen/box/delegatedProperty/delegateToAnother/genericJavaProperty.kt
diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToAnotherMutable.kt b/compiler/testData/codegen/box/delegatedProperty/delegateToAnother/mutable.kt
similarity index 100%
rename from compiler/testData/codegen/box/delegatedProperty/delegateToAnotherMutable.kt
rename to compiler/testData/codegen/box/delegatedProperty/delegateToAnother/mutable.kt
diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToOpenProperty.kt b/compiler/testData/codegen/box/delegatedProperty/delegateToAnother/openProperty.kt
similarity index 100%
rename from compiler/testData/codegen/box/delegatedProperty/delegateToOpenProperty.kt
rename to compiler/testData/codegen/box/delegatedProperty/delegateToAnother/openProperty.kt
diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToAnother.kt b/compiler/testData/codegen/box/delegatedProperty/delegateToAnother/simple.kt
similarity index 100%
rename from compiler/testData/codegen/box/delegatedProperty/delegateToAnother.kt
rename to compiler/testData/codegen/box/delegatedProperty/delegateToAnother/simple.kt
diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToAnotherWithSideEffects.kt b/compiler/testData/codegen/box/delegatedProperty/delegateToAnother/withSideEffects.kt
similarity index 100%
rename from compiler/testData/codegen/box/delegatedProperty/delegateToAnotherWithSideEffects.kt
rename to compiler/testData/codegen/box/delegatedProperty/delegateToAnother/withSideEffects.kt
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
index 538e3b0a749..2e839cef670 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
@@ -13640,48 +13640,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt");
         }
 
-        @Test
-        @TestMetadata("delegateToAnother.kt")
-        public void testDelegateToAnother() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherCustom.kt")
-        public void testDelegateToAnotherCustom() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherCustom.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherMutable.kt")
-        public void testDelegateToAnotherMutable() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherMutable.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherWithSideEffects.kt")
-        public void testDelegateToAnotherWithSideEffects() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherWithSideEffects.kt");
-        }
-
         @Test
         @TestMetadata("delegateToConstructorParameter.kt")
         public void testDelegateToConstructorParameter() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateToConstructorParameter.kt");
         }
 
-        @Test
-        @TestMetadata("delegateToGenericJavaProperty.kt")
-        public void testDelegateToGenericJavaProperty() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToGenericJavaProperty.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToOpenProperty.kt")
-        public void testDelegateToOpenProperty() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToOpenProperty.kt");
-        }
-
         @Test
         @TestMetadata("delegateWithPrivateSet.kt")
         public void testDelegateWithPrivateSet() throws Exception {
@@ -13934,6 +13898,52 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt");
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/codegen/box/delegatedProperty/delegateToAnother")
+        @TestDataPath("$PROJECT_ROOT")
+        public class DelegateToAnother {
+            @Test
+            public void testAllFilesPresentInDelegateToAnother() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/delegatedProperty/delegateToAnother"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+            }
+
+            @Test
+            @TestMetadata("custom.kt")
+            public void testCustom() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/custom.kt");
+            }
+
+            @Test
+            @TestMetadata("genericJavaProperty.kt")
+            public void testGenericJavaProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/genericJavaProperty.kt");
+            }
+
+            @Test
+            @TestMetadata("mutable.kt")
+            public void testMutable() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/mutable.kt");
+            }
+
+            @Test
+            @TestMetadata("openProperty.kt")
+            public void testOpenProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/openProperty.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/simple.kt");
+            }
+
+            @Test
+            @TestMetadata("withSideEffects.kt")
+            public void testWithSideEffects() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/withSideEffects.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/codegen/box/delegatedProperty/local")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
index 23663b4117f..deca6df6b23 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
@@ -13718,48 +13718,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt");
         }
 
-        @Test
-        @TestMetadata("delegateToAnother.kt")
-        public void testDelegateToAnother() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherCustom.kt")
-        public void testDelegateToAnotherCustom() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherCustom.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherMutable.kt")
-        public void testDelegateToAnotherMutable() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherMutable.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherWithSideEffects.kt")
-        public void testDelegateToAnotherWithSideEffects() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherWithSideEffects.kt");
-        }
-
         @Test
         @TestMetadata("delegateToConstructorParameter.kt")
         public void testDelegateToConstructorParameter() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateToConstructorParameter.kt");
         }
 
-        @Test
-        @TestMetadata("delegateToGenericJavaProperty.kt")
-        public void testDelegateToGenericJavaProperty() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToGenericJavaProperty.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToOpenProperty.kt")
-        public void testDelegateToOpenProperty() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToOpenProperty.kt");
-        }
-
         @Test
         @TestMetadata("delegateWithPrivateSet.kt")
         public void testDelegateWithPrivateSet() throws Exception {
@@ -14012,6 +13976,52 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt");
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/codegen/box/delegatedProperty/delegateToAnother")
+        @TestDataPath("$PROJECT_ROOT")
+        public class DelegateToAnother {
+            @Test
+            public void testAllFilesPresentInDelegateToAnother() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/delegatedProperty/delegateToAnother"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @Test
+            @TestMetadata("custom.kt")
+            public void testCustom() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/custom.kt");
+            }
+
+            @Test
+            @TestMetadata("genericJavaProperty.kt")
+            public void testGenericJavaProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/genericJavaProperty.kt");
+            }
+
+            @Test
+            @TestMetadata("mutable.kt")
+            public void testMutable() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/mutable.kt");
+            }
+
+            @Test
+            @TestMetadata("openProperty.kt")
+            public void testOpenProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/openProperty.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/simple.kt");
+            }
+
+            @Test
+            @TestMetadata("withSideEffects.kt")
+            public void testWithSideEffects() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/withSideEffects.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/codegen/box/delegatedProperty/local")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
index 49271e25bcc..f1300725537 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
@@ -11109,41 +11109,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt");
         }
 
-        @TestMetadata("delegateToAnother.kt")
-        public void testDelegateToAnother() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother.kt");
-        }
-
-        @TestMetadata("delegateToAnotherCustom.kt")
-        public void testDelegateToAnotherCustom() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherCustom.kt");
-        }
-
-        @TestMetadata("delegateToAnotherMutable.kt")
-        public void testDelegateToAnotherMutable() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherMutable.kt");
-        }
-
-        @TestMetadata("delegateToAnotherWithSideEffects.kt")
-        public void testDelegateToAnotherWithSideEffects() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherWithSideEffects.kt");
-        }
-
         @TestMetadata("delegateToConstructorParameter.kt")
         public void testDelegateToConstructorParameter() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateToConstructorParameter.kt");
         }
 
-        @TestMetadata("delegateToGenericJavaProperty.kt")
-        public void testDelegateToGenericJavaProperty() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToGenericJavaProperty.kt");
-        }
-
-        @TestMetadata("delegateToOpenProperty.kt")
-        public void testDelegateToOpenProperty() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToOpenProperty.kt");
-        }
-
         @TestMetadata("delegateWithPrivateSet.kt")
         public void testDelegateWithPrivateSet() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateWithPrivateSet.kt");
@@ -11344,6 +11314,49 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt");
         }
 
+        @TestMetadata("compiler/testData/codegen/box/delegatedProperty/delegateToAnother")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class DelegateToAnother extends AbstractLightAnalysisModeTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInDelegateToAnother() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/delegatedProperty/delegateToAnother"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+            }
+
+            @TestMetadata("custom.kt")
+            public void testCustom() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/custom.kt");
+            }
+
+            @TestMetadata("genericJavaProperty.kt")
+            public void testGenericJavaProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/genericJavaProperty.kt");
+            }
+
+            @TestMetadata("mutable.kt")
+            public void testMutable() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/mutable.kt");
+            }
+
+            @TestMetadata("openProperty.kt")
+            public void testOpenProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/openProperty.kt");
+            }
+
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/simple.kt");
+            }
+
+            @TestMetadata("withSideEffects.kt")
+            public void testWithSideEffects() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/withSideEffects.kt");
+            }
+        }
+
         @TestMetadata("compiler/testData/codegen/box/delegatedProperty/local")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
index c6a4c0acc34..6f274594053 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
@@ -10420,42 +10420,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt");
         }
 
-        @Test
-        @TestMetadata("delegateToAnother.kt")
-        public void testDelegateToAnother() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherCustom.kt")
-        public void testDelegateToAnotherCustom() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherCustom.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherMutable.kt")
-        public void testDelegateToAnotherMutable() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherMutable.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherWithSideEffects.kt")
-        public void testDelegateToAnotherWithSideEffects() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherWithSideEffects.kt");
-        }
-
         @Test
         @TestMetadata("delegateToConstructorParameter.kt")
         public void testDelegateToConstructorParameter() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateToConstructorParameter.kt");
         }
 
-        @Test
-        @TestMetadata("delegateToOpenProperty.kt")
-        public void testDelegateToOpenProperty() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToOpenProperty.kt");
-        }
-
         @Test
         @TestMetadata("delegateWithPrivateSet.kt")
         public void testDelegateWithPrivateSet() throws Exception {
@@ -10678,6 +10648,46 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt");
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/codegen/box/delegatedProperty/delegateToAnother")
+        @TestDataPath("$PROJECT_ROOT")
+        public class DelegateToAnother {
+            @Test
+            public void testAllFilesPresentInDelegateToAnother() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/delegatedProperty/delegateToAnother"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
+            }
+
+            @Test
+            @TestMetadata("custom.kt")
+            public void testCustom() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/custom.kt");
+            }
+
+            @Test
+            @TestMetadata("mutable.kt")
+            public void testMutable() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/mutable.kt");
+            }
+
+            @Test
+            @TestMetadata("openProperty.kt")
+            public void testOpenProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/openProperty.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/simple.kt");
+            }
+
+            @Test
+            @TestMetadata("withSideEffects.kt")
+            public void testWithSideEffects() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/withSideEffects.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/codegen/box/delegatedProperty/local")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
index 472c96619e2..a1caeb339bc 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
@@ -10462,42 +10462,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt");
         }
 
-        @Test
-        @TestMetadata("delegateToAnother.kt")
-        public void testDelegateToAnother() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherCustom.kt")
-        public void testDelegateToAnotherCustom() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherCustom.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherMutable.kt")
-        public void testDelegateToAnotherMutable() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherMutable.kt");
-        }
-
-        @Test
-        @TestMetadata("delegateToAnotherWithSideEffects.kt")
-        public void testDelegateToAnotherWithSideEffects() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherWithSideEffects.kt");
-        }
-
         @Test
         @TestMetadata("delegateToConstructorParameter.kt")
         public void testDelegateToConstructorParameter() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/delegateToConstructorParameter.kt");
         }
 
-        @Test
-        @TestMetadata("delegateToOpenProperty.kt")
-        public void testDelegateToOpenProperty() throws Exception {
-            runTest("compiler/testData/codegen/box/delegatedProperty/delegateToOpenProperty.kt");
-        }
-
         @Test
         @TestMetadata("delegateWithPrivateSet.kt")
         public void testDelegateWithPrivateSet() throws Exception {
@@ -10720,6 +10690,46 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt");
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/codegen/box/delegatedProperty/delegateToAnother")
+        @TestDataPath("$PROJECT_ROOT")
+        public class DelegateToAnother {
+            @Test
+            public void testAllFilesPresentInDelegateToAnother() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/delegatedProperty/delegateToAnother"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+            }
+
+            @Test
+            @TestMetadata("custom.kt")
+            public void testCustom() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/custom.kt");
+            }
+
+            @Test
+            @TestMetadata("mutable.kt")
+            public void testMutable() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/mutable.kt");
+            }
+
+            @Test
+            @TestMetadata("openProperty.kt")
+            public void testOpenProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/openProperty.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/simple.kt");
+            }
+
+            @Test
+            @TestMetadata("withSideEffects.kt")
+            public void testWithSideEffects() throws Exception {
+                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/withSideEffects.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/codegen/box/delegatedProperty/local")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeExtBlackBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeExtBlackBoxTestGenerated.java
index 312b5ba4d09..377dd1d4227 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeExtBlackBoxTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeExtBlackBoxTestGenerated.java
@@ -13868,48 +13868,12 @@ public class NativeExtBlackBoxTestGenerated extends AbstractNativeBlackBoxTest {
                 runTest("compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt");
             }
 
-            @Test
-            @TestMetadata("delegateToAnother.kt")
-            public void testDelegateToAnother() throws Exception {
-                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother.kt");
-            }
-
-            @Test
-            @TestMetadata("delegateToAnotherCustom.kt")
-            public void testDelegateToAnotherCustom() throws Exception {
-                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherCustom.kt");
-            }
-
-            @Test
-            @TestMetadata("delegateToAnotherMutable.kt")
-            public void testDelegateToAnotherMutable() throws Exception {
-                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherMutable.kt");
-            }
-
-            @Test
-            @TestMetadata("delegateToAnotherWithSideEffects.kt")
-            public void testDelegateToAnotherWithSideEffects() throws Exception {
-                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnotherWithSideEffects.kt");
-            }
-
             @Test
             @TestMetadata("delegateToConstructorParameter.kt")
             public void testDelegateToConstructorParameter() throws Exception {
                 runTest("compiler/testData/codegen/box/delegatedProperty/delegateToConstructorParameter.kt");
             }
 
-            @Test
-            @TestMetadata("delegateToGenericJavaProperty.kt")
-            public void testDelegateToGenericJavaProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToGenericJavaProperty.kt");
-            }
-
-            @Test
-            @TestMetadata("delegateToOpenProperty.kt")
-            public void testDelegateToOpenProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/delegatedProperty/delegateToOpenProperty.kt");
-            }
-
             @Test
             @TestMetadata("delegateWithPrivateSet.kt")
             public void testDelegateWithPrivateSet() throws Exception {
@@ -14162,6 +14126,53 @@ public class NativeExtBlackBoxTestGenerated extends AbstractNativeBlackBoxTest {
                 runTest("compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt");
             }
 
+            @Nested
+            @TestMetadata("compiler/testData/codegen/box/delegatedProperty/delegateToAnother")
+            @TestDataPath("$PROJECT_ROOT")
+            @NativeBlackBoxTestCaseGroupProvider(ExtTestCaseGroupProvider.class)
+            public class DelegateToAnother {
+                @Test
+                public void testAllFilesPresentInDelegateToAnother() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/delegatedProperty/delegateToAnother"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("custom.kt")
+                public void testCustom() throws Exception {
+                    runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/custom.kt");
+                }
+
+                @Test
+                @TestMetadata("genericJavaProperty.kt")
+                public void testGenericJavaProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/genericJavaProperty.kt");
+                }
+
+                @Test
+                @TestMetadata("mutable.kt")
+                public void testMutable() throws Exception {
+                    runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/mutable.kt");
+                }
+
+                @Test
+                @TestMetadata("openProperty.kt")
+                public void testOpenProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/openProperty.kt");
+                }
+
+                @Test
+                @TestMetadata("simple.kt")
+                public void testSimple() throws Exception {
+                    runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/simple.kt");
+                }
+
+                @Test
+                @TestMetadata("withSideEffects.kt")
+                public void testWithSideEffects() throws Exception {
+                    runTest("compiler/testData/codegen/box/delegatedProperty/delegateToAnother/withSideEffects.kt");
+                }
+            }
+
             @Nested
             @TestMetadata("compiler/testData/codegen/box/delegatedProperty/local")
             @TestDataPath("$PROJECT_ROOT")