diff --git a/src/test/ui/issues/issue-54954.rs b/src/test/ui/consts/issue-54954.rs
similarity index 100%
rename from src/test/ui/issues/issue-54954.rs
rename to src/test/ui/consts/issue-54954.rs
diff --git a/src/test/ui/issues/issue-54954.stderr b/src/test/ui/consts/issue-54954.stderr
similarity index 100%
rename from src/test/ui/issues/issue-54954.stderr
rename to src/test/ui/consts/issue-54954.stderr
diff --git a/src/test/ui/issues/issue-54943-1.rs b/src/test/ui/dropck/issue-54943-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-54943-1.rs
rename to src/test/ui/dropck/issue-54943-1.rs
diff --git a/src/test/ui/issues/issue-54943-2.rs b/src/test/ui/dropck/issue-54943-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-54943-2.rs
rename to src/test/ui/dropck/issue-54943-2.rs
diff --git a/src/test/ui/issues/issue-12552.rs b/src/test/ui/match/issue-12552.rs
similarity index 100%
rename from src/test/ui/issues/issue-12552.rs
rename to src/test/ui/match/issue-12552.rs
diff --git a/src/test/ui/issues/issue-12552.stderr b/src/test/ui/match/issue-12552.stderr
similarity index 100%
rename from src/test/ui/issues/issue-12552.stderr
rename to src/test/ui/match/issue-12552.stderr
diff --git a/src/test/ui/issues/issue-54943.rs b/src/test/ui/nll/issue-54943.rs
similarity index 100%
rename from src/test/ui/issues/issue-54943.rs
rename to src/test/ui/nll/issue-54943.rs
diff --git a/src/test/ui/issues/issue-54943.stderr b/src/test/ui/nll/issue-54943.stderr
similarity index 100%
rename from src/test/ui/issues/issue-54943.stderr
rename to src/test/ui/nll/issue-54943.stderr
diff --git a/src/test/ui/issues/issue-10969.rs b/src/test/ui/typeck/issue-10969.rs
similarity index 100%
rename from src/test/ui/issues/issue-10969.rs
rename to src/test/ui/typeck/issue-10969.rs
diff --git a/src/test/ui/issues/issue-10969.stderr b/src/test/ui/typeck/issue-10969.stderr
similarity index 100%
rename from src/test/ui/issues/issue-10969.stderr
rename to src/test/ui/typeck/issue-10969.stderr
diff --git a/src/test/ui/issues/issue-50687-ice-on-borrow.rs b/src/test/ui/typeck/issue-50687-ice-on-borrow.rs
similarity index 100%
rename from src/test/ui/issues/issue-50687-ice-on-borrow.rs
rename to src/test/ui/typeck/issue-50687-ice-on-borrow.rs
diff --git a/src/test/ui/issues/issue-50687-ice-on-borrow.stderr b/src/test/ui/typeck/issue-50687-ice-on-borrow.stderr
similarity index 100%
rename from src/test/ui/issues/issue-50687-ice-on-borrow.stderr
rename to src/test/ui/typeck/issue-50687-ice-on-borrow.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index aee36f061c5d1..2b82e9b3f998c 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -9,8 +9,8 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 941;
-const ISSUES_ENTRY_LIMIT: usize = 2117;
+const ROOT_ENTRY_LIMIT: usize = 939;
+const ISSUES_ENTRY_LIMIT: usize = 2105;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     for dir in Walk::new(&path.join("test/ui")) {