diff --git a/src/test/ui/issues/issue-20825-2.rs b/src/test/ui/associated-types/issue-20825-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-20825-2.rs
rename to src/test/ui/associated-types/issue-20825-2.rs
diff --git a/src/test/ui/issues/issue-20825.rs b/src/test/ui/associated-types/issue-20825.rs
similarity index 100%
rename from src/test/ui/issues/issue-20825.rs
rename to src/test/ui/associated-types/issue-20825.rs
diff --git a/src/test/ui/issues/issue-20825.stderr b/src/test/ui/associated-types/issue-20825.stderr
similarity index 100%
rename from src/test/ui/issues/issue-20825.stderr
rename to src/test/ui/associated-types/issue-20825.stderr
diff --git a/src/test/ui/issues/issue-32922.rs b/src/test/ui/hygiene/issue-32922.rs
similarity index 100%
rename from src/test/ui/issues/issue-32922.rs
rename to src/test/ui/hygiene/issue-32922.rs
diff --git a/src/test/ui/issues/issue-46959.rs b/src/test/ui/impl-trait/issue-46959.rs
similarity index 100%
rename from src/test/ui/issues/issue-46959.rs
rename to src/test/ui/impl-trait/issue-46959.rs
diff --git a/src/test/ui/issues/issue-33185.rs b/src/test/ui/macros/issue-33185.rs
similarity index 100%
rename from src/test/ui/issues/issue-33185.rs
rename to src/test/ui/macros/issue-33185.rs
diff --git a/src/test/ui/issues/issue-27021.rs b/src/test/ui/match/issue-27021.rs
similarity index 100%
rename from src/test/ui/issues/issue-27021.rs
rename to src/test/ui/match/issue-27021.rs
diff --git a/src/test/ui/issues/issue-27320.rs b/src/test/ui/pattern/issue-27320.rs
similarity index 100%
rename from src/test/ui/issues/issue-27320.rs
rename to src/test/ui/pattern/issue-27320.rs
diff --git a/src/test/ui/issues/issue-13304.rs b/src/test/ui/process/issue-13304.rs
similarity index 100%
rename from src/test/ui/issues/issue-13304.rs
rename to src/test/ui/process/issue-13304.rs
diff --git a/src/test/ui/issues/issue-26459.rs b/src/test/ui/save-analysis/issue-26459.rs
similarity index 100%
rename from src/test/ui/issues/issue-26459.rs
rename to src/test/ui/save-analysis/issue-26459.rs
diff --git a/src/test/ui/issues/issue-26459.stderr b/src/test/ui/save-analysis/issue-26459.stderr
similarity index 100%
rename from src/test/ui/issues/issue-26459.stderr
rename to src/test/ui/save-analysis/issue-26459.stderr
diff --git a/src/test/ui/issues/auxiliary/issue-36708.rs b/src/test/ui/typeck/auxiliary/issue-36708.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-36708.rs
rename to src/test/ui/typeck/auxiliary/issue-36708.rs
diff --git a/src/test/ui/issues/issue-36708.rs b/src/test/ui/typeck/issue-36708.rs
similarity index 100%
rename from src/test/ui/issues/issue-36708.rs
rename to src/test/ui/typeck/issue-36708.rs
diff --git a/src/test/ui/issues/issue-36708.stderr b/src/test/ui/typeck/issue-36708.stderr
similarity index 100%
rename from src/test/ui/issues/issue-36708.stderr
rename to src/test/ui/typeck/issue-36708.stderr
diff --git a/src/test/ui/issues/issue-40231-1.rs b/src/test/ui/unsized/issue-40231-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-40231-1.rs
rename to src/test/ui/unsized/issue-40231-1.rs
diff --git a/src/test/ui/issues/issue-40231-2.rs b/src/test/ui/unsized/issue-40231-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-40231-2.rs
rename to src/test/ui/unsized/issue-40231-2.rs
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 5712e84adbc20..cf72dc4bd09a3 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,8 +7,8 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 974;
-const ISSUES_ENTRY_LIMIT: usize = 2248;
+const ROOT_ENTRY_LIMIT: usize = 971;
+const ISSUES_ENTRY_LIMIT: usize = 2234;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))