diff --git a/src/test/ui/issues/issue-46519.rs b/src/test/ui/enum-discriminant/issue-46519.rs
similarity index 100%
rename from src/test/ui/issues/issue-46519.rs
rename to src/test/ui/enum-discriminant/issue-46519.rs
diff --git a/src/test/ui/issues/issue-36139-normalize-closure-sig.rs b/src/test/ui/higher-rank-trait-bounds/issue-36139-normalize-closure-sig.rs
similarity index 100%
rename from src/test/ui/issues/issue-36139-normalize-closure-sig.rs
rename to src/test/ui/higher-rank-trait-bounds/issue-36139-normalize-closure-sig.rs
diff --git a/src/test/ui/issues/issue-43623.rs b/src/test/ui/higher-rank-trait-bounds/issue-43623.rs
similarity index 100%
rename from src/test/ui/issues/issue-43623.rs
rename to src/test/ui/higher-rank-trait-bounds/issue-43623.rs
diff --git a/src/test/ui/issues/issue-52240.rs b/src/test/ui/pattern/issue-52240.rs
similarity index 100%
rename from src/test/ui/issues/issue-52240.rs
rename to src/test/ui/pattern/issue-52240.rs
diff --git a/src/test/ui/issues/issue-52240.stderr b/src/test/ui/pattern/issue-52240.stderr
similarity index 100%
rename from src/test/ui/issues/issue-52240.stderr
rename to src/test/ui/pattern/issue-52240.stderr
diff --git a/src/test/ui/issues/auxiliary/issue-75907.rs b/src/test/ui/privacy/auxiliary/issue-75907.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-75907.rs
rename to src/test/ui/privacy/auxiliary/issue-75907.rs
diff --git a/src/test/ui/issues/issue-75907.rs b/src/test/ui/privacy/issue-75907.rs
similarity index 100%
rename from src/test/ui/issues/issue-75907.rs
rename to src/test/ui/privacy/issue-75907.rs
diff --git a/src/test/ui/issues/issue-75907.stderr b/src/test/ui/privacy/issue-75907.stderr
similarity index 100%
rename from src/test/ui/issues/issue-75907.stderr
rename to src/test/ui/privacy/issue-75907.stderr
diff --git a/src/test/ui/issues/issue-75907_b.rs b/src/test/ui/privacy/issue-75907_b.rs
similarity index 100%
rename from src/test/ui/issues/issue-75907_b.rs
rename to src/test/ui/privacy/issue-75907_b.rs
diff --git a/src/test/ui/issues/issue-75907_b.stderr b/src/test/ui/privacy/issue-75907_b.stderr
similarity index 100%
rename from src/test/ui/issues/issue-75907_b.stderr
rename to src/test/ui/privacy/issue-75907_b.stderr
diff --git a/src/test/ui/issues/issue-11612.rs b/src/test/ui/regions/issue-11612.rs
similarity index 100%
rename from src/test/ui/issues/issue-11612.rs
rename to src/test/ui/regions/issue-11612.rs
diff --git a/src/test/ui/issues/issue-35675.rs b/src/test/ui/resolve/issue-35675.rs
similarity index 100%
rename from src/test/ui/issues/issue-35675.rs
rename to src/test/ui/resolve/issue-35675.rs
diff --git a/src/test/ui/issues/issue-35675.stderr b/src/test/ui/resolve/issue-35675.stderr
similarity index 100%
rename from src/test/ui/issues/issue-35675.stderr
rename to src/test/ui/resolve/issue-35675.stderr
diff --git a/src/test/ui/issues/issue-5927.rs b/src/test/ui/resolve/issue-5927.rs
similarity index 100%
rename from src/test/ui/issues/issue-5927.rs
rename to src/test/ui/resolve/issue-5927.rs
diff --git a/src/test/ui/issues/issue-5927.stderr b/src/test/ui/resolve/issue-5927.stderr
similarity index 100%
rename from src/test/ui/issues/issue-5927.stderr
rename to src/test/ui/resolve/issue-5927.stderr
diff --git a/src/test/ui/issues/issue-5216.rs b/src/test/ui/static/issue-5216.rs
similarity index 100%
rename from src/test/ui/issues/issue-5216.rs
rename to src/test/ui/static/issue-5216.rs
diff --git a/src/test/ui/issues/issue-5216.stderr b/src/test/ui/static/issue-5216.stderr
similarity index 100%
rename from src/test/ui/issues/issue-5216.stderr
rename to src/test/ui/static/issue-5216.stderr
diff --git a/src/test/ui/issues/issue-7013.rs b/src/test/ui/traits/issue-7013.rs
similarity index 100%
rename from src/test/ui/issues/issue-7013.rs
rename to src/test/ui/traits/issue-7013.rs
diff --git a/src/test/ui/issues/issue-7013.stderr b/src/test/ui/traits/issue-7013.stderr
similarity index 100%
rename from src/test/ui/issues/issue-7013.stderr
rename to src/test/ui/traits/issue-7013.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 2b82e9b3f998c..21c6a96747eef 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 = 939;
-const ISSUES_ENTRY_LIMIT: usize = 2105;
+const ISSUES_ENTRY_LIMIT: usize = 2085;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     for dir in Walk::new(&path.join("test/ui")) {