diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index ef3abb9514f..409f7563184 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -10,7 +10,7 @@ use std::path::Path;
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
 const ROOT_ENTRY_LIMIT: usize = 940;
-const ISSUES_ENTRY_LIMIT: usize = 2001;
+const ISSUES_ENTRY_LIMIT: usize = 1978;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     for dir in Walk::new(&path.join("ui")) {
diff --git a/tests/ui/issues/issue-38821.rs b/tests/ui/associated-types/issue-38821.rs
similarity index 100%
rename from tests/ui/issues/issue-38821.rs
rename to tests/ui/associated-types/issue-38821.rs
diff --git a/tests/ui/issues/issue-38821.stderr b/tests/ui/associated-types/issue-38821.stderr
similarity index 100%
rename from tests/ui/issues/issue-38821.stderr
rename to tests/ui/associated-types/issue-38821.stderr
diff --git a/tests/ui/issues/issue-83924.fixed b/tests/ui/borrowck/issue-83924.fixed
similarity index 100%
rename from tests/ui/issues/issue-83924.fixed
rename to tests/ui/borrowck/issue-83924.fixed
diff --git a/tests/ui/issues/issue-83924.rs b/tests/ui/borrowck/issue-83924.rs
similarity index 100%
rename from tests/ui/issues/issue-83924.rs
rename to tests/ui/borrowck/issue-83924.rs
diff --git a/tests/ui/issues/issue-83924.stderr b/tests/ui/borrowck/issue-83924.stderr
similarity index 100%
rename from tests/ui/issues/issue-83924.stderr
rename to tests/ui/borrowck/issue-83924.stderr
diff --git a/tests/ui/issues/issue-33903.rs b/tests/ui/consts/issue-33903.rs
similarity index 100%
rename from tests/ui/issues/issue-33903.rs
rename to tests/ui/consts/issue-33903.rs
diff --git a/tests/ui/issues/issue-54582.rs b/tests/ui/consts/issue-54582.rs
similarity index 100%
rename from tests/ui/issues/issue-54582.rs
rename to tests/ui/consts/issue-54582.rs
diff --git a/tests/ui/issues/issue-2735-2.rs b/tests/ui/drop/issue-2735-2.rs
similarity index 100%
rename from tests/ui/issues/issue-2735-2.rs
rename to tests/ui/drop/issue-2735-2.rs
diff --git a/tests/ui/issues/issue-2735-3.rs b/tests/ui/drop/issue-2735-3.rs
similarity index 100%
rename from tests/ui/issues/issue-2735-3.rs
rename to tests/ui/drop/issue-2735-3.rs
diff --git a/tests/ui/issues/issue-2735.rs b/tests/ui/drop/issue-2735.rs
similarity index 100%
rename from tests/ui/issues/issue-2735.rs
rename to tests/ui/drop/issue-2735.rs
diff --git a/tests/ui/issues/issue-75307.rs b/tests/ui/fmt/issue-75307.rs
similarity index 100%
rename from tests/ui/issues/issue-75307.rs
rename to tests/ui/fmt/issue-75307.rs
diff --git a/tests/ui/issues/issue-75307.stderr b/tests/ui/fmt/issue-75307.stderr
similarity index 100%
rename from tests/ui/issues/issue-75307.stderr
rename to tests/ui/fmt/issue-75307.stderr
diff --git a/tests/ui/issues/issue-39292.rs b/tests/ui/higher-rank-trait-bounds/issue-39292.rs
similarity index 100%
rename from tests/ui/issues/issue-39292.rs
rename to tests/ui/higher-rank-trait-bounds/issue-39292.rs
diff --git a/tests/ui/issues/issue-50576.rs b/tests/ui/loops/issue-50576.rs
similarity index 100%
rename from tests/ui/issues/issue-50576.rs
rename to tests/ui/loops/issue-50576.rs
diff --git a/tests/ui/issues/issue-50576.stderr b/tests/ui/loops/issue-50576.stderr
similarity index 100%
rename from tests/ui/issues/issue-50576.stderr
rename to tests/ui/loops/issue-50576.stderr
diff --git a/tests/ui/issues/issue-22536-copy-mustnt-zero.rs b/tests/ui/moves/issue-22536-copy-mustnt-zero.rs
similarity index 100%
rename from tests/ui/issues/issue-22536-copy-mustnt-zero.rs
rename to tests/ui/moves/issue-22536-copy-mustnt-zero.rs
diff --git a/tests/ui/issues/issue-27583.rs b/tests/ui/nll/issue-27583.rs
similarity index 100%
rename from tests/ui/issues/issue-27583.rs
rename to tests/ui/nll/issue-27583.rs
diff --git a/tests/ui/issues/issue-48179.rs b/tests/ui/nll/issue-48179.rs
similarity index 100%
rename from tests/ui/issues/issue-48179.rs
rename to tests/ui/nll/issue-48179.rs
diff --git a/tests/ui/issues/issue-75777.rs b/tests/ui/nll/issue-75777.rs
similarity index 100%
rename from tests/ui/issues/issue-75777.rs
rename to tests/ui/nll/issue-75777.rs
diff --git a/tests/ui/issues/issue-75777.stderr b/tests/ui/nll/issue-75777.stderr
similarity index 100%
rename from tests/ui/issues/issue-75777.stderr
rename to tests/ui/nll/issue-75777.stderr
diff --git a/tests/ui/issues/issue-40003.rs b/tests/ui/recursion_limit/issue-40003.rs
similarity index 100%
rename from tests/ui/issues/issue-40003.rs
rename to tests/ui/recursion_limit/issue-40003.rs
diff --git a/tests/ui/issues/issue-53712.rs b/tests/ui/typeck/issue-53712.rs
similarity index 100%
rename from tests/ui/issues/issue-53712.rs
rename to tests/ui/typeck/issue-53712.rs
diff --git a/tests/ui/issues/issue-53712.stderr b/tests/ui/typeck/issue-53712.stderr
similarity index 100%
rename from tests/ui/issues/issue-53712.stderr
rename to tests/ui/typeck/issue-53712.stderr
diff --git a/tests/ui/issues/issue-7813.rs b/tests/ui/typeck/issue-7813.rs
similarity index 100%
rename from tests/ui/issues/issue-7813.rs
rename to tests/ui/typeck/issue-7813.rs
diff --git a/tests/ui/issues/issue-7813.stderr b/tests/ui/typeck/issue-7813.stderr
similarity index 100%
rename from tests/ui/issues/issue-7813.stderr
rename to tests/ui/typeck/issue-7813.stderr