diff --git a/src/test/ui/issues/issue-80512-param-reordering-with-defaults.rs b/src/test/ui/generics/issue-80512-param-reordering-with-defaults.rs
similarity index 100%
rename from src/test/ui/issues/issue-80512-param-reordering-with-defaults.rs
rename to src/test/ui/generics/issue-80512-param-reordering-with-defaults.rs
diff --git a/src/test/ui/issues/issue-80512-param-reordering-with-defaults.stderr b/src/test/ui/generics/issue-80512-param-reordering-with-defaults.stderr
similarity index 100%
rename from src/test/ui/issues/issue-80512-param-reordering-with-defaults.stderr
rename to src/test/ui/generics/issue-80512-param-reordering-with-defaults.stderr
diff --git a/src/test/ui/issues/issue-1866.rs b/src/test/ui/lint/issue-1866.rs
similarity index 100%
rename from src/test/ui/issues/issue-1866.rs
rename to src/test/ui/lint/issue-1866.rs
diff --git a/src/test/ui/issues/issue-1866.stderr b/src/test/ui/lint/issue-1866.stderr
similarity index 100%
rename from src/test/ui/issues/issue-1866.stderr
rename to src/test/ui/lint/issue-1866.stderr
diff --git a/src/test/ui/issues/issue-20343.rs b/src/test/ui/lint/issue-20343.rs
similarity index 100%
rename from src/test/ui/issues/issue-20343.rs
rename to src/test/ui/lint/issue-20343.rs
diff --git a/src/test/ui/issues/issue-41776.rs b/src/test/ui/macros/issue-41776.rs
similarity index 100%
rename from src/test/ui/issues/issue-41776.rs
rename to src/test/ui/macros/issue-41776.rs
diff --git a/src/test/ui/issues/issue-41776.stderr b/src/test/ui/macros/issue-41776.stderr
similarity index 100%
rename from src/test/ui/issues/issue-41776.stderr
rename to src/test/ui/macros/issue-41776.stderr
diff --git a/src/test/ui/issues/issue-44127.rs b/src/test/ui/macros/issue-44127.rs
similarity index 100%
rename from src/test/ui/issues/issue-44127.rs
rename to src/test/ui/macros/issue-44127.rs
diff --git a/src/test/ui/issues/issue-61858.rs b/src/test/ui/parser/issue-61858.rs
similarity index 100%
rename from src/test/ui/issues/issue-61858.rs
rename to src/test/ui/parser/issue-61858.rs
diff --git a/src/test/ui/issues/issue-61858.stderr b/src/test/ui/parser/issue-61858.stderr
similarity index 100%
rename from src/test/ui/issues/issue-61858.stderr
rename to src/test/ui/parser/issue-61858.stderr
diff --git a/src/test/ui/issues/issue-53692.rs b/src/test/ui/suggestions/issue-53692.rs
similarity index 100%
rename from src/test/ui/issues/issue-53692.rs
rename to src/test/ui/suggestions/issue-53692.rs
diff --git a/src/test/ui/issues/issue-53692.stderr b/src/test/ui/suggestions/issue-53692.stderr
similarity index 100%
rename from src/test/ui/issues/issue-53692.stderr
rename to src/test/ui/suggestions/issue-53692.stderr
diff --git a/src/test/ui/issues/issue-29488.rs b/src/test/ui/threads-sendsync/issue-29488.rs
similarity index 100%
rename from src/test/ui/issues/issue-29488.rs
rename to src/test/ui/threads-sendsync/issue-29488.rs
diff --git a/src/test/ui/issues/issue-43132.rs b/src/test/ui/traits/issue-43132.rs
similarity index 100%
rename from src/test/ui/issues/issue-43132.rs
rename to src/test/ui/traits/issue-43132.rs
diff --git a/src/test/ui/issues/issue-71036.rs b/src/test/ui/traits/issue-71036.rs
similarity index 100%
rename from src/test/ui/issues/issue-71036.rs
rename to src/test/ui/traits/issue-71036.rs
diff --git a/src/test/ui/issues/issue-71036.stderr b/src/test/ui/traits/issue-71036.stderr
similarity index 100%
rename from src/test/ui/issues/issue-71036.stderr
rename to src/test/ui/traits/issue-71036.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 63a8909c6627a..d823b412c5992 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -8,7 +8,7 @@ use std::path::Path;
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
 const ROOT_ENTRY_LIMIT: usize = 986;
-const ISSUES_ENTRY_LIMIT: usize = 2310;
+const ISSUES_ENTRY_LIMIT: usize = 2292;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))