diff --git a/compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.kt b/compiler/testData/diagnostics/tests/imports/ClassImportsConflicting.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.kt
rename to compiler/testData/diagnostics/tests/imports/ClassImportsConflicting.kt
diff --git a/compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.txt b/compiler/testData/diagnostics/tests/imports/ClassImportsConflicting.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.txt
rename to compiler/testData/diagnostics/tests/imports/ClassImportsConflicting.txt
diff --git a/compiler/testData/diagnostics/tests/scopes/DontImportRootScope.kt b/compiler/testData/diagnostics/tests/imports/DontImportRootScope.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/DontImportRootScope.kt
rename to compiler/testData/diagnostics/tests/imports/DontImportRootScope.kt
diff --git a/compiler/testData/diagnostics/tests/scopes/DontImportRootScope.txt b/compiler/testData/diagnostics/tests/imports/DontImportRootScope.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/DontImportRootScope.txt
rename to compiler/testData/diagnostics/tests/imports/DontImportRootScope.txt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.kt b/compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.kt
rename to compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.kt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.txt b/compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.txt
rename to compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.txt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.kt b/compiler/testData/diagnostics/tests/imports/ImportObjectAndUseAsSupertype.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.kt
rename to compiler/testData/diagnostics/tests/imports/ImportObjectAndUseAsSupertype.kt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.txt b/compiler/testData/diagnostics/tests/imports/ImportObjectAndUseAsSupertype.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.txt
rename to compiler/testData/diagnostics/tests/imports/ImportObjectAndUseAsSupertype.txt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.kt b/compiler/testData/diagnostics/tests/imports/ImportObjectHidesCurrentPackage.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.kt
rename to compiler/testData/diagnostics/tests/imports/ImportObjectHidesCurrentPackage.kt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.txt b/compiler/testData/diagnostics/tests/imports/ImportObjectHidesCurrentPackage.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.txt
rename to compiler/testData/diagnostics/tests/imports/ImportObjectHidesCurrentPackage.txt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.kt b/compiler/testData/diagnostics/tests/imports/ImportTwoTimes.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.kt
rename to compiler/testData/diagnostics/tests/imports/ImportTwoTimes.kt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.txt b/compiler/testData/diagnostics/tests/imports/ImportTwoTimes.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.txt
rename to compiler/testData/diagnostics/tests/imports/ImportTwoTimes.txt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.kt b/compiler/testData/diagnostics/tests/imports/ImportTwoTimesStar.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.kt
rename to compiler/testData/diagnostics/tests/imports/ImportTwoTimesStar.kt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.txt b/compiler/testData/diagnostics/tests/imports/ImportTwoTimesStar.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.txt
rename to compiler/testData/diagnostics/tests/imports/ImportTwoTimesStar.txt
diff --git a/compiler/testData/diagnostics/tests/scopes/Imports.kt b/compiler/testData/diagnostics/tests/imports/Imports.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/Imports.kt
rename to compiler/testData/diagnostics/tests/imports/Imports.kt
diff --git a/compiler/testData/diagnostics/tests/scopes/Imports.txt b/compiler/testData/diagnostics/tests/imports/Imports.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/Imports.txt
rename to compiler/testData/diagnostics/tests/imports/Imports.txt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportsConflicting.kt b/compiler/testData/diagnostics/tests/imports/ImportsConflicting.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportsConflicting.kt
rename to compiler/testData/diagnostics/tests/imports/ImportsConflicting.kt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportsConflicting.txt b/compiler/testData/diagnostics/tests/imports/ImportsConflicting.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportsConflicting.txt
rename to compiler/testData/diagnostics/tests/imports/ImportsConflicting.txt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.kt b/compiler/testData/diagnostics/tests/imports/ImportsUselessSimpleImport.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.kt
rename to compiler/testData/diagnostics/tests/imports/ImportsUselessSimpleImport.kt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.txt b/compiler/testData/diagnostics/tests/imports/ImportsUselessSimpleImport.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.txt
rename to compiler/testData/diagnostics/tests/imports/ImportsUselessSimpleImport.txt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.kt b/compiler/testData/diagnostics/tests/imports/ImportsUselessSimpleImport2.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.kt
rename to compiler/testData/diagnostics/tests/imports/ImportsUselessSimpleImport2.kt
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.txt b/compiler/testData/diagnostics/tests/imports/ImportsUselessSimpleImport2.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.txt
rename to compiler/testData/diagnostics/tests/imports/ImportsUselessSimpleImport2.txt
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
index 9c20c421207..858e22c316e 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
@@ -4727,6 +4727,18 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("ClassImportsConflicting.kt")
+            public void testClassImportsConflicting() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ClassImportsConflicting.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("DontImportRootScope.kt")
+            public void testDontImportRootScope() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/DontImportRootScope.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("ExplicitImportsAmbiguity.kt")
             public void testExplicitImportsAmbiguity() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ExplicitImportsAmbiguity.kt");
