diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index e4f328ec0dd..9473eabe442 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -9,7 +9,7 @@
 
 const ENTRY_LIMIT: usize = 900;
 // FIXME: The following limits should be reduced eventually.
-const ISSUES_ENTRY_LIMIT: usize = 1953;
+const ISSUES_ENTRY_LIMIT: usize = 1920;
 const ROOT_ENTRY_LIMIT: usize = 895;
 
 fn check_entries(tests_path: &Path, bad: &mut bool) {
diff --git a/tests/ui/issues/issue-868.rs b/tests/ui/closures/issue-868.rs
similarity index 100%
rename from tests/ui/issues/issue-868.rs
rename to tests/ui/closures/issue-868.rs
diff --git a/tests/ui/issues/issue-12511.rs b/tests/ui/cycle-trait/issue-12511.rs
similarity index 100%
rename from tests/ui/issues/issue-12511.rs
rename to tests/ui/cycle-trait/issue-12511.rs
diff --git a/tests/ui/issues/issue-12511.stderr b/tests/ui/cycle-trait/issue-12511.stderr
similarity index 100%
rename from tests/ui/issues/issue-12511.stderr
rename to tests/ui/cycle-trait/issue-12511.stderr
diff --git a/tests/ui/issues/issue-15689-1.rs b/tests/ui/deriving/issue-15689-1.rs
similarity index 100%
rename from tests/ui/issues/issue-15689-1.rs
rename to tests/ui/deriving/issue-15689-1.rs
diff --git a/tests/ui/issues/issue-15689-2.rs b/tests/ui/deriving/issue-15689-2.rs
similarity index 100%
rename from tests/ui/issues/issue-15689-2.rs
rename to tests/ui/deriving/issue-15689-2.rs
diff --git a/tests/ui/issues/issue-979.rs b/tests/ui/drop/issue-979.rs
similarity index 100%
rename from tests/ui/issues/issue-979.rs
rename to tests/ui/drop/issue-979.rs
diff --git a/tests/ui/issues/issue-1821.rs b/tests/ui/enum/issue-1821.rs
similarity index 100%
rename from tests/ui/issues/issue-1821.rs
rename to tests/ui/enum/issue-1821.rs
diff --git a/tests/ui/issues/issue-3099.rs b/tests/ui/fn/issue-3099.rs
similarity index 100%
rename from tests/ui/issues/issue-3099.rs
rename to tests/ui/fn/issue-3099.rs
diff --git a/tests/ui/issues/issue-3099.stderr b/tests/ui/fn/issue-3099.stderr
similarity index 100%
rename from tests/ui/issues/issue-3099.stderr
rename to tests/ui/fn/issue-3099.stderr
diff --git a/tests/ui/issues/issue-71584.rs b/tests/ui/inference/issue-71584.rs
similarity index 100%
rename from tests/ui/issues/issue-71584.rs
rename to tests/ui/inference/issue-71584.rs
diff --git a/tests/ui/issues/issue-71584.stderr b/tests/ui/inference/issue-71584.stderr
similarity index 100%
rename from tests/ui/issues/issue-71584.stderr
rename to tests/ui/inference/issue-71584.stderr
diff --git a/tests/ui/issues/issue-2748-a.rs b/tests/ui/issues/issue-2748-a.rs
deleted file mode 100644
index cbb9bcc28ac..00000000000
--- a/tests/ui/issues/issue-2748-a.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// build-pass
-#![allow(dead_code)]
-#![allow(non_snake_case)]
-
-// pretty-expanded FIXME #23616
-
-struct CMap<'a> {
-    buf: &'a [u8],
-}
-
-fn CMap(buf: &[u8]) -> CMap {
-    CMap {
-        buf: buf
-    }
-}
-
-pub fn main() { }
diff --git a/tests/ui/issues/issue-2804-2.rs b/tests/ui/macros/issue-2804-2.rs
similarity index 100%
rename from tests/ui/issues/issue-2804-2.rs
rename to tests/ui/macros/issue-2804-2.rs
diff --git a/tests/ui/issues/issue-30438-a.rs b/tests/ui/nll/issue-30438-a.rs
similarity index 100%
rename from tests/ui/issues/issue-30438-a.rs
rename to tests/ui/nll/issue-30438-a.rs
diff --git a/tests/ui/issues/issue-30438-a.stderr b/tests/ui/nll/issue-30438-a.stderr
similarity index 100%
rename from tests/ui/issues/issue-30438-a.stderr
rename to tests/ui/nll/issue-30438-a.stderr
diff --git a/tests/ui/issues/issue-30438-b.rs b/tests/ui/nll/issue-30438-b.rs
similarity index 100%
rename from tests/ui/issues/issue-30438-b.rs
rename to tests/ui/nll/issue-30438-b.rs
diff --git a/tests/ui/issues/issue-30438-b.stderr b/tests/ui/nll/issue-30438-b.stderr
similarity index 100%
rename from tests/ui/issues/issue-30438-b.stderr
rename to tests/ui/nll/issue-30438-b.stderr
diff --git a/tests/ui/issues/issue-30438-c.rs b/tests/ui/nll/issue-30438-c.rs
similarity index 100%
rename from tests/ui/issues/issue-30438-c.rs
rename to tests/ui/nll/issue-30438-c.rs
diff --git a/tests/ui/issues/issue-30438-c.stderr b/tests/ui/nll/issue-30438-c.stderr
similarity index 100%
rename from tests/ui/issues/issue-30438-c.stderr
rename to tests/ui/nll/issue-30438-c.stderr
diff --git a/tests/ui/issues/issue-54302-cases.rs b/tests/ui/nll/issue-54302-cases.rs
similarity index 100%
rename from tests/ui/issues/issue-54302-cases.rs
rename to tests/ui/nll/issue-54302-cases.rs
diff --git a/tests/ui/issues/issue-54302-cases.stderr b/tests/ui/nll/issue-54302-cases.stderr
similarity index 100%
rename from tests/ui/issues/issue-54302-cases.stderr
rename to tests/ui/nll/issue-54302-cases.stderr
diff --git a/tests/ui/issues/issue-54302.rs b/tests/ui/nll/issue-54302.rs
similarity index 100%
rename from tests/ui/issues/issue-54302.rs
rename to tests/ui/nll/issue-54302.rs
diff --git a/tests/ui/issues/issue-54302.stderr b/tests/ui/nll/issue-54302.stderr
similarity index 100%
rename from tests/ui/issues/issue-54302.stderr
rename to tests/ui/nll/issue-54302.stderr
diff --git a/tests/ui/issues/issue-948.rs b/tests/ui/reachable/issue-948.rs
similarity index 100%
rename from tests/ui/issues/issue-948.rs
rename to tests/ui/reachable/issue-948.rs
diff --git a/tests/ui/issues/issue-3099-a.rs b/tests/ui/resolve/issue-3099-a.rs
similarity index 100%
rename from tests/ui/issues/issue-3099-a.rs
rename to tests/ui/resolve/issue-3099-a.rs
diff --git a/tests/ui/issues/issue-3099-a.stderr b/tests/ui/resolve/issue-3099-a.stderr
similarity index 100%
rename from tests/ui/issues/issue-3099-a.stderr
rename to tests/ui/resolve/issue-3099-a.stderr
diff --git a/tests/ui/issues/issue-3099-b.rs b/tests/ui/resolve/issue-3099-b.rs
similarity index 100%
rename from tests/ui/issues/issue-3099-b.rs
rename to tests/ui/resolve/issue-3099-b.rs
diff --git a/tests/ui/issues/issue-3099-b.stderr b/tests/ui/resolve/issue-3099-b.stderr
similarity index 100%
rename from tests/ui/issues/issue-3099-b.stderr
rename to tests/ui/resolve/issue-3099-b.stderr
diff --git a/tests/ui/issues/issue-12997-1.rs b/tests/ui/test-attrs/issue-12997-1.rs
similarity index 100%
rename from tests/ui/issues/issue-12997-1.rs
rename to tests/ui/test-attrs/issue-12997-1.rs
diff --git a/tests/ui/issues/issue-12997-1.stderr b/tests/ui/test-attrs/issue-12997-1.stderr
similarity index 100%
rename from tests/ui/issues/issue-12997-1.stderr
rename to tests/ui/test-attrs/issue-12997-1.stderr
diff --git a/tests/ui/issues/issue-12997-2.rs b/tests/ui/test-attrs/issue-12997-2.rs
similarity index 100%
rename from tests/ui/issues/issue-12997-2.rs
rename to tests/ui/test-attrs/issue-12997-2.rs
diff --git a/tests/ui/issues/issue-12997-2.stderr b/tests/ui/test-attrs/issue-12997-2.stderr
similarity index 100%
rename from tests/ui/issues/issue-12997-2.stderr
rename to tests/ui/test-attrs/issue-12997-2.stderr
diff --git a/tests/ui/issues/issue-34932.rs b/tests/ui/test-attrs/issue-34932.rs
similarity index 100%
rename from tests/ui/issues/issue-34932.rs
rename to tests/ui/test-attrs/issue-34932.rs