diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index be3a5d3aa0f03..3e9bf18a28711 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -10,8 +10,8 @@ use std::path::{Path, PathBuf};
 
 const ENTRY_LIMIT: usize = 900;
 // FIXME: The following limits should be reduced eventually.
-const ISSUES_ENTRY_LIMIT: usize = 1920;
-const ROOT_ENTRY_LIMIT: usize = 896;
+const ISSUES_ENTRY_LIMIT: usize = 1898;
+const ROOT_ENTRY_LIMIT: usize = 894;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
     "rs",     // test source files
diff --git a/tests/ui/issues/issue-78115.rs b/tests/ui/async-await/issue-78115.rs
similarity index 100%
rename from tests/ui/issues/issue-78115.rs
rename to tests/ui/async-await/issue-78115.rs
diff --git a/tests/ui/issues/issue-3794.rs b/tests/ui/coercion/issue-3794.rs
similarity index 100%
rename from tests/ui/issues/issue-3794.rs
rename to tests/ui/coercion/issue-3794.rs
diff --git a/tests/ui/issues/issue-16538.mir.stderr b/tests/ui/consts/issue-16538.mir.stderr
similarity index 100%
rename from tests/ui/issues/issue-16538.mir.stderr
rename to tests/ui/consts/issue-16538.mir.stderr
diff --git a/tests/ui/issues/issue-16538.rs b/tests/ui/consts/issue-16538.rs
similarity index 100%
rename from tests/ui/issues/issue-16538.rs
rename to tests/ui/consts/issue-16538.rs
diff --git a/tests/ui/issues/issue-16538.thir.stderr b/tests/ui/consts/issue-16538.thir.stderr
similarity index 100%
rename from tests/ui/issues/issue-16538.thir.stderr
rename to tests/ui/consts/issue-16538.thir.stderr
diff --git a/tests/ui/issues/issue-28822.rs b/tests/ui/consts/issue-28822.rs
similarity index 100%
rename from tests/ui/issues/issue-28822.rs
rename to tests/ui/consts/issue-28822.rs
diff --git a/tests/ui/issues/issue-29798.rs b/tests/ui/consts/issue-29798.rs
similarity index 100%
rename from tests/ui/issues/issue-29798.rs
rename to tests/ui/consts/issue-29798.rs
diff --git a/tests/ui/issues/issue-50689.rs b/tests/ui/enum-discriminant/issue-50689.rs
similarity index 100%
rename from tests/ui/issues/issue-50689.rs
rename to tests/ui/enum-discriminant/issue-50689.rs
diff --git a/tests/ui/issues/issue-1251.rs b/tests/ui/extern/issue-1251.rs
similarity index 100%
rename from tests/ui/issues/issue-1251.rs
rename to tests/ui/extern/issue-1251.rs
diff --git a/tests/ui/issues/issue-1257.rs b/tests/ui/for-loop-while/issue-1257.rs
similarity index 100%
rename from tests/ui/issues/issue-1257.rs
rename to tests/ui/for-loop-while/issue-1257.rs
diff --git a/tests/ui/issue-94866.rs b/tests/ui/pattern/issue-94866.rs
similarity index 100%
rename from tests/ui/issue-94866.rs
rename to tests/ui/pattern/issue-94866.rs
diff --git a/tests/ui/issue-94866.stderr b/tests/ui/pattern/issue-94866.stderr
similarity index 100%
rename from tests/ui/issue-94866.stderr
rename to tests/ui/pattern/issue-94866.stderr
diff --git a/tests/ui/issues/issue-3008-1.rs b/tests/ui/structs-enums/issue-3008-1.rs
similarity index 100%
rename from tests/ui/issues/issue-3008-1.rs
rename to tests/ui/structs-enums/issue-3008-1.rs
diff --git a/tests/ui/issues/issue-3008-1.stderr b/tests/ui/structs-enums/issue-3008-1.stderr
similarity index 100%
rename from tests/ui/issues/issue-3008-1.stderr
rename to tests/ui/structs-enums/issue-3008-1.stderr
diff --git a/tests/ui/issues/issue-3008-2.rs b/tests/ui/structs-enums/issue-3008-2.rs
similarity index 100%
rename from tests/ui/issues/issue-3008-2.rs
rename to tests/ui/structs-enums/issue-3008-2.rs
diff --git a/tests/ui/issues/issue-3008-2.stderr b/tests/ui/structs-enums/issue-3008-2.stderr
similarity index 100%
rename from tests/ui/issues/issue-3008-2.stderr
rename to tests/ui/structs-enums/issue-3008-2.stderr
diff --git a/tests/ui/issues/issue-3008-3.rs b/tests/ui/structs-enums/issue-3008-3.rs
similarity index 100%
rename from tests/ui/issues/issue-3008-3.rs
rename to tests/ui/structs-enums/issue-3008-3.rs
diff --git a/tests/ui/issues/issue-3008-3.stderr b/tests/ui/structs-enums/issue-3008-3.stderr
similarity index 100%
rename from tests/ui/issues/issue-3008-3.stderr
rename to tests/ui/structs-enums/issue-3008-3.stderr
diff --git a/tests/ui/issues/issue-1871.rs b/tests/ui/typeck/issue-1871.rs
similarity index 100%
rename from tests/ui/issues/issue-1871.rs
rename to tests/ui/typeck/issue-1871.rs
diff --git a/tests/ui/issues/issue-1871.stderr b/tests/ui/typeck/issue-1871.stderr
similarity index 100%
rename from tests/ui/issues/issue-1871.stderr
rename to tests/ui/typeck/issue-1871.stderr
diff --git a/tests/ui/issues/issue-2063-resource.rs b/tests/ui/typeck/issue-2063-resource.rs
similarity index 100%
rename from tests/ui/issues/issue-2063-resource.rs
rename to tests/ui/typeck/issue-2063-resource.rs
diff --git a/tests/ui/issues/issue-2063.rs b/tests/ui/typeck/issue-2063.rs
similarity index 100%
rename from tests/ui/issues/issue-2063.rs
rename to tests/ui/typeck/issue-2063.rs
diff --git a/tests/ui/issues/issue-50825-1.rs b/tests/ui/where-clauses/issue-50825-1.rs
similarity index 100%
rename from tests/ui/issues/issue-50825-1.rs
rename to tests/ui/where-clauses/issue-50825-1.rs
diff --git a/tests/ui/issues/issue-50825.rs b/tests/ui/where-clauses/issue-50825.rs
similarity index 100%
rename from tests/ui/issues/issue-50825.rs
rename to tests/ui/where-clauses/issue-50825.rs