diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 6a197527a64f0..2b828e58d5418 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, PathBuf};
 
 const ENTRY_LIMIT: usize = 900;
 // FIXME: The following limits should be reduced eventually.
-const ISSUES_ENTRY_LIMIT: usize = 1874;
+const ISSUES_ENTRY_LIMIT: usize = 1854;
 const ROOT_ENTRY_LIMIT: usize = 865;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
diff --git a/tests/ui/issues/issue-32323.rs b/tests/ui/associated-types/issue-32323.rs
similarity index 100%
rename from tests/ui/issues/issue-32323.rs
rename to tests/ui/associated-types/issue-32323.rs
diff --git a/tests/ui/issues/issue-32323.stderr b/tests/ui/associated-types/issue-32323.stderr
similarity index 100%
rename from tests/ui/issues/issue-32323.stderr
rename to tests/ui/associated-types/issue-32323.stderr
diff --git a/tests/ui/issues/issue-11873.rs b/tests/ui/closures/issue-11873.rs
similarity index 100%
rename from tests/ui/issues/issue-11873.rs
rename to tests/ui/closures/issue-11873.rs
diff --git a/tests/ui/issues/issue-11873.stderr b/tests/ui/closures/issue-11873.stderr
similarity index 100%
rename from tests/ui/issues/issue-11873.stderr
rename to tests/ui/closures/issue-11873.stderr
diff --git a/tests/ui/issues/issue-25439.rs b/tests/ui/closures/issue-25439.rs
similarity index 100%
rename from tests/ui/issues/issue-25439.rs
rename to tests/ui/closures/issue-25439.rs
diff --git a/tests/ui/issues/issue-25439.stderr b/tests/ui/closures/issue-25439.stderr
similarity index 100%
rename from tests/ui/issues/issue-25439.stderr
rename to tests/ui/closures/issue-25439.stderr
diff --git a/tests/ui/issues/issue-69225-SCEVAddExpr-wrap-flag.rs b/tests/ui/loops/issue-69225-SCEVAddExpr-wrap-flag.rs
similarity index 100%
rename from tests/ui/issues/issue-69225-SCEVAddExpr-wrap-flag.rs
rename to tests/ui/loops/issue-69225-SCEVAddExpr-wrap-flag.rs
diff --git a/tests/ui/issues/issue-69225-layout-repeated-checked-add.rs b/tests/ui/loops/issue-69225-layout-repeated-checked-add.rs
similarity index 100%
rename from tests/ui/issues/issue-69225-layout-repeated-checked-add.rs
rename to tests/ui/loops/issue-69225-layout-repeated-checked-add.rs
diff --git a/tests/ui/issues/issue-39467.rs b/tests/ui/macros/issue-39467.rs
similarity index 100%
rename from tests/ui/issues/issue-39467.rs
rename to tests/ui/macros/issue-39467.rs
diff --git a/tests/ui/issues/issue-3707.rs b/tests/ui/methods/issue-3707.rs
similarity index 100%
rename from tests/ui/issues/issue-3707.rs
rename to tests/ui/methods/issue-3707.rs
diff --git a/tests/ui/issues/issue-3707.stderr b/tests/ui/methods/issue-3707.stderr
similarity index 100%
rename from tests/ui/issues/issue-3707.stderr
rename to tests/ui/methods/issue-3707.stderr
diff --git a/tests/ui/issues/issue-13033.rs b/tests/ui/mismatched_types/issue-13033.rs
similarity index 100%
rename from tests/ui/issues/issue-13033.rs
rename to tests/ui/mismatched_types/issue-13033.rs
diff --git a/tests/ui/issues/issue-13033.stderr b/tests/ui/mismatched_types/issue-13033.stderr
similarity index 100%
rename from tests/ui/issues/issue-13033.stderr
rename to tests/ui/mismatched_types/issue-13033.stderr
diff --git a/tests/ui/issues/issue-34721.fixed b/tests/ui/moves/issue-34721.fixed
similarity index 100%
rename from tests/ui/issues/issue-34721.fixed
rename to tests/ui/moves/issue-34721.fixed
diff --git a/tests/ui/issues/issue-34721.rs b/tests/ui/moves/issue-34721.rs
similarity index 100%
rename from tests/ui/issues/issue-34721.rs
rename to tests/ui/moves/issue-34721.rs
diff --git a/tests/ui/issues/issue-34721.stderr b/tests/ui/moves/issue-34721.stderr
similarity index 100%
rename from tests/ui/issues/issue-34721.stderr
rename to tests/ui/moves/issue-34721.stderr
diff --git a/tests/ui/issues/issue-6642.rs b/tests/ui/resolve/issue-6642.rs
similarity index 100%
rename from tests/ui/issues/issue-6642.rs
rename to tests/ui/resolve/issue-6642.rs
diff --git a/tests/ui/issues/issue-6642.stderr b/tests/ui/resolve/issue-6642.stderr
similarity index 100%
rename from tests/ui/issues/issue-6642.stderr
rename to tests/ui/resolve/issue-6642.stderr
diff --git a/tests/ui/issues/issue-32709.rs b/tests/ui/try-trait/issue-32709.rs
similarity index 100%
rename from tests/ui/issues/issue-32709.rs
rename to tests/ui/try-trait/issue-32709.rs
diff --git a/tests/ui/issues/issue-32709.stderr b/tests/ui/try-trait/issue-32709.stderr
similarity index 100%
rename from tests/ui/issues/issue-32709.stderr
rename to tests/ui/try-trait/issue-32709.stderr