diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/DoubleDeclForLoop.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.kt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/DoubleDeclForLoop.kt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.txt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/DoubleDeclForLoop.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.txt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/DoubleDeclForLoop.txt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/FolLoopTypeComponentTypeMismatch.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.kt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/FolLoopTypeComponentTypeMismatch.kt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.txt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/FolLoopTypeComponentTypeMismatch.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.txt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/FolLoopTypeComponentTypeMismatch.txt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopComponentFunctionAmbiguity.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.kt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopComponentFunctionAmbiguity.kt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.txt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopComponentFunctionAmbiguity.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.txt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopComponentFunctionAmbiguity.txt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopComponentFunctionMissing.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.kt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopComponentFunctionMissing.kt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.txt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopComponentFunctionMissing.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.txt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopComponentFunctionMissing.txt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopMissingLoopParameter.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopMissingLoopParameter.kt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.kt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopMissingLoopParameter.txt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopMissingLoopParameter.txt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.txt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopWithExtensions.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.kt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopWithExtensions.kt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.txt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopWithExtensions.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.txt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopWithExtensions.txt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForWithExplicitTypes.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.kt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForWithExplicitTypes.kt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.txt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForWithExplicitTypes.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.txt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForWithExplicitTypes.txt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/RedeclarationInForLoop.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.kt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/RedeclarationInForLoop.kt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.txt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/RedeclarationInForLoop.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.txt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/RedeclarationInForLoop.txt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/SingleDeclForLoop.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.kt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/SingleDeclForLoop.kt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.txt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/SingleDeclForLoop.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.txt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/SingleDeclForLoop.txt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/multiDeclarationAssignedUnresolved.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/destructuringDeclarationAssignedUnresolved.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/multiDeclarationAssignedUnresolved.kt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/destructuringDeclarationAssignedUnresolved.kt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/multiDeclarationAssignedUnresolved.txt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/destructuringDeclarationAssignedUnresolved.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/multiDeclarationAssignedUnresolved.txt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/destructuringDeclarationAssignedUnresolved.txt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/multiDeclarationMissingInitializer.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/destructuringDeclarationMissingInitializer.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/multiDeclarationMissingInitializer.kt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/destructuringDeclarationMissingInitializer.kt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/multiDeclarationMissingInitializer.txt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/destructuringDeclarationMissingInitializer.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/multiDeclarationMissingInitializer.txt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/destructuringDeclarationMissingInitializer.txt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/kt2829.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.kt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/kt2829.kt
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.txt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/kt2829.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.txt
rename to compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/kt2829.txt
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 73ef1db303e..07b1a2ad1c9 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -5106,6 +5106,87 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class DestructuringDeclarations extends AbstractDiagnosticsTest {
+                public void testAllFilesPresentInDestructuringDeclarations() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations"), Pattern.compile("^(.+)\\.kt$"), true);
+                }
+
+                @TestMetadata("destructuringDeclarationAssignedUnresolved.kt")
+                public void testDestructuringDeclarationAssignedUnresolved() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/destructuringDeclarationAssignedUnresolved.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("destructuringDeclarationMissingInitializer.kt")
+                public void testDestructuringDeclarationMissingInitializer() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/destructuringDeclarationMissingInitializer.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("DoubleDeclForLoop.kt")
+                public void testDoubleDeclForLoop() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/DoubleDeclForLoop.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("FolLoopTypeComponentTypeMismatch.kt")
+                public void testFolLoopTypeComponentTypeMismatch() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/FolLoopTypeComponentTypeMismatch.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("ForLoopComponentFunctionAmbiguity.kt")
+                public void testForLoopComponentFunctionAmbiguity() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopComponentFunctionAmbiguity.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("ForLoopComponentFunctionMissing.kt")
+                public void testForLoopComponentFunctionMissing() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopComponentFunctionMissing.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("ForLoopMissingLoopParameter.kt")
+                public void testForLoopMissingLoopParameter() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("ForLoopWithExtensions.kt")
+                public void testForLoopWithExtensions() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopWithExtensions.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("ForWithExplicitTypes.kt")
+                public void testForWithExplicitTypes() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForWithExplicitTypes.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("kt2829.kt")
+                public void testKt2829() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/kt2829.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("RedeclarationInForLoop.kt")
+                public void testRedeclarationInForLoop() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/RedeclarationInForLoop.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("SingleDeclForLoop.kt")
+                public void testSingleDeclForLoop() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/SingleDeclForLoop.kt");
+                    doTest(fileName);
+                }
+            }
+
             @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
@@ -5133,87 +5214,6 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                 }
             }
 
-            @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class MultiDeclarations extends AbstractDiagnosticsTest {
-                public void testAllFilesPresentInMultiDeclarations() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations"), Pattern.compile("^(.+)\\.kt$"), true);
-                }
-
-                @TestMetadata("DoubleDeclForLoop.kt")
-                public void testDoubleDeclForLoop() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("FolLoopTypeComponentTypeMismatch.kt")
-                public void testFolLoopTypeComponentTypeMismatch() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("ForLoopComponentFunctionAmbiguity.kt")
-                public void testForLoopComponentFunctionAmbiguity() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("ForLoopComponentFunctionMissing.kt")
-                public void testForLoopComponentFunctionMissing() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("ForLoopMissingLoopParameter.kt")
-                public void testForLoopMissingLoopParameter() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopMissingLoopParameter.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("ForLoopWithExtensions.kt")
-                public void testForLoopWithExtensions() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("ForWithExplicitTypes.kt")
-                public void testForWithExplicitTypes() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("kt2829.kt")
-                public void testKt2829() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("multiDeclarationAssignedUnresolved.kt")
-                public void testMultiDeclarationAssignedUnresolved() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/multiDeclarationAssignedUnresolved.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("multiDeclarationMissingInitializer.kt")
-                public void testMultiDeclarationMissingInitializer() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/multiDeclarationMissingInitializer.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("RedeclarationInForLoop.kt")
-                public void testRedeclarationInForLoop() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("SingleDeclForLoop.kt")
-                public void testSingleDeclForLoop() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.kt");
-                    doTest(fileName);
-                }
-            }
-
             @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)