diff --git a/src/test/ui/issues/issue-39974.rs b/src/test/ui/consts/issue-39974.rs
similarity index 100%
rename from src/test/ui/issues/issue-39974.rs
rename to src/test/ui/consts/issue-39974.rs
diff --git a/src/test/ui/issues/issue-39974.stderr b/src/test/ui/consts/issue-39974.stderr
similarity index 100%
rename from src/test/ui/issues/issue-39974.stderr
rename to src/test/ui/consts/issue-39974.stderr
diff --git a/src/test/ui/issues/issue-17728.rs b/src/test/ui/lifetimes/issue-17728.rs
similarity index 100%
rename from src/test/ui/issues/issue-17728.rs
rename to src/test/ui/lifetimes/issue-17728.rs
diff --git a/src/test/ui/issues/issue-17728.stderr b/src/test/ui/lifetimes/issue-17728.stderr
similarity index 100%
rename from src/test/ui/issues/issue-17728.stderr
rename to src/test/ui/lifetimes/issue-17728.stderr
diff --git a/src/test/ui/issues/issue-55796.rs b/src/test/ui/lifetimes/issue-55796.rs
similarity index 100%
rename from src/test/ui/issues/issue-55796.rs
rename to src/test/ui/lifetimes/issue-55796.rs
diff --git a/src/test/ui/issues/issue-55796.stderr b/src/test/ui/lifetimes/issue-55796.stderr
similarity index 100%
rename from src/test/ui/issues/issue-55796.stderr
rename to src/test/ui/lifetimes/issue-55796.stderr
diff --git a/src/test/ui/issues/issue-11154.rs b/src/test/ui/lto/issue-11154.rs
similarity index 100%
rename from src/test/ui/issues/issue-11154.rs
rename to src/test/ui/lto/issue-11154.rs
diff --git a/src/test/ui/issues/issue-11154.stderr b/src/test/ui/lto/issue-11154.stderr
similarity index 100%
rename from src/test/ui/issues/issue-11154.stderr
rename to src/test/ui/lto/issue-11154.stderr
diff --git a/src/test/ui/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs b/src/test/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
similarity index 100%
rename from src/test/ui/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
rename to src/test/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
diff --git a/src/test/ui/issues/issue-46023.rs b/src/test/ui/nll/issue-46023.rs
similarity index 100%
rename from src/test/ui/issues/issue-46023.rs
rename to src/test/ui/nll/issue-46023.rs
diff --git a/src/test/ui/issues/issue-46023.stderr b/src/test/ui/nll/issue-46023.stderr
similarity index 100%
rename from src/test/ui/issues/issue-46023.stderr
rename to src/test/ui/nll/issue-46023.stderr
diff --git a/src/test/ui/issues/issue-18400.rs b/src/test/ui/traits/issue-18400.rs
similarity index 100%
rename from src/test/ui/issues/issue-18400.rs
rename to src/test/ui/traits/issue-18400.rs
diff --git a/src/test/ui/issues/issue-18400.stderr b/src/test/ui/traits/issue-18400.stderr
similarity index 100%
rename from src/test/ui/issues/issue-18400.stderr
rename to src/test/ui/traits/issue-18400.stderr
diff --git a/src/test/ui/issues/issue-18412.rs b/src/test/ui/traits/issue-18412.rs
similarity index 100%
rename from src/test/ui/issues/issue-18412.rs
rename to src/test/ui/traits/issue-18412.rs
diff --git a/src/test/ui/issues/issue-35869.rs b/src/test/ui/traits/issue-35869.rs
similarity index 100%
rename from src/test/ui/issues/issue-35869.rs
rename to src/test/ui/traits/issue-35869.rs
diff --git a/src/test/ui/issues/issue-35869.stderr b/src/test/ui/traits/issue-35869.stderr
similarity index 100%
rename from src/test/ui/issues/issue-35869.stderr
rename to src/test/ui/traits/issue-35869.stderr
diff --git a/src/test/ui/issues/issue-29124.rs b/src/test/ui/typeck/issue-29124.rs
similarity index 100%
rename from src/test/ui/issues/issue-29124.rs
rename to src/test/ui/typeck/issue-29124.rs
diff --git a/src/test/ui/issues/issue-29124.stderr b/src/test/ui/typeck/issue-29124.stderr
similarity index 100%
rename from src/test/ui/issues/issue-29124.stderr
rename to src/test/ui/typeck/issue-29124.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 135a12b55713a561ebab99c2cc5083afd36c513e..f59121181d29b702559b39e9ab5a3cc618e3b710 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,8 +7,8 @@
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 969;
-const ISSUES_ENTRY_LIMIT: usize = 2211;
+const ROOT_ENTRY_LIMIT: usize = 968;
+const ISSUES_ENTRY_LIMIT: usize = 2179;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))