diff --git a/src/test/ui/issues/issue-58022.rs b/src/test/ui/associated-consts/issue-58022.rs
similarity index 100%
rename from src/test/ui/issues/issue-58022.rs
rename to src/test/ui/associated-consts/issue-58022.rs
diff --git a/src/test/ui/issues/issue-58022.stderr b/src/test/ui/associated-consts/issue-58022.stderr
similarity index 100%
rename from src/test/ui/issues/issue-58022.stderr
rename to src/test/ui/associated-consts/issue-58022.stderr
diff --git a/src/test/ui/issues/issue-35668.rs b/src/test/ui/impl-trait/issue-35668.rs
similarity index 100%
rename from src/test/ui/issues/issue-35668.rs
rename to src/test/ui/impl-trait/issue-35668.rs
diff --git a/src/test/ui/issues/issue-35668.stderr b/src/test/ui/impl-trait/issue-35668.stderr
similarity index 100%
rename from src/test/ui/issues/issue-35668.stderr
rename to src/test/ui/impl-trait/issue-35668.stderr
diff --git a/src/test/ui/issues/issue-49556.rs b/src/test/ui/impl-trait/issue-49556.rs
similarity index 100%
rename from src/test/ui/issues/issue-49556.rs
rename to src/test/ui/impl-trait/issue-49556.rs
diff --git a/src/test/ui/issues/issue-57843.rs b/src/test/ui/nll/issue-57843.rs
similarity index 100%
rename from src/test/ui/issues/issue-57843.rs
rename to src/test/ui/nll/issue-57843.rs
diff --git a/src/test/ui/issues/issue-57843.stderr b/src/test/ui/nll/issue-57843.stderr
similarity index 100%
rename from src/test/ui/issues/issue-57843.stderr
rename to src/test/ui/nll/issue-57843.stderr
diff --git a/src/test/ui/issues/issue-75906.rs b/src/test/ui/privacy/issue-75906.rs
similarity index 100%
rename from src/test/ui/issues/issue-75906.rs
rename to src/test/ui/privacy/issue-75906.rs
diff --git a/src/test/ui/issues/issue-75906.stderr b/src/test/ui/privacy/issue-75906.stderr
similarity index 100%
rename from src/test/ui/issues/issue-75906.stderr
rename to src/test/ui/privacy/issue-75906.stderr
diff --git a/src/test/ui/issues/issue-60057.rs b/src/test/ui/resolve/issue-60057.rs
similarity index 100%
rename from src/test/ui/issues/issue-60057.rs
rename to src/test/ui/resolve/issue-60057.rs
diff --git a/src/test/ui/issues/issue-60057.stderr b/src/test/ui/resolve/issue-60057.stderr
similarity index 100%
rename from src/test/ui/issues/issue-60057.stderr
rename to src/test/ui/resolve/issue-60057.stderr
diff --git a/src/test/ui/issues/issue-29184.rs b/src/test/ui/typeof/issue-29184.rs
similarity index 100%
rename from src/test/ui/issues/issue-29184.rs
rename to src/test/ui/typeof/issue-29184.rs
diff --git a/src/test/ui/issues/issue-29184.stderr b/src/test/ui/typeof/issue-29184.stderr
similarity index 100%
rename from src/test/ui/issues/issue-29184.stderr
rename to src/test/ui/typeof/issue-29184.stderr
diff --git a/src/test/ui/issues/issue-42060.rs b/src/test/ui/typeof/issue-42060.rs
similarity index 100%
rename from src/test/ui/issues/issue-42060.rs
rename to src/test/ui/typeof/issue-42060.rs
diff --git a/src/test/ui/issues/issue-42060.stderr b/src/test/ui/typeof/issue-42060.stderr
similarity index 100%
rename from src/test/ui/issues/issue-42060.stderr
rename to src/test/ui/typeof/issue-42060.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 21c6a96747eef..ee326e190ffa2 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -10,7 +10,7 @@ use std::path::Path;
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
 const ROOT_ENTRY_LIMIT: usize = 939;
-const ISSUES_ENTRY_LIMIT: usize = 2085;
+const ISSUES_ENTRY_LIMIT: usize = 2070;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     for dir in Walk::new(&path.join("test/ui")) {