diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index d5df05bacd9..03f8a701627 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -14,8 +14,8 @@
 // #73494.
 const ENTRY_LIMIT: usize = 900;
 // FIXME: The following limits should be reduced eventually.
-const ISSUES_ENTRY_LIMIT: usize = 1819;
-const ROOT_ENTRY_LIMIT: usize = 872;
+const ISSUES_ENTRY_LIMIT: usize = 1794;
+const ROOT_ENTRY_LIMIT: usize = 870;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
     "rs",     // test source files
diff --git a/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2015.stderr b/tests/ui/async-await/issue-65634-raw-ident-suggestion.edition2015.stderr
similarity index 100%
rename from tests/ui/issues/issue-65634-raw-ident-suggestion.edition2015.stderr
rename to tests/ui/async-await/issue-65634-raw-ident-suggestion.edition2015.stderr
diff --git a/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2018.stderr b/tests/ui/async-await/issue-65634-raw-ident-suggestion.edition2018.stderr
similarity index 100%
rename from tests/ui/issues/issue-65634-raw-ident-suggestion.edition2018.stderr
rename to tests/ui/async-await/issue-65634-raw-ident-suggestion.edition2018.stderr
diff --git a/tests/ui/issues/issue-65634-raw-ident-suggestion.rs b/tests/ui/async-await/issue-65634-raw-ident-suggestion.rs
similarity index 100%
rename from tests/ui/issues/issue-65634-raw-ident-suggestion.rs
rename to tests/ui/async-await/issue-65634-raw-ident-suggestion.rs
diff --git a/tests/ui/issues/issue-62375.rs b/tests/ui/binop/issue-62375.rs
similarity index 100%
rename from tests/ui/issues/issue-62375.rs
rename to tests/ui/binop/issue-62375.rs
diff --git a/tests/ui/issues/issue-62375.stderr b/tests/ui/binop/issue-62375.stderr
similarity index 100%
rename from tests/ui/issues/issue-62375.stderr
rename to tests/ui/binop/issue-62375.stderr
diff --git a/tests/ui/issues/issue-82833-slice-miscompile.rs b/tests/ui/codegen/issue-82833-slice-miscompile.rs
similarity index 100%
rename from tests/ui/issues/issue-82833-slice-miscompile.rs
rename to tests/ui/codegen/issue-82833-slice-miscompile.rs
diff --git a/tests/ui/issues/issue-26905-rpass.rs b/tests/ui/coercion/issue-26905-rpass.rs
similarity index 100%
rename from tests/ui/issues/issue-26905-rpass.rs
rename to tests/ui/coercion/issue-26905-rpass.rs
diff --git a/tests/ui/issues/issue-26905.rs b/tests/ui/coercion/issue-26905.rs
similarity index 100%
rename from tests/ui/issues/issue-26905.rs
rename to tests/ui/coercion/issue-26905.rs
diff --git a/tests/ui/issues/issue-26905.stderr b/tests/ui/coercion/issue-26905.stderr
similarity index 100%
rename from tests/ui/issues/issue-26905.stderr
rename to tests/ui/coercion/issue-26905.stderr
diff --git a/tests/ui/extern-mod-syntax.rs b/tests/ui/extern-mod-syntax.rs
deleted file mode 100644
index 65dfa6a0f57..00000000000
--- a/tests/ui/extern-mod-syntax.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// run-pass
-
-#![allow(unused_imports)]
-#![no_std]
-
-extern crate std;
-use std::ffi::c_void;
-
-pub fn main() {
-    std::println!("Hello world!");
-}
diff --git a/tests/ui/issues/issue-16250.rs b/tests/ui/extern/issue-16250.rs
similarity index 100%
rename from tests/ui/issues/issue-16250.rs
rename to tests/ui/extern/issue-16250.rs
diff --git a/tests/ui/issues/issue-16250.stderr b/tests/ui/extern/issue-16250.stderr
similarity index 100%
rename from tests/ui/issues/issue-16250.stderr
rename to tests/ui/extern/issue-16250.stderr
diff --git a/tests/ui/issues/issue-47725.rs b/tests/ui/extern/issue-47725.rs
similarity index 100%
rename from tests/ui/issues/issue-47725.rs
rename to tests/ui/extern/issue-47725.rs
diff --git a/tests/ui/issues/issue-47725.stderr b/tests/ui/extern/issue-47725.stderr
similarity index 100%
rename from tests/ui/issues/issue-47725.stderr
rename to tests/ui/extern/issue-47725.stderr
diff --git a/tests/ui/issues/issue-3878.rs b/tests/ui/issues/issue-3878.rs
deleted file mode 100644
index 6de3405af0d..00000000000
--- a/tests/ui/issues/issue-3878.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// run-pass
-// pretty-expanded FIXME #23616
-
-#![allow(path_statements)]
-
-pub fn main() {
-    let y: Box<_> = Box::new(1);
-    y;
-}
diff --git a/tests/ui/auxiliary/hello_macro.rs b/tests/ui/macros/auxiliary/hello_macro.rs
similarity index 100%
rename from tests/ui/auxiliary/hello_macro.rs
rename to tests/ui/macros/auxiliary/hello_macro.rs
diff --git a/tests/ui/issues/issue-46438.rs b/tests/ui/macros/issue-46438.rs
similarity index 100%
rename from tests/ui/issues/issue-46438.rs
rename to tests/ui/macros/issue-46438.rs
diff --git a/tests/ui/issues/issue-46438.stderr b/tests/ui/macros/issue-46438.stderr
similarity index 100%
rename from tests/ui/issues/issue-46438.stderr
rename to tests/ui/macros/issue-46438.stderr
diff --git a/tests/ui/macro-quote-test.rs b/tests/ui/macros/macro-quote-test.rs
similarity index 100%
rename from tests/ui/macro-quote-test.rs
rename to tests/ui/macros/macro-quote-test.rs
diff --git a/tests/ui/issues/issue-28992-empty.rs b/tests/ui/pattern/issue-28992-empty.rs
similarity index 100%
rename from tests/ui/issues/issue-28992-empty.rs
rename to tests/ui/pattern/issue-28992-empty.rs
diff --git a/tests/ui/issues/issue-28992-empty.stderr b/tests/ui/pattern/issue-28992-empty.stderr
similarity index 100%
rename from tests/ui/issues/issue-28992-empty.stderr
rename to tests/ui/pattern/issue-28992-empty.stderr
diff --git a/tests/ui/issues/auxiliary/private-trait-xc.rs b/tests/ui/privacy/auxiliary/private-trait-xc.rs
similarity index 100%
rename from tests/ui/issues/auxiliary/private-trait-xc.rs
rename to tests/ui/privacy/auxiliary/private-trait-xc.rs
diff --git a/tests/ui/issues/issue-11593.rs b/tests/ui/privacy/issue-11593.rs
similarity index 100%
rename from tests/ui/issues/issue-11593.rs
rename to tests/ui/privacy/issue-11593.rs
diff --git a/tests/ui/issues/issue-11593.stderr b/tests/ui/privacy/issue-11593.stderr
similarity index 100%
rename from tests/ui/issues/issue-11593.stderr
rename to tests/ui/privacy/issue-11593.stderr
diff --git a/tests/ui/issues/issue-33096.rs b/tests/ui/traits/issue-33096.rs
similarity index 100%
rename from tests/ui/issues/issue-33096.rs
rename to tests/ui/traits/issue-33096.rs
diff --git a/tests/ui/issues/issue-40085.rs b/tests/ui/traits/issue-40085.rs
similarity index 100%
rename from tests/ui/issues/issue-40085.rs
rename to tests/ui/traits/issue-40085.rs
diff --git a/tests/ui/issues/issue-58344.rs b/tests/ui/traits/issue-58344.rs
similarity index 100%
rename from tests/ui/issues/issue-58344.rs
rename to tests/ui/traits/issue-58344.rs
diff --git a/tests/ui/issues/issue-16338.rs b/tests/ui/typeck/issue-16338.rs
similarity index 100%
rename from tests/ui/issues/issue-16338.rs
rename to tests/ui/typeck/issue-16338.rs
diff --git a/tests/ui/issues/issue-16338.stderr b/tests/ui/typeck/issue-16338.stderr
similarity index 100%
rename from tests/ui/issues/issue-16338.stderr
rename to tests/ui/typeck/issue-16338.stderr