diff --git a/src/test/ui/issues/issue-82869.rs b/src/test/ui/asm/issue-82869.rs
similarity index 100%
rename from src/test/ui/issues/issue-82869.rs
rename to src/test/ui/asm/issue-82869.rs
diff --git a/src/test/ui/issues/issue-82869.stderr b/src/test/ui/asm/issue-82869.stderr
similarity index 100%
rename from src/test/ui/issues/issue-82869.stderr
rename to src/test/ui/asm/issue-82869.stderr
diff --git a/src/test/ui/issues/issue-20005.rs b/src/test/ui/associated-types/issue-20005.rs
similarity index 100%
rename from src/test/ui/issues/issue-20005.rs
rename to src/test/ui/associated-types/issue-20005.rs
diff --git a/src/test/ui/issues/issue-20005.stderr b/src/test/ui/associated-types/issue-20005.stderr
similarity index 100%
rename from src/test/ui/issues/issue-20005.stderr
rename to src/test/ui/associated-types/issue-20005.stderr
diff --git a/src/test/ui/fsu-moves-and-copies.rs b/src/test/ui/borrowck/fsu-moves-and-copies.rs
similarity index 100%
rename from src/test/ui/fsu-moves-and-copies.rs
rename to src/test/ui/borrowck/fsu-moves-and-copies.rs
diff --git a/src/test/ui/issues/issue-37655.rs b/src/test/ui/coercion/issue-37655.rs
similarity index 100%
rename from src/test/ui/issues/issue-37655.rs
rename to src/test/ui/coercion/issue-37655.rs
diff --git a/src/test/ui/test-cfg.rs b/src/test/ui/conditional-compilation/test-cfg.rs
similarity index 100%
rename from src/test/ui/test-cfg.rs
rename to src/test/ui/conditional-compilation/test-cfg.rs
diff --git a/src/test/ui/test-cfg.stderr b/src/test/ui/conditional-compilation/test-cfg.stderr
similarity index 100%
rename from src/test/ui/test-cfg.stderr
rename to src/test/ui/conditional-compilation/test-cfg.stderr
diff --git a/src/test/ui/issues/issue-17756.rs b/src/test/ui/consts/issue-17756.rs
similarity index 100%
rename from src/test/ui/issues/issue-17756.rs
rename to src/test/ui/consts/issue-17756.rs
diff --git a/src/test/ui/issues/issue-69532.rs b/src/test/ui/consts/issue-69532.rs
similarity index 100%
rename from src/test/ui/issues/issue-69532.rs
rename to src/test/ui/consts/issue-69532.rs
diff --git a/src/test/ui/non-integer-atomic.rs b/src/test/ui/intrinsics/non-integer-atomic.rs
similarity index 100%
rename from src/test/ui/non-integer-atomic.rs
rename to src/test/ui/intrinsics/non-integer-atomic.rs
diff --git a/src/test/ui/non-integer-atomic.stderr b/src/test/ui/intrinsics/non-integer-atomic.stderr
similarity index 100%
rename from src/test/ui/non-integer-atomic.stderr
rename to src/test/ui/intrinsics/non-integer-atomic.stderr
diff --git a/src/test/ui/issues/issue-36638.rs b/src/test/ui/keyword/keyword-self-as-type-param.rs
similarity index 85%
rename from src/test/ui/issues/issue-36638.rs
rename to src/test/ui/keyword/keyword-self-as-type-param.rs
index 2e64853697a..785d64ec8ea 100644
--- a/src/test/ui/issues/issue-36638.rs
+++ b/src/test/ui/keyword/keyword-self-as-type-param.rs
@@ -1,3 +1,5 @@
+// Regression test of #36638.
+
 struct Foo<Self>(Self);
 //~^ ERROR expected identifier, found keyword `Self`
 //~^^ ERROR E0392
diff --git a/src/test/ui/issues/issue-36638.stderr b/src/test/ui/keyword/keyword-self-as-type-param.stderr
similarity index 83%
rename from src/test/ui/issues/issue-36638.stderr
rename to src/test/ui/keyword/keyword-self-as-type-param.stderr
index 733fc4af534..cc3df2e36f7 100644
--- a/src/test/ui/issues/issue-36638.stderr
+++ b/src/test/ui/keyword/keyword-self-as-type-param.stderr
@@ -1,17 +1,17 @@
 error: expected identifier, found keyword `Self`