@@ -4745,6 +4757,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("ImportFromCurrentWithDifferentName.kt")
+            public void testImportFromCurrentWithDifferentName() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("importFunctionWithAllUnderImport.kt")
             public void testImportFunctionWithAllUnderImport() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/importFunctionWithAllUnderImport.kt");
@@ -4757,18 +4775,66 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("ImportObjectAndUseAsSupertype.kt")
+            public void testImportObjectAndUseAsSupertype() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportObjectAndUseAsSupertype.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("ImportObjectHidesCurrentPackage.kt")
+            public void testImportObjectHidesCurrentPackage() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportObjectHidesCurrentPackage.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("ImportResolutionOrder.kt")
             public void testImportResolutionOrder() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.kt");
                 doTest(fileName);
             }
 
+            @TestMetadata("ImportTwoTimes.kt")
+            public void testImportTwoTimes() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportTwoTimes.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("ImportTwoTimesStar.kt")
+            public void testImportTwoTimesStar() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportTwoTimesStar.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("Imports.kt")
+            public void testImports() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/Imports.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("ImportsConflicting.kt")
+            public void testImportsConflicting() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportsConflicting.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("ImportsHiddenByDefinitionInTheSameFile.kt")
             public void testImportsHiddenByDefinitionInTheSameFile() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.kt");
                 doTest(fileName);
             }
 
+            @TestMetadata("ImportsUselessSimpleImport.kt")
+            public void testImportsUselessSimpleImport() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportsUselessSimpleImport.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("ImportsUselessSimpleImport2.kt")
+            public void testImportsUselessSimpleImport2() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportsUselessSimpleImport2.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("propertyClassFileDependencyRecursion.kt")
             public void testPropertyClassFileDependencyRecursion() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/propertyClassFileDependencyRecursion.kt");
@@ -9444,72 +9510,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
-            @TestMetadata("ClassImportsConflicting.kt")
-            public void testClassImportsConflicting() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("DontImportRootScope.kt")
-            public void testDontImportRootScope() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/DontImportRootScope.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("ImportFromCurrentWithDifferentName.kt")
-            public void testImportFromCurrentWithDifferentName() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("ImportObjectAndUseAsSupertype.kt")
-            public void testImportObjectAndUseAsSupertype() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("ImportObjectHidesCurrentPackage.kt")
-            public void testImportObjectHidesCurrentPackage() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("ImportTwoTimes.kt")
-            public void testImportTwoTimes() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("ImportTwoTimesStar.kt")
-            public void testImportTwoTimesStar() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("Imports.kt")
-            public void testImports() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/Imports.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("ImportsConflicting.kt")
-            public void testImportsConflicting() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportsConflicting.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("ImportsUselessSimpleImport.kt")
-            public void testImportsUselessSimpleImport() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("ImportsUselessSimpleImport2.kt")
-            public void testImportsUselessSimpleImport2() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("initializerScopeOfExtensionProperty.kt")
             public void testInitializerScopeOfExtensionProperty() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt");