diff --git a/src/test/ui/issues/issue-28934.rs b/src/test/ui/borrowck/issue-28934.rs
similarity index 100%
rename from src/test/ui/issues/issue-28934.rs
rename to src/test/ui/borrowck/issue-28934.rs
diff --git a/src/test/ui/issues/issue-6801.rs b/src/test/ui/closures/issue-6801.rs
similarity index 100%
rename from src/test/ui/issues/issue-6801.rs
rename to src/test/ui/closures/issue-6801.rs
diff --git a/src/test/ui/issues/issue-6801.stderr b/src/test/ui/closures/issue-6801.stderr
similarity index 100%
rename from src/test/ui/issues/issue-6801.stderr
rename to src/test/ui/closures/issue-6801.stderr
diff --git a/src/test/ui/issues/issue-38715.rs b/src/test/ui/macros/issue-38715.rs
similarity index 100%
rename from src/test/ui/issues/issue-38715.rs
rename to src/test/ui/macros/issue-38715.rs
diff --git a/src/test/ui/issues/issue-38715.stderr b/src/test/ui/macros/issue-38715.stderr
similarity index 100%
rename from src/test/ui/issues/issue-38715.stderr
rename to src/test/ui/macros/issue-38715.stderr
diff --git a/src/test/ui/continue-after-missing-main.nll.stderr b/src/test/ui/nll/continue-after-missing-main.nll.stderr
similarity index 100%
rename from src/test/ui/continue-after-missing-main.nll.stderr
rename to src/test/ui/nll/continue-after-missing-main.nll.stderr
diff --git a/src/test/ui/continue-after-missing-main.rs b/src/test/ui/nll/continue-after-missing-main.rs
similarity index 100%
rename from src/test/ui/continue-after-missing-main.rs
rename to src/test/ui/nll/continue-after-missing-main.rs
diff --git a/src/test/ui/continue-after-missing-main.stderr b/src/test/ui/nll/continue-after-missing-main.stderr
similarity index 100%
rename from src/test/ui/continue-after-missing-main.stderr
rename to src/test/ui/nll/continue-after-missing-main.stderr
diff --git a/src/test/ui/issues/issue-48803.rs b/src/test/ui/nll/issue-48803.rs
similarity index 100%
rename from src/test/ui/issues/issue-48803.rs
rename to src/test/ui/nll/issue-48803.rs
diff --git a/src/test/ui/issues/issue-48803.stderr b/src/test/ui/nll/issue-48803.stderr
similarity index 100%
rename from src/test/ui/issues/issue-48803.stderr
rename to src/test/ui/nll/issue-48803.stderr
diff --git a/src/test/ui/issues/issue-52533-1.nll.stderr b/src/test/ui/nll/issue-52533-1.nll.stderr
similarity index 100%
rename from src/test/ui/issues/issue-52533-1.nll.stderr
rename to src/test/ui/nll/issue-52533-1.nll.stderr
diff --git a/src/test/ui/issues/issue-52533-1.rs b/src/test/ui/nll/issue-52533-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-52533-1.rs
rename to src/test/ui/nll/issue-52533-1.rs
diff --git a/src/test/ui/issues/issue-52533-1.stderr b/src/test/ui/nll/issue-52533-1.stderr
similarity index 100%
rename from src/test/ui/issues/issue-52533-1.stderr
rename to src/test/ui/nll/issue-52533-1.stderr
diff --git a/src/test/ui/issues/issue-14940.rs b/src/test/ui/process/issue-14940.rs
similarity index 100%
rename from src/test/ui/issues/issue-14940.rs
rename to src/test/ui/process/issue-14940.rs
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 6b715f727b223..5712e84adbc20 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 = 977;
-const ISSUES_ENTRY_LIMIT: usize = 2278;
+const ROOT_ENTRY_LIMIT: usize = 974;
+const ISSUES_ENTRY_LIMIT: usize = 2248;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))