diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 3414924007b90..6a197527a64f0 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 = 1891;
-const ROOT_ENTRY_LIMIT: usize = 866;
+const ISSUES_ENTRY_LIMIT: usize = 1874;
+const ROOT_ENTRY_LIMIT: usize = 865;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
     "rs",     // test source files
diff --git a/tests/ui/issue-2804.rs b/tests/ui/macros/issue-2804.rs
similarity index 100%
rename from tests/ui/issue-2804.rs
rename to tests/ui/macros/issue-2804.rs
diff --git a/tests/ui/issues/issue-17431-6.rs b/tests/ui/structs-enums/enum-rec/issue-17431-6.rs
similarity index 100%
rename from tests/ui/issues/issue-17431-6.rs
rename to tests/ui/structs-enums/enum-rec/issue-17431-6.rs
diff --git a/tests/ui/issues/issue-17431-6.stderr b/tests/ui/structs-enums/enum-rec/issue-17431-6.stderr
similarity index 100%
rename from tests/ui/issues/issue-17431-6.stderr
rename to tests/ui/structs-enums/enum-rec/issue-17431-6.stderr
diff --git a/tests/ui/issues/issue-17431-7.rs b/tests/ui/structs-enums/enum-rec/issue-17431-7.rs
similarity index 100%
rename from tests/ui/issues/issue-17431-7.rs
rename to tests/ui/structs-enums/enum-rec/issue-17431-7.rs
diff --git a/tests/ui/issues/issue-17431-7.stderr b/tests/ui/structs-enums/enum-rec/issue-17431-7.stderr
similarity index 100%
rename from tests/ui/issues/issue-17431-7.stderr
rename to tests/ui/structs-enums/enum-rec/issue-17431-7.stderr
diff --git a/tests/ui/issues/issue-17431-1.rs b/tests/ui/structs-enums/struct-rec/issue-17431-1.rs
similarity index 100%
rename from tests/ui/issues/issue-17431-1.rs
rename to tests/ui/structs-enums/struct-rec/issue-17431-1.rs
diff --git a/tests/ui/issues/issue-17431-1.stderr b/tests/ui/structs-enums/struct-rec/issue-17431-1.stderr
similarity index 100%
rename from tests/ui/issues/issue-17431-1.stderr
rename to tests/ui/structs-enums/struct-rec/issue-17431-1.stderr
diff --git a/tests/ui/issues/issue-17431-2.rs b/tests/ui/structs-enums/struct-rec/issue-17431-2.rs
similarity index 100%
rename from tests/ui/issues/issue-17431-2.rs
rename to tests/ui/structs-enums/struct-rec/issue-17431-2.rs
diff --git a/tests/ui/issues/issue-17431-2.stderr b/tests/ui/structs-enums/struct-rec/issue-17431-2.stderr
similarity index 100%
rename from tests/ui/issues/issue-17431-2.stderr
rename to tests/ui/structs-enums/struct-rec/issue-17431-2.stderr
diff --git a/tests/ui/issues/issue-17431-3.rs b/tests/ui/structs-enums/struct-rec/issue-17431-3.rs
similarity index 100%
rename from tests/ui/issues/issue-17431-3.rs
rename to tests/ui/structs-enums/struct-rec/issue-17431-3.rs
diff --git a/tests/ui/issues/issue-17431-3.stderr b/tests/ui/structs-enums/struct-rec/issue-17431-3.stderr
similarity index 100%
rename from tests/ui/issues/issue-17431-3.stderr
rename to tests/ui/structs-enums/struct-rec/issue-17431-3.stderr
diff --git a/tests/ui/issues/issue-17431-4.rs b/tests/ui/structs-enums/struct-rec/issue-17431-4.rs
similarity index 100%
rename from tests/ui/issues/issue-17431-4.rs
rename to tests/ui/structs-enums/struct-rec/issue-17431-4.rs
diff --git a/tests/ui/issues/issue-17431-4.stderr b/tests/ui/structs-enums/struct-rec/issue-17431-4.stderr
similarity index 100%
rename from tests/ui/issues/issue-17431-4.stderr
rename to tests/ui/structs-enums/struct-rec/issue-17431-4.stderr
diff --git a/tests/ui/issues/issue-17431-5.rs b/tests/ui/structs-enums/struct-rec/issue-17431-5.rs
similarity index 100%
rename from tests/ui/issues/issue-17431-5.rs
rename to tests/ui/structs-enums/struct-rec/issue-17431-5.rs
diff --git a/tests/ui/issues/issue-17431-5.stderr b/tests/ui/structs-enums/struct-rec/issue-17431-5.stderr
similarity index 100%
rename from tests/ui/issues/issue-17431-5.stderr
rename to tests/ui/structs-enums/struct-rec/issue-17431-5.stderr
diff --git a/tests/ui/issues/issue-66768.rs b/tests/ui/traits/issue-66768.rs
similarity index 100%
rename from tests/ui/issues/issue-66768.rs
rename to tests/ui/traits/issue-66768.rs
diff --git a/tests/ui/issues/auxiliary/issue-29181.rs b/tests/ui/typeck/auxiliary/issue-29181.rs
similarity index 100%
rename from tests/ui/issues/auxiliary/issue-29181.rs
rename to tests/ui/typeck/auxiliary/issue-29181.rs
diff --git a/tests/ui/issues/issue-29181.rs b/tests/ui/typeck/issue-29181.rs
similarity index 100%
rename from tests/ui/issues/issue-29181.rs
rename to tests/ui/typeck/issue-29181.rs
diff --git a/tests/ui/issues/issue-29181.stderr b/tests/ui/typeck/issue-29181.stderr
similarity index 100%
rename from tests/ui/issues/issue-29181.stderr
rename to tests/ui/typeck/issue-29181.stderr