-  --> $DIR/issue-36638.rs:1:12
+  --> $DIR/keyword-self-as-type-param.rs:3:12
    |
 LL | struct Foo<Self>(Self);
    |            ^^^^ expected identifier, found keyword
 
 error: expected identifier, found keyword `Self`
-  --> $DIR/issue-36638.rs:5:11
+  --> $DIR/keyword-self-as-type-param.rs:7:11
    |
 LL | trait Bar<Self> {}
    |           ^^^^ expected identifier, found keyword
 
 error[E0392]: parameter `Self` is never used
-  --> $DIR/issue-36638.rs:1:12
+  --> $DIR/keyword-self-as-type-param.rs:3:12
    |
 LL | struct Foo<Self>(Self);
    |            ^^^^ unused parameter
diff --git a/src/test/ui/issues/issue-52169.rs b/src/test/ui/macros/issue-52169.rs
similarity index 100%
rename from src/test/ui/issues/issue-52169.rs
rename to src/test/ui/macros/issue-52169.rs
diff --git a/src/test/ui/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs b/src/test/ui/nll/issue-24535-allow-mutable-borrow-in-match-guard.rs
similarity index 100%
rename from src/test/ui/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs
rename to src/test/ui/nll/issue-24535-allow-mutable-borrow-in-match-guard.rs
diff --git a/src/test/ui/issues/issue-45157.rs b/src/test/ui/nll/issue-45157.rs
similarity index 100%
rename from src/test/ui/issues/issue-45157.rs
rename to src/test/ui/nll/issue-45157.rs
diff --git a/src/test/ui/issues/issue-45157.stderr b/src/test/ui/nll/issue-45157.stderr
similarity index 100%
rename from src/test/ui/issues/issue-45157.stderr
rename to src/test/ui/nll/issue-45157.stderr
diff --git a/src/test/ui/issues/issue-27060-2.rs b/src/test/ui/packed/issue-27060-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-27060-2.rs
rename to src/test/ui/packed/issue-27060-2.rs
diff --git a/src/test/ui/issues/issue-27060-2.stderr b/src/test/ui/packed/issue-27060-2.stderr
similarity index 100%
rename from src/test/ui/issues/issue-27060-2.stderr
rename to src/test/ui/packed/issue-27060-2.stderr
diff --git a/src/test/ui/issues/issue-27060-rpass.rs b/src/test/ui/packed/issue-27060-rpass.rs
similarity index 100%
rename from src/test/ui/issues/issue-27060-rpass.rs
rename to src/test/ui/packed/issue-27060-rpass.rs
diff --git a/src/test/ui/issues/issue-27060.rs b/src/test/ui/packed/issue-27060.rs
similarity index 100%
rename from src/test/ui/issues/issue-27060.rs
rename to src/test/ui/packed/issue-27060.rs
diff --git a/src/test/ui/issues/issue-27060.stderr b/src/test/ui/packed/issue-27060.stderr
similarity index 100%
rename from src/test/ui/issues/issue-27060.stderr
rename to src/test/ui/packed/issue-27060.stderr
diff --git a/src/test/ui/issues/issue-48636.fixed b/src/test/ui/parser/issue-48636.fixed
similarity index 100%
rename from src/test/ui/issues/issue-48636.fixed
rename to src/test/ui/parser/issue-48636.fixed
diff --git a/src/test/ui/issues/issue-48636.rs b/src/test/ui/parser/issue-48636.rs
similarity index 100%
rename from src/test/ui/issues/issue-48636.rs
rename to src/test/ui/parser/issue-48636.rs
diff --git a/src/test/ui/issues/issue-48636.stderr b/src/test/ui/parser/issue-48636.stderr
similarity index 100%
rename from src/test/ui/issues/issue-48636.stderr
rename to src/test/ui/parser/issue-48636.stderr
diff --git a/src/test/ui/issues/issue-54521-1.rs b/src/test/ui/parser/issue-54521-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-54521-1.rs
rename to src/test/ui/parser/issue-54521-1.rs
diff --git a/src/test/ui/issues/issue-54521-2.fixed b/src/test/ui/parser/issue-54521-2.fixed
similarity index 100%
rename from src/test/ui/issues/issue-54521-2.fixed
rename to src/test/ui/parser/issue-54521-2.fixed
diff --git a/src/test/ui/issues/issue-54521-2.rs b/src/test/ui/parser/issue-54521-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-54521-2.rs
rename to src/test/ui/parser/issue-54521-2.rs
diff --git a/src/test/ui/issues/issue-54521-2.stderr b/src/test/ui/parser/issue-54521-2.stderr
similarity index 100%
rename from src/test/ui/issues/issue-54521-2.stderr
rename to src/test/ui/parser/issue-54521-2.stderr
diff --git a/src/test/ui/issues/issue-54521.fixed b/src/test/ui/parser/issue-54521-3.fixed
similarity index 100%
rename from src/test/ui/issues/issue-54521.fixed
rename to src/test/ui/parser/issue-54521-3.fixed
diff --git a/src/test/ui/issues/issue-54521.rs b/src/test/ui/parser/issue-54521-3.rs
similarity index 100%
rename from src/test/ui/issues/issue-54521.rs
rename to src/test/ui/parser/issue-54521-3.rs
diff --git a/src/test/ui/issues/issue-54521.stderr b/src/test/ui/parser/issue-54521-3.stderr
similarity index 86%
rename from src/test/ui/issues/issue-54521.stderr
rename to src/test/ui/parser/issue-54521-3.stderr
index ffefbfd0348..0f23dd62107 100644
--- a/src/test/ui/issues/issue-54521.stderr
+++ b/src/test/ui/parser/issue-54521-3.stderr
@@ -1,23 +1,23 @@
 error: unmatched angle brackets
-  --> $DIR/issue-54521.rs:11:60
+  --> $DIR/issue-54521-3.rs:11:60
    |
 LL |     let _ = vec![1, 2, 3].into_iter().collect::<Vec<usize>>>>>>();
    |                                                            ^^^^ help: remove extra angle brackets
 
 error: unmatched angle brackets
-  --> $DIR/issue-54521.rs:14:60
+  --> $DIR/issue-54521-3.rs:14:60
    |
 LL |     let _ = vec![1, 2, 3].into_iter().collect::<Vec<usize>>>>>();
    |                                                            ^^^ help: remove extra angle brackets
 
 error: unmatched angle brackets
-  --> $DIR/issue-54521.rs:17:60
+  --> $DIR/issue-54521-3.rs:17:60
    |
 LL |     let _ = vec![1, 2, 3].into_iter().collect::<Vec<usize>>>>();
    |                                                            ^^ help: remove extra angle brackets
 
 error: unmatched angle bracket
-  --> $DIR/issue-54521.rs:20:60
+  --> $DIR/issue-54521-3.rs:20:60
    |
 LL |     let _ = vec![1, 2, 3].into_iter().collect::<Vec<usize>>>();
    |                                                            ^ help: remove extra angle bracket
diff --git a/src/test/ui/test-panic-abort-disabled.rs b/src/test/ui/test-attrs/test-panic-abort-disabled.rs
similarity index 100%
rename from src/test/ui/test-panic-abort-disabled.rs
rename to src/test/ui/test-attrs/test-panic-abort-disabled.rs
diff --git a/src/test/ui/test-panic-abort-disabled.stderr b/src/test/ui/test-attrs/test-panic-abort-disabled.stderr
similarity index 100%
rename from src/test/ui/test-panic-abort-disabled.stderr
rename to src/test/ui/test-attrs/test-panic-abort-disabled.stderr
diff --git a/src/test/ui/test-panic-abort-nocapture.rs b/src/test/ui/test-attrs/test-panic-abort-nocapture.rs
similarity index 100%
rename from src/test/ui/test-panic-abort-nocapture.rs
rename to src/test/ui/test-attrs/test-panic-abort-nocapture.rs
diff --git a/src/test/ui/test-panic-abort-nocapture.run.stderr b/src/test/ui/test-attrs/test-panic-abort-nocapture.run.stderr
similarity index 100%
rename from src/test/ui/test-panic-abort-nocapture.run.stderr
rename to src/test/ui/test-attrs/test-panic-abort-nocapture.run.stderr
diff --git a/src/test/ui/test-panic-abort-nocapture.run.stdout b/src/test/ui/test-attrs/test-panic-abort-nocapture.run.stdout
similarity index 100%
rename from src/test/ui/test-panic-abort-nocapture.run.stdout
rename to src/test/ui/test-attrs/test-panic-abort-nocapture.run.stdout
diff --git a/src/test/ui/test-panic-abort.rs b/src/test/ui/test-attrs/test-panic-abort.rs
similarity index 100%
rename from src/test/ui/test-panic-abort.rs
rename to src/test/ui/test-attrs/test-panic-abort.rs
diff --git a/src/test/ui/test-panic-abort.run.stdout b/src/test/ui/test-attrs/test-panic-abort.run.stdout
similarity index 100%
rename from src/test/ui/test-panic-abort.run.stdout
rename to src/test/ui/test-attrs/test-panic-abort.run.stdout
diff --git a/src/test/ui/test-panic-while-printing.rs b/src/test/ui/test-attrs/test-panic-while-printing.rs
similarity index 100%
rename from src/test/ui/test-panic-while-printing.rs
rename to src/test/ui/test-attrs/test-panic-while-printing.rs
diff --git a/src/test/ui/test-passed-wasm.rs b/src/test/ui/test-attrs/test-passed-wasm.rs
similarity index 100%
rename from src/test/ui/test-passed-wasm.rs
rename to src/test/ui/test-attrs/test-passed-wasm.rs
diff --git a/src/test/ui/test-passed-wasm.run.stdout b/src/test/ui/test-attrs/test-passed-wasm.run.stdout
similarity index 100%
rename from src/test/ui/test-passed-wasm.run.stdout
rename to src/test/ui/test-attrs/test-passed-wasm.run.stdout
diff --git a/src/test/ui/test-passed.rs b/src/test/ui/test-attrs/test-passed.rs
similarity index 100%
rename from src/test/ui/test-passed.rs
rename to src/test/ui/test-attrs/test-passed.rs
diff --git a/src/test/ui/test-passed.run.stdout b/src/test/ui/test-attrs/test-passed.run.stdout
similarity index 100%
rename from src/test/ui/test-passed.run.stdout
rename to src/test/ui/test-attrs/test-passed.run.stdout
diff --git a/src/test/ui/test-thread-capture.rs b/src/test/ui/test-attrs/test-thread-capture.rs
similarity index 100%
rename from src/test/ui/test-thread-capture.rs
rename to src/test/ui/test-attrs/test-thread-capture.rs
diff --git a/src/test/ui/test-thread-capture.run.stdout b/src/test/ui/test-attrs/test-thread-capture.run.stdout
similarity index 100%
rename from src/test/ui/test-thread-capture.run.stdout
rename to src/test/ui/test-attrs/test-thread-capture.run.stdout
diff --git a/src/test/ui/test-thread-nocapture.rs b/src/test/ui/test-attrs/test-thread-nocapture.rs
similarity index 100%
rename from src/test/ui/test-thread-nocapture.rs
rename to src/test/ui/test-attrs/test-thread-nocapture.rs
diff --git a/src/test/ui/test-thread-nocapture.run.stderr b/src/test/ui/test-attrs/test-thread-nocapture.run.stderr
similarity index 100%
rename from src/test/ui/test-thread-nocapture.run.stderr
rename to src/test/ui/test-attrs/test-thread-nocapture.run.stderr
diff --git a/src/test/ui/test-thread-nocapture.run.stdout b/src/test/ui/test-attrs/test-thread-nocapture.run.stdout
similarity index 100%
rename from src/test/ui/test-thread-nocapture.run.stdout
rename to src/test/ui/test-attrs/test-thread-nocapture.run.stdout
diff --git a/src/test/ui/conversion-methods.rs b/src/test/ui/typeck/conversion-methods.rs
similarity index 100%
rename from src/test/ui/conversion-methods.rs
rename to src/test/ui/typeck/conversion-methods.rs
diff --git a/src/test/ui/conversion-methods.stderr b/src/test/ui/typeck/conversion-methods.stderr
similarity index 100%
rename from src/test/ui/conversion-methods.stderr
rename to src/test/ui/typeck/conversion-methods.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index f61295c8830..66d05d9f00e 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 = 1371;
-const ISSUES_ENTRY_LIMIT: usize = 2559;
+const ROOT_ENTRY_LIMIT: usize = 1345;
+const ISSUES_ENTRY_LIMIT: usize = 2530;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))