diff --git a/src/test/ui/issues/issue-47139-2.rs b/src/test/ui/associated-types/issue-47139-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-47139-2.rs
rename to src/test/ui/associated-types/issue-47139-2.rs
diff --git a/src/test/ui/issues/issue-10991.rs b/src/test/ui/cast/issue-10991.rs
similarity index 100%
rename from src/test/ui/issues/issue-10991.rs
rename to src/test/ui/cast/issue-10991.rs
diff --git a/src/test/ui/issues/issue-10991.stderr b/src/test/ui/cast/issue-10991.stderr
similarity index 100%
rename from src/test/ui/issues/issue-10991.stderr
rename to src/test/ui/cast/issue-10991.stderr
diff --git a/src/test/ui/issues/issue-28950.rs b/src/test/ui/codegen/issue-28950.rs
similarity index 100%
rename from src/test/ui/issues/issue-28950.rs
rename to src/test/ui/codegen/issue-28950.rs
diff --git a/src/test/ui/issues/issue-63787.rs b/src/test/ui/codegen/issue-63787.rs
similarity index 100%
rename from src/test/ui/issues/issue-63787.rs
rename to src/test/ui/codegen/issue-63787.rs
diff --git a/src/test/ui/issues/issue-6341.rs b/src/test/ui/deriving/issue-6341.rs
similarity index 100%
rename from src/test/ui/issues/issue-6341.rs
rename to src/test/ui/deriving/issue-6341.rs
diff --git a/src/test/ui/issues/issue-24883.rs b/src/test/ui/imports/issue-24883.rs
similarity index 100%
rename from src/test/ui/issues/issue-24883.rs
rename to src/test/ui/imports/issue-24883.rs
diff --git a/src/test/ui/issues/issue-68103.rs b/src/test/ui/imports/issue-68103.rs
similarity index 100%
rename from src/test/ui/issues/issue-68103.rs
rename to src/test/ui/imports/issue-68103.rs
diff --git a/src/test/ui/issues/issue-72690.rs b/src/test/ui/inference/issue-72690.rs
similarity index 100%
rename from src/test/ui/issues/issue-72690.rs
rename to src/test/ui/inference/issue-72690.rs
diff --git a/src/test/ui/issues/issue-72690.stderr b/src/test/ui/inference/issue-72690.stderr
similarity index 100%
rename from src/test/ui/issues/issue-72690.stderr
rename to src/test/ui/inference/issue-72690.stderr
diff --git a/src/test/ui/issues/issue-35075.rs b/src/test/ui/lint/issue-35075.rs
similarity index 100%
rename from src/test/ui/issues/issue-35075.rs
rename to src/test/ui/lint/issue-35075.rs
diff --git a/src/test/ui/issues/issue-35075.stderr b/src/test/ui/lint/issue-35075.stderr
similarity index 100%
rename from src/test/ui/issues/issue-35075.stderr
rename to src/test/ui/lint/issue-35075.stderr
diff --git a/src/test/ui/issues/issue-8851.rs b/src/test/ui/macros/issue-8851.rs
similarity index 100%
rename from src/test/ui/issues/issue-8851.rs
rename to src/test/ui/macros/issue-8851.rs
diff --git a/src/test/ui/issues/issue-46920-byte-array-patterns.rs b/src/test/ui/match/issue-46920-byte-array-patterns.rs
similarity index 100%
rename from src/test/ui/issues/issue-46920-byte-array-patterns.rs
rename to src/test/ui/match/issue-46920-byte-array-patterns.rs
diff --git a/src/test/ui/borrowck/issue-27282-move-match-input-into-guard.rs b/src/test/ui/nll/issue-27282-move-match-input-into-guard.rs
similarity index 100%
rename from src/test/ui/borrowck/issue-27282-move-match-input-into-guard.rs
rename to src/test/ui/nll/issue-27282-move-match-input-into-guard.rs
diff --git a/src/test/ui/borrowck/issue-27282-move-match-input-into-guard.stderr b/src/test/ui/nll/issue-27282-move-match-input-into-guard.stderr
similarity index 100%
rename from src/test/ui/borrowck/issue-27282-move-match-input-into-guard.stderr
rename to src/test/ui/nll/issue-27282-move-match-input-into-guard.stderr
diff --git a/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs b/src/test/ui/nll/issue-27282-move-ref-mut-into-guard.rs
similarity index 100%
rename from src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs
rename to src/test/ui/nll/issue-27282-move-ref-mut-into-guard.rs
diff --git a/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr b/src/test/ui/nll/issue-27282-move-ref-mut-into-guard.stderr
similarity index 100%
rename from src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr
rename to src/test/ui/nll/issue-27282-move-ref-mut-into-guard.stderr
diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs b/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs
rename to src/test/ui/nll/issue-27282-mutate-before-diverging-arm-1.rs
diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr b/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-1.stderr
similarity index 100%
rename from src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr
rename to src/test/ui/nll/issue-27282-mutate-before-diverging-arm-1.stderr
diff --git a/src/test/ui/borrowck/issue-27282-mutate-before-diverging-arm-2.rs b/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-2.rs
similarity index 100%
rename from src/test/ui/borrowck/issue-27282-mutate-before-diverging-arm-2.rs
rename to src/test/ui/nll/issue-27282-mutate-before-diverging-arm-2.rs
diff --git a/src/test/ui/borrowck/issue-27282-mutate-before-diverging-arm-2.stderr b/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-2.stderr
similarity index 100%
rename from src/test/ui/borrowck/issue-27282-mutate-before-diverging-arm-2.stderr
rename to src/test/ui/nll/issue-27282-mutate-before-diverging-arm-2.stderr
diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-3.rs b/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-3.rs
similarity index 100%
rename from src/test/ui/issues/issue-27282-mutate-before-diverging-arm-3.rs
rename to src/test/ui/nll/issue-27282-mutate-before-diverging-arm-3.rs
diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-3.stderr b/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-3.stderr
similarity index 100%
rename from src/test/ui/issues/issue-27282-mutate-before-diverging-arm-3.stderr
rename to src/test/ui/nll/issue-27282-mutate-before-diverging-arm-3.stderr
diff --git a/src/test/ui/borrowck/issue-27282-mutation-in-guard.rs b/src/test/ui/nll/issue-27282-mutation-in-guard.rs
similarity index 100%
rename from src/test/ui/borrowck/issue-27282-mutation-in-guard.rs
rename to src/test/ui/nll/issue-27282-mutation-in-guard.rs
diff --git a/src/test/ui/borrowck/issue-27282-mutation-in-guard.stderr b/src/test/ui/nll/issue-27282-mutation-in-guard.stderr
similarity index 100%
rename from src/test/ui/borrowck/issue-27282-mutation-in-guard.stderr
rename to src/test/ui/nll/issue-27282-mutation-in-guard.stderr
diff --git a/src/test/ui/borrowck/issue-27282-reborrow-ref-mut-in-guard.rs b/src/test/ui/nll/issue-27282-reborrow-ref-mut-in-guard.rs
similarity index 100%
rename from src/test/ui/borrowck/issue-27282-reborrow-ref-mut-in-guard.rs
rename to src/test/ui/nll/issue-27282-reborrow-ref-mut-in-guard.rs
diff --git a/src/test/ui/borrowck/issue-27282-reborrow-ref-mut-in-guard.stderr b/src/test/ui/nll/issue-27282-reborrow-ref-mut-in-guard.stderr
similarity index 100%
rename from src/test/ui/borrowck/issue-27282-reborrow-ref-mut-in-guard.stderr
rename to src/test/ui/nll/issue-27282-reborrow-ref-mut-in-guard.stderr
diff --git a/src/test/ui/issues/issue-52057.rs b/src/test/ui/nll/issue-52057.rs
similarity index 100%
rename from src/test/ui/issues/issue-52057.rs
rename to src/test/ui/nll/issue-52057.rs
diff --git a/src/test/ui/issues/issue-16597-empty.rs b/src/test/ui/test-attrs/issue-16597-empty.rs
similarity index 100%
rename from src/test/ui/issues/issue-16597-empty.rs
rename to src/test/ui/test-attrs/issue-16597-empty.rs
diff --git a/src/test/ui/issues/issue-16597.rs b/src/test/ui/test-attrs/issue-16597.rs
similarity index 100%
rename from src/test/ui/issues/issue-16597.rs
rename to src/test/ui/test-attrs/issue-16597.rs
diff --git a/src/test/ui/issues/issue-38033.rs b/src/test/ui/traits/issue-38033.rs
similarity index 100%
rename from src/test/ui/issues/issue-38033.rs
rename to src/test/ui/traits/issue-38033.rs
diff --git a/src/test/ui/issues/issue-10401.rs b/src/test/ui/typeck/issue-10401.rs
similarity index 100%
rename from src/test/ui/issues/issue-10401.rs
rename to src/test/ui/typeck/issue-10401.rs
diff --git a/src/test/ui/issues/issue-10401.stderr b/src/test/ui/typeck/issue-10401.stderr
similarity index 100%
rename from src/test/ui/issues/issue-10401.stderr
rename to src/test/ui/typeck/issue-10401.stderr
diff --git a/src/test/ui/issues/issue-3080.mir.stderr b/src/test/ui/unsafe/issue-3080.mir.stderr
similarity index 100%
rename from src/test/ui/issues/issue-3080.mir.stderr
rename to src/test/ui/unsafe/issue-3080.mir.stderr
diff --git a/src/test/ui/issues/issue-3080.rs b/src/test/ui/unsafe/issue-3080.rs
similarity index 100%
rename from src/test/ui/issues/issue-3080.rs
rename to src/test/ui/unsafe/issue-3080.rs
diff --git a/src/test/ui/issues/issue-3080.thir.stderr b/src/test/ui/unsafe/issue-3080.thir.stderr
similarity index 100%
rename from src/test/ui/issues/issue-3080.thir.stderr
rename to src/test/ui/unsafe/issue-3080.thir.stderr
diff --git a/src/test/ui/issues/issue-47412.mir.stderr b/src/test/ui/unsafe/issue-47412.mir.stderr
similarity index 100%
rename from src/test/ui/issues/issue-47412.mir.stderr
rename to src/test/ui/unsafe/issue-47412.mir.stderr
diff --git a/src/test/ui/issues/issue-47412.rs b/src/test/ui/unsafe/issue-47412.rs
similarity index 100%
rename from src/test/ui/issues/issue-47412.rs
rename to src/test/ui/unsafe/issue-47412.rs
diff --git a/src/test/ui/issues/issue-47412.thir.stderr b/src/test/ui/unsafe/issue-47412.thir.stderr
similarity index 100%
rename from src/test/ui/issues/issue-47412.thir.stderr
rename to src/test/ui/unsafe/issue-47412.thir.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index f59121181d29b..8ec5c33249333 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -8,7 +8,7 @@ use std::path::Path;
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
 const ROOT_ENTRY_LIMIT: usize = 968;
-const ISSUES_ENTRY_LIMIT: usize = 2179;
+const ISSUES_ENTRY_LIMIT: usize = 2147;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))