diff --git a/src/test/ui/issues/issue-105330.rs b/src/test/ui/associated-consts/issue-105330.rs
similarity index 100%
rename from src/test/ui/issues/issue-105330.rs
rename to src/test/ui/associated-consts/issue-105330.rs
diff --git a/src/test/ui/issues/issue-105330.stderr b/src/test/ui/associated-consts/issue-105330.stderr
similarity index 100%
rename from src/test/ui/issues/issue-105330.stderr
rename to src/test/ui/associated-consts/issue-105330.stderr
diff --git a/src/test/ui/issues/issue-25700-1.rs b/src/test/ui/associated-types/issue-25700-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-25700-1.rs
rename to src/test/ui/associated-types/issue-25700-1.rs
diff --git a/src/test/ui/issues/issue-25700-2.rs b/src/test/ui/associated-types/issue-25700-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-25700-2.rs
rename to src/test/ui/associated-types/issue-25700-2.rs
diff --git a/src/test/ui/issues/issue-25700.rs b/src/test/ui/associated-types/issue-25700.rs
similarity index 100%
rename from src/test/ui/issues/issue-25700.rs
rename to src/test/ui/associated-types/issue-25700.rs
diff --git a/src/test/ui/issues/issue-25700.stderr b/src/test/ui/associated-types/issue-25700.stderr
similarity index 100%
rename from src/test/ui/issues/issue-25700.stderr
rename to src/test/ui/associated-types/issue-25700.stderr
diff --git a/src/test/ui/issues/issue-82859-slice-miscompile.rs b/src/test/ui/codegen/issue-82859-slice-miscompile.rs
similarity index 100%
rename from src/test/ui/issues/issue-82859-slice-miscompile.rs
rename to src/test/ui/codegen/issue-82859-slice-miscompile.rs
diff --git a/src/test/ui/issues/issue-10626.rs b/src/test/ui/command/issue-10626.rs
similarity index 100%
rename from src/test/ui/issues/issue-10626.rs
rename to src/test/ui/command/issue-10626.rs
diff --git a/src/test/ui/issues/issue-2734.rs b/src/test/ui/drop/issue-2734.rs
similarity index 100%
rename from src/test/ui/issues/issue-2734.rs
rename to src/test/ui/drop/issue-2734.rs
diff --git a/src/test/ui/issues/issue-34053.rs b/src/test/ui/dropck/issue-34053.rs
similarity index 100%
rename from src/test/ui/issues/issue-34053.rs
rename to src/test/ui/dropck/issue-34053.rs
diff --git a/src/test/ui/issues/issue-72554.rs b/src/test/ui/enum-discriminant/issue-72554.rs
similarity index 100%
rename from src/test/ui/issues/issue-72554.rs
rename to src/test/ui/enum-discriminant/issue-72554.rs
diff --git a/src/test/ui/issues/issue-72554.stderr b/src/test/ui/enum-discriminant/issue-72554.stderr
similarity index 100%
rename from src/test/ui/issues/issue-72554.stderr
rename to src/test/ui/enum-discriminant/issue-72554.stderr
diff --git a/src/test/ui/issues/issue-13655.rs b/src/test/ui/extern/issue-13655.rs
similarity index 100%
rename from src/test/ui/issues/issue-13655.rs
rename to src/test/ui/extern/issue-13655.rs
diff --git a/src/test/ui/issues/issue-10536.rs b/src/test/ui/macros/issue-10536.rs
similarity index 100%
rename from src/test/ui/issues/issue-10536.rs
rename to src/test/ui/macros/issue-10536.rs
diff --git a/src/test/ui/issues/issue-10536.stderr b/src/test/ui/macros/issue-10536.stderr
similarity index 100%
rename from src/test/ui/issues/issue-10536.stderr
rename to src/test/ui/macros/issue-10536.stderr
diff --git a/src/test/ui/issues/issue-54189.rs b/src/test/ui/nll/issue-54189.rs
similarity index 100%
rename from src/test/ui/issues/issue-54189.rs
rename to src/test/ui/nll/issue-54189.rs
diff --git a/src/test/ui/issues/issue-54189.stderr b/src/test/ui/nll/issue-54189.stderr
similarity index 100%
rename from src/test/ui/issues/issue-54189.stderr
rename to src/test/ui/nll/issue-54189.stderr
diff --git a/src/test/ui/issues/issue-99875.rs b/src/test/ui/traits/issue-99875.rs
similarity index 100%
rename from src/test/ui/issues/issue-99875.rs
rename to src/test/ui/traits/issue-99875.rs
diff --git a/src/test/ui/issues/issue-99875.stderr b/src/test/ui/traits/issue-99875.stderr
similarity index 100%
rename from src/test/ui/issues/issue-99875.stderr
rename to src/test/ui/traits/issue-99875.stderr
diff --git a/src/test/ui/issues/issue-18937-1.rs b/src/test/ui/typeck/issue-18937-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-18937-1.rs
rename to src/test/ui/typeck/issue-18937-1.rs
diff --git a/src/test/ui/issues/issue-18937.rs b/src/test/ui/typeck/issue-18937.rs
similarity index 100%
rename from src/test/ui/issues/issue-18937.rs
rename to src/test/ui/typeck/issue-18937.rs
diff --git a/src/test/ui/issues/issue-18937.stderr b/src/test/ui/typeck/issue-18937.stderr
similarity index 100%
rename from src/test/ui/issues/issue-18937.stderr
rename to src/test/ui/typeck/issue-18937.stderr
diff --git a/src/test/ui/issues/issue-31173.rs b/src/test/ui/typeck/issue-31173.rs
similarity index 100%
rename from src/test/ui/issues/issue-31173.rs
rename to src/test/ui/typeck/issue-31173.rs
diff --git a/src/test/ui/issues/issue-31173.stderr b/src/test/ui/typeck/issue-31173.stderr
similarity index 100%
rename from src/test/ui/issues/issue-31173.stderr
rename to src/test/ui/typeck/issue-31173.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 070e72437be..166d09fa8b0 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 = 2050;
+const ISSUES_ENTRY_LIMIT: usize = 1998;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     for dir in Walk::new(&path.join("test/ui")) {