diff --git a/src/test/ui/issues/issue-23208.rs b/src/test/ui/associated-types/issue-23208.rs
similarity index 100%
rename from src/test/ui/issues/issue-23208.rs
rename to src/test/ui/associated-types/issue-23208.rs
diff --git a/src/test/ui/issues/issue-31597.rs b/src/test/ui/associated-types/issue-31597.rs
similarity index 100%
rename from src/test/ui/issues/issue-31597.rs
rename to src/test/ui/associated-types/issue-31597.rs
diff --git a/src/test/ui/shadow.rs b/src/test/ui/binding/shadow.rs
similarity index 100%
rename from src/test/ui/shadow.rs
rename to src/test/ui/binding/shadow.rs
diff --git a/src/test/ui/issues/issue-52060.rs b/src/test/ui/consts/issue-52060.rs
similarity index 100%
rename from src/test/ui/issues/issue-52060.rs
rename to src/test/ui/consts/issue-52060.rs
diff --git a/src/test/ui/issues/issue-52060.stderr b/src/test/ui/consts/issue-52060.stderr
similarity index 100%
rename from src/test/ui/issues/issue-52060.stderr
rename to src/test/ui/consts/issue-52060.stderr
diff --git a/src/test/ui/mir_check_nonconst.rs b/src/test/ui/consts/mir_check_nonconst.rs
similarity index 100%
rename from src/test/ui/mir_check_nonconst.rs
rename to src/test/ui/consts/mir_check_nonconst.rs
diff --git a/src/test/ui/mir_check_nonconst.stderr b/src/test/ui/consts/mir_check_nonconst.stderr
similarity index 100%
rename from src/test/ui/mir_check_nonconst.stderr
rename to src/test/ui/consts/mir_check_nonconst.stderr
diff --git a/src/test/ui/issues/issue-45729-unsafe-in-generator.rs b/src/test/ui/generator/issue-45729-unsafe-in-generator.rs
similarity index 100%
rename from src/test/ui/issues/issue-45729-unsafe-in-generator.rs
rename to src/test/ui/generator/issue-45729-unsafe-in-generator.rs
diff --git a/src/test/ui/issues/issue-45729-unsafe-in-generator.stderr b/src/test/ui/generator/issue-45729-unsafe-in-generator.stderr
similarity index 100%
rename from src/test/ui/issues/issue-45729-unsafe-in-generator.stderr
rename to src/test/ui/generator/issue-45729-unsafe-in-generator.stderr
diff --git a/src/test/ui/impl-trait-in-bindings-issue-73003.rs b/src/test/ui/impl-trait/impl-trait-in-bindings-issue-73003.rs
similarity index 100%
rename from src/test/ui/impl-trait-in-bindings-issue-73003.rs
rename to src/test/ui/impl-trait/impl-trait-in-bindings-issue-73003.rs
diff --git a/src/test/ui/impl-trait-in-bindings-issue-73003.stderr b/src/test/ui/impl-trait/impl-trait-in-bindings-issue-73003.stderr
similarity index 100%
rename from src/test/ui/impl-trait-in-bindings-issue-73003.stderr
rename to src/test/ui/impl-trait/impl-trait-in-bindings-issue-73003.stderr
diff --git a/src/test/ui/impl-trait-in-bindings.rs b/src/test/ui/impl-trait/impl-trait-in-bindings.rs
similarity index 100%
rename from src/test/ui/impl-trait-in-bindings.rs
rename to src/test/ui/impl-trait/impl-trait-in-bindings.rs
diff --git a/src/test/ui/impl-trait-in-bindings.stderr b/src/test/ui/impl-trait/impl-trait-in-bindings.stderr
similarity index 100%
rename from src/test/ui/impl-trait-in-bindings.stderr
rename to src/test/ui/impl-trait/impl-trait-in-bindings.stderr
diff --git a/src/test/ui/fn_must_use.rs b/src/test/ui/lint/fn_must_use.rs
similarity index 100%
rename from src/test/ui/fn_must_use.rs
rename to src/test/ui/lint/fn_must_use.rs
diff --git a/src/test/ui/fn_must_use.stderr b/src/test/ui/lint/fn_must_use.stderr
similarity index 100%
rename from src/test/ui/fn_must_use.stderr
rename to src/test/ui/lint/fn_must_use.stderr
diff --git a/src/test/ui/concat-rpass.rs b/src/test/ui/macros/concat-rpass.rs
similarity index 100%
rename from src/test/ui/concat-rpass.rs
rename to src/test/ui/macros/concat-rpass.rs
diff --git a/src/test/ui/issues/issue-48508-aux.rs b/src/test/ui/parser/issue-48508-aux.rs
similarity index 100%
rename from src/test/ui/issues/issue-48508-aux.rs
rename to src/test/ui/parser/issue-48508-aux.rs
diff --git a/src/test/ui/issues/issue-48508.rs b/src/test/ui/parser/issue-48508.rs
similarity index 100%
rename from src/test/ui/issues/issue-48508.rs
rename to src/test/ui/parser/issue-48508.rs
diff --git a/src/test/ui/issues/issue-68000-unicode-ident-after-missing-comma.rs b/src/test/ui/parser/issue-68000-unicode-ident-after-missing-comma.rs
similarity index 100%
rename from src/test/ui/issues/issue-68000-unicode-ident-after-missing-comma.rs
rename to src/test/ui/parser/issue-68000-unicode-ident-after-missing-comma.rs
diff --git a/src/test/ui/issues/issue-68000-unicode-ident-after-missing-comma.stderr b/src/test/ui/parser/issue-68000-unicode-ident-after-missing-comma.stderr
similarity index 100%
rename from src/test/ui/issues/issue-68000-unicode-ident-after-missing-comma.stderr
rename to src/test/ui/parser/issue-68000-unicode-ident-after-missing-comma.stderr
diff --git a/src/test/ui/issues/issue-10392.rs b/src/test/ui/pattern/issue-10392.rs
similarity index 100%
rename from src/test/ui/issues/issue-10392.rs
rename to src/test/ui/pattern/issue-10392.rs
diff --git a/src/test/ui/no-implicit-prelude.rs b/src/test/ui/resolve/no-implicit-prelude.rs
similarity index 100%
rename from src/test/ui/no-implicit-prelude.rs
rename to src/test/ui/resolve/no-implicit-prelude.rs
diff --git a/src/test/ui/no-implicit-prelude.stderr b/src/test/ui/resolve/no-implicit-prelude.stderr
similarity index 100%
rename from src/test/ui/no-implicit-prelude.stderr
rename to src/test/ui/resolve/no-implicit-prelude.stderr
diff --git a/src/test/ui/issues/issue-1701.rs b/src/test/ui/structs-enums/issue-1701.rs
similarity index 100%
rename from src/test/ui/issues/issue-1701.rs
rename to src/test/ui/structs-enums/issue-1701.rs
diff --git a/src/test/ui/issues/issue-78372.rs b/src/test/ui/traits/issue-78372.rs
similarity index 100%
rename from src/test/ui/issues/issue-78372.rs
rename to src/test/ui/traits/issue-78372.rs
diff --git a/src/test/ui/issues/issue-78372.stderr b/src/test/ui/traits/issue-78372.stderr
similarity index 100%
rename from src/test/ui/issues/issue-78372.stderr
rename to src/test/ui/traits/issue-78372.stderr
diff --git a/src/test/ui/issues/issue-65611.rs b/src/test/ui/typeck/issue-65611.rs
similarity index 100%
rename from src/test/ui/issues/issue-65611.rs
rename to src/test/ui/typeck/issue-65611.rs
diff --git a/src/test/ui/issues/issue-65611.stderr b/src/test/ui/typeck/issue-65611.stderr
similarity index 100%
rename from src/test/ui/issues/issue-65611.stderr
rename to src/test/ui/typeck/issue-65611.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 3374a8c9b73fa..7cc660454b492 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,8 +7,8 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 1408;
-const ISSUES_ENTRY_LIMIT: usize = 2565;
+const ROOT_ENTRY_LIMIT: usize = 1390;
+const ISSUES_ENTRY_LIMIT: usize = 2551;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))