diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 03f8a701627..1dbd221fde5 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -14,7 +14,7 @@
 // #73494.
 const ENTRY_LIMIT: usize = 900;
 // FIXME: The following limits should be reduced eventually.
-const ISSUES_ENTRY_LIMIT: usize = 1794;
+const ISSUES_ENTRY_LIMIT: usize = 1781;
 const ROOT_ENTRY_LIMIT: usize = 870;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
diff --git a/tests/ui/issues/issue-10682.rs b/tests/ui/closures/issue-10682.rs
similarity index 100%
rename from tests/ui/issues/issue-10682.rs
rename to tests/ui/closures/issue-10682.rs
diff --git a/tests/ui/issues/issue-44255.rs b/tests/ui/consts/issue-44255.rs
similarity index 100%
rename from tests/ui/issues/issue-44255.rs
rename to tests/ui/consts/issue-44255.rs
diff --git a/tests/ui/issues/issue-18576.rs b/tests/ui/extern/issue-18576.rs
similarity index 100%
rename from tests/ui/issues/issue-18576.rs
rename to tests/ui/extern/issue-18576.rs
diff --git a/tests/ui/issues/issue-18819.rs b/tests/ui/extern/issue-18819.rs
similarity index 100%
rename from tests/ui/issues/issue-18819.rs
rename to tests/ui/extern/issue-18819.rs
diff --git a/tests/ui/issues/issue-18819.stderr b/tests/ui/extern/issue-18819.stderr
similarity index 100%
rename from tests/ui/issues/issue-18819.stderr
rename to tests/ui/extern/issue-18819.stderr
diff --git a/tests/ui/issues/issue-23781.rs b/tests/ui/fmt/issue-23781.rs
similarity index 100%
rename from tests/ui/issues/issue-23781.rs
rename to tests/ui/fmt/issue-23781.rs
diff --git a/tests/ui/issues/issue-29746.rs b/tests/ui/hygiene/issue-29746.rs
similarity index 100%
rename from tests/ui/issues/issue-29746.rs
rename to tests/ui/hygiene/issue-29746.rs
diff --git a/tests/ui/issues/issue-12028.rs b/tests/ui/inference/issue-12028.rs
similarity index 100%
rename from tests/ui/issues/issue-12028.rs
rename to tests/ui/inference/issue-12028.rs
diff --git a/tests/ui/issues/issue-12028.stderr b/tests/ui/inference/issue-12028.stderr
similarity index 100%
rename from tests/ui/issues/issue-12028.stderr
rename to tests/ui/inference/issue-12028.stderr
diff --git a/tests/ui/issues/issue-19707.rs b/tests/ui/lifetimes/issue-19707.rs
similarity index 100%
rename from tests/ui/issues/issue-19707.rs
rename to tests/ui/lifetimes/issue-19707.rs
diff --git a/tests/ui/issues/issue-19707.stderr b/tests/ui/lifetimes/issue-19707.stderr
similarity index 100%
rename from tests/ui/issues/issue-19707.stderr
rename to tests/ui/lifetimes/issue-19707.stderr
diff --git a/tests/ui/issues/issue-19102.rs b/tests/ui/lint/issue-19102.rs
similarity index 100%
rename from tests/ui/issues/issue-19102.rs
rename to tests/ui/lint/issue-19102.rs
diff --git a/tests/ui/issues/issue-5008-borrowed-traitobject-method-call.rs b/tests/ui/traits/issue-5008-borrowed-traitobject-method-call.rs
similarity index 100%
rename from tests/ui/issues/issue-5008-borrowed-traitobject-method-call.rs
rename to tests/ui/traits/issue-5008-borrowed-traitobject-method-call.rs