diff --git a/compiler/testData/diagnostics/tests/delegationBy/abstractOverride.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/abstractOverride.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/abstractOverride.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/abstractOverride.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/abstractOverride.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/abstractOverride.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/abstractOverride.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/abstractOverride.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/delegationToSubType.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubType.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/delegationToSubType.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubType.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/delegationToSubType.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubType.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/delegationToSubType.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubType.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeProperty.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeProperty.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeProperty.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeProperty.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeProperty.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeProperty.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeProperty.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeProperty.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeWithOverride.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverride.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeWithOverride.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverride.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeWithOverride.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverride.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeWithOverride.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverride.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeWithOverrideProperty.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverrideProperty.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeWithOverrideProperty.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverrideProperty.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeWithOverrideProperty.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverrideProperty.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeWithOverrideProperty.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverrideProperty.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/diamond.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/diamond.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/diamond.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/diamond.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/diamond.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/diamond.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/diamond.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/diamond.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/explicitOverride.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/explicitOverride.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/explicitOverride.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/explicitOverride.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/explicitOverride.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/explicitOverride.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/explicitOverride.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/explicitOverride.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/fakeOverrideInTheMiddle.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/fakeOverrideInTheMiddle.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/fakeOverrideInTheMiddle.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/fakeOverrideInTheMiddle.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/fakeOverrideInTheMiddle.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/fakeOverrideInTheMiddle.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/fakeOverrideInTheMiddle.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/fakeOverrideInTheMiddle.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/generic.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/generic.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/generic.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/generic.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/generic.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/generic.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/generic.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/generic.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/sameDelegationInHierarchy.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/sameDelegationInHierarchy.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/sameDelegationInHierarchy.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/sameDelegationInHierarchy.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/sameDelegationInHierarchy.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/sameDelegationInHierarchy.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/sameDelegationInHierarchy.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/sameDelegationInHierarchy.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/sameDelegationInHierarchy2.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/sameDelegationInHierarchy2.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/sameDelegationInHierarchy2.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/sameDelegationInHierarchy2.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/sameDelegationInHierarchy2.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/sameDelegationInHierarchy2.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/sameDelegationInHierarchy2.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/sameDelegationInHierarchy2.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/severalDelegates.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/severalDelegates.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/severalDelegates.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/severalDelegates.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/simple.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/simple.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/simple.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/simple.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/simpleNoOverride.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simpleNoOverride.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/simpleNoOverride.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simpleNoOverride.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/simpleNoOverride.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simpleNoOverride.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/simpleNoOverride.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simpleNoOverride.txt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/simpleProp.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simpleProp.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/simpleProp.kt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simpleProp.kt
diff --git a/compiler/testData/diagnostics/tests/delegationBy/simpleProp.txt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simpleProp.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/delegationBy/simpleProp.txt
rename to compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simpleProp.txt
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 898307a6f55..aca8b8bd4ff 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -6219,104 +6219,104 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                     doTest(fileName);
                 }
             }
-        }
 
-        @TestMetadata("compiler/testData/diagnostics/tests/delegationBy")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class DelegationBy extends AbstractDiagnosticsTest {
-            @TestMetadata("abstractOverride.kt")
-            public void testAbstractOverride() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/abstractOverride.kt");
-                doTest(fileName);
-            }
+            @TestMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class MemberHidesSupertypeOverride extends AbstractDiagnosticsTest {
+                @TestMetadata("abstractOverride.kt")
+                public void testAbstractOverride() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/abstractOverride.kt");
+                    doTest(fileName);
+                }
 
-            public void testAllFilesPresentInDelegationBy() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/delegationBy"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
-            }
+                public void testAllFilesPresentInMemberHidesSupertypeOverride() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+                }
 
-            @TestMetadata("delegationToSubType.kt")
-            public void testDelegationToSubType() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/delegationToSubType.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("delegationToSubType.kt")
+                public void testDelegationToSubType() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubType.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("delegationToSubTypeProperty.kt")
-            public void testDelegationToSubTypeProperty() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeProperty.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("delegationToSubTypeProperty.kt")
+                public void testDelegationToSubTypeProperty() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeProperty.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("delegationToSubTypeWithOverride.kt")
-            public void testDelegationToSubTypeWithOverride() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeWithOverride.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("delegationToSubTypeWithOverride.kt")
+                public void testDelegationToSubTypeWithOverride() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverride.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("delegationToSubTypeWithOverrideProperty.kt")
-            public void testDelegationToSubTypeWithOverrideProperty() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/delegationToSubTypeWithOverrideProperty.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("delegationToSubTypeWithOverrideProperty.kt")
+                public void testDelegationToSubTypeWithOverrideProperty() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverrideProperty.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("diamond.kt")
-            public void testDiamond() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/diamond.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/diamond.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("explicitOverride.kt")
-            public void testExplicitOverride() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/explicitOverride.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("explicitOverride.kt")
+                public void testExplicitOverride() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/explicitOverride.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("fakeOverrideInTheMiddle.kt")
-            public void testFakeOverrideInTheMiddle() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/fakeOverrideInTheMiddle.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("fakeOverrideInTheMiddle.kt")
+                public void testFakeOverrideInTheMiddle() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/fakeOverrideInTheMiddle.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("generic.kt")
-            public void testGeneric() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/generic.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("generic.kt")
+                public void testGeneric() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/generic.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("sameDelegationInHierarchy.kt")
-            public void testSameDelegationInHierarchy() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/sameDelegationInHierarchy.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("sameDelegationInHierarchy.kt")
+                public void testSameDelegationInHierarchy() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/sameDelegationInHierarchy.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("sameDelegationInHierarchy2.kt")
-            public void testSameDelegationInHierarchy2() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/sameDelegationInHierarchy2.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("sameDelegationInHierarchy2.kt")
+                public void testSameDelegationInHierarchy2() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/sameDelegationInHierarchy2.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("severalDelegates.kt")
-            public void testSeveralDelegates() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/severalDelegates.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("severalDelegates.kt")
+                public void testSeveralDelegates() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("simple.kt")
-            public void testSimple() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/simple.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("simple.kt")
+                public void testSimple() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simple.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("simpleNoOverride.kt")
-            public void testSimpleNoOverride() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/simpleNoOverride.kt");
-                doTest(fileName);
-            }
+                @TestMetadata("simpleNoOverride.kt")
+                public void testSimpleNoOverride() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simpleNoOverride.kt");
+                    doTest(fileName);
+                }
 
-            @TestMetadata("simpleProp.kt")
-            public void testSimpleProp() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegationBy/simpleProp.kt");
-                doTest(fileName);
+                @TestMetadata("simpleProp.kt")
+                public void testSimpleProp() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/simpleProp.kt");
+                    doTest(fileName);
+                }
             }
         }