diff --git a/src/test/ui/issues/issue-54387.rs b/src/test/ui/consts/issue-54387.rs
similarity index 100%
rename from src/test/ui/issues/issue-54387.rs
rename to src/test/ui/consts/issue-54387.rs
diff --git a/src/test/ui/issues/issue-54966.rs b/src/test/ui/impl-trait/issue-54966.rs
similarity index 100%
rename from src/test/ui/issues/issue-54966.rs
rename to src/test/ui/impl-trait/issue-54966.rs
diff --git a/src/test/ui/issues/issue-54966.stderr b/src/test/ui/impl-trait/issue-54966.stderr
similarity index 100%
rename from src/test/ui/issues/issue-54966.stderr
rename to src/test/ui/impl-trait/issue-54966.stderr
diff --git a/src/test/ui/issues/issue-26873-multifile/A/B.rs b/src/test/ui/imports/issue-26873-multifile/A/B.rs
similarity index 100%
rename from src/test/ui/issues/issue-26873-multifile/A/B.rs
rename to src/test/ui/imports/issue-26873-multifile/A/B.rs
diff --git a/src/test/ui/issues/issue-26873-multifile/A/C.rs b/src/test/ui/imports/issue-26873-multifile/A/C.rs
similarity index 100%
rename from src/test/ui/issues/issue-26873-multifile/A/C.rs
rename to src/test/ui/imports/issue-26873-multifile/A/C.rs
diff --git a/src/test/ui/issues/issue-26873-multifile/A/mod.rs b/src/test/ui/imports/issue-26873-multifile/A/mod.rs
similarity index 100%
rename from src/test/ui/issues/issue-26873-multifile/A/mod.rs
rename to src/test/ui/imports/issue-26873-multifile/A/mod.rs
diff --git a/src/test/ui/issues/issue-26873-multifile/compiletest-ignore-dir b/src/test/ui/imports/issue-26873-multifile/compiletest-ignore-dir
similarity index 100%
rename from src/test/ui/issues/issue-26873-multifile/compiletest-ignore-dir
rename to src/test/ui/imports/issue-26873-multifile/compiletest-ignore-dir
diff --git a/src/test/ui/issues/issue-26873-multifile.rs b/src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs
similarity index 100%
rename from src/test/ui/issues/issue-26873-multifile.rs
rename to src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs
diff --git a/src/test/ui/imports/issue-26873-onefile.rs b/src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs
similarity index 100%
rename from src/test/ui/imports/issue-26873-onefile.rs
rename to src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs
diff --git a/src/test/ui/issues/issue-26873-multifile/mod.rs b/src/test/ui/imports/issue-26873-multifile/mod.rs
similarity index 100%
rename from src/test/ui/issues/issue-26873-multifile/mod.rs
rename to src/test/ui/imports/issue-26873-multifile/mod.rs
diff --git a/src/test/ui/issues/issue-28098.rs b/src/test/ui/iterators/issue-28098.rs
similarity index 100%
rename from src/test/ui/issues/issue-28098.rs
rename to src/test/ui/iterators/issue-28098.rs
diff --git a/src/test/ui/issues/issue-28098.stderr b/src/test/ui/iterators/issue-28098.stderr
similarity index 100%
rename from src/test/ui/issues/issue-28098.stderr
rename to src/test/ui/iterators/issue-28098.stderr
diff --git a/src/test/ui/issues/issue-11319.rs b/src/test/ui/match/issue-11319.rs
similarity index 100%
rename from src/test/ui/issues/issue-11319.rs
rename to src/test/ui/match/issue-11319.rs
diff --git a/src/test/ui/issues/issue-11319.stderr b/src/test/ui/match/issue-11319.stderr
similarity index 100%
rename from src/test/ui/issues/issue-11319.stderr
rename to src/test/ui/match/issue-11319.stderr
diff --git a/src/test/ui/issues/issue-14958.rs b/src/test/ui/overloaded/issue-14958.rs
similarity index 100%
rename from src/test/ui/issues/issue-14958.rs
rename to src/test/ui/overloaded/issue-14958.rs
diff --git a/src/test/ui/issues/issue-68091-unicode-ident-after-if.rs b/src/test/ui/parser/issue-68091-unicode-ident-after-if.rs
similarity index 100%
rename from src/test/ui/issues/issue-68091-unicode-ident-after-if.rs
rename to src/test/ui/parser/issue-68091-unicode-ident-after-if.rs
diff --git a/src/test/ui/issues/issue-68091-unicode-ident-after-if.stderr b/src/test/ui/parser/issue-68091-unicode-ident-after-if.stderr
similarity index 100%
rename from src/test/ui/issues/issue-68091-unicode-ident-after-if.stderr
rename to src/test/ui/parser/issue-68091-unicode-ident-after-if.stderr
diff --git a/src/test/ui/issues/issue-68092-unicode-ident-after-incomplete-expr.rs b/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs
similarity index 100%
rename from src/test/ui/issues/issue-68092-unicode-ident-after-incomplete-expr.rs
rename to src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs
diff --git a/src/test/ui/issues/issue-68092-unicode-ident-after-incomplete-expr.stderr b/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr
similarity index 100%
rename from src/test/ui/issues/issue-68092-unicode-ident-after-incomplete-expr.stderr
rename to src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr
diff --git a/src/test/ui/issues/issue-8153.rs b/src/test/ui/traits/issue-8153.rs
similarity index 100%
rename from src/test/ui/issues/issue-8153.rs
rename to src/test/ui/traits/issue-8153.rs
diff --git a/src/test/ui/issues/issue-8153.stderr b/src/test/ui/traits/issue-8153.stderr
similarity index 100%
rename from src/test/ui/issues/issue-8153.stderr
rename to src/test/ui/traits/issue-8153.stderr
diff --git a/src/test/ui/issues/issue-14933.rs b/src/test/ui/type-alias/issue-14933.rs
similarity index 100%
rename from src/test/ui/issues/issue-14933.rs
rename to src/test/ui/type-alias/issue-14933.rs
diff --git a/src/test/ui/issues/issue-13853-2.rs b/src/test/ui/typeck/issue-13853-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-13853-2.rs
rename to src/test/ui/typeck/issue-13853-2.rs
diff --git a/src/test/ui/issues/issue-13853-2.stderr b/src/test/ui/typeck/issue-13853-2.stderr
similarity index 100%
rename from src/test/ui/issues/issue-13853-2.stderr
rename to src/test/ui/typeck/issue-13853-2.stderr
diff --git a/src/test/ui/issues/issue-13853-5.rs b/src/test/ui/typeck/issue-13853-5.rs
similarity index 100%
rename from src/test/ui/issues/issue-13853-5.rs
rename to src/test/ui/typeck/issue-13853-5.rs
diff --git a/src/test/ui/issues/issue-13853-5.stderr b/src/test/ui/typeck/issue-13853-5.stderr
similarity index 100%
rename from src/test/ui/issues/issue-13853-5.stderr
rename to src/test/ui/typeck/issue-13853-5.stderr
diff --git a/src/test/ui/issues/issue-13853.rs b/src/test/ui/typeck/issue-13853.rs
similarity index 100%
rename from src/test/ui/issues/issue-13853.rs
rename to src/test/ui/typeck/issue-13853.rs
diff --git a/src/test/ui/issues/issue-13853.stderr b/src/test/ui/typeck/issue-13853.stderr
similarity index 100%
rename from src/test/ui/issues/issue-13853.stderr
rename to src/test/ui/typeck/issue-13853.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index cf72dc4bd09..135a12b5571 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,8 +7,8 @@
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 971;
-const ISSUES_ENTRY_LIMIT: usize = 2234;
+const ROOT_ENTRY_LIMIT: usize = 969;
+const ISSUES_ENTRY_LIMIT: usize = 2211;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))