diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index 8b57db23d01c1..1565b2a2f55f7 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -1384,7 +1384,6 @@ ui/issues/auxiliary/issue-16643.rs
 ui/issues/auxiliary/issue-16725.rs
 ui/issues/auxiliary/issue-17662.rs
 ui/issues/auxiliary/issue-18501.rs
-ui/issues/auxiliary/issue-18514.rs
 ui/issues/auxiliary/issue-18711.rs
 ui/issues/auxiliary/issue-18913-1.rs
 ui/issues/auxiliary/issue-18913-2.rs
@@ -1397,7 +1396,6 @@ ui/issues/auxiliary/issue-2316-b.rs
 ui/issues/auxiliary/issue-2380.rs
 ui/issues/auxiliary/issue-2414-a.rs
 ui/issues/auxiliary/issue-2414-b.rs
-ui/issues/auxiliary/issue-2472-b.rs
 ui/issues/auxiliary/issue-25185-1.rs
 ui/issues/auxiliary/issue-25185-2.rs
 ui/issues/auxiliary/issue-2526.rs
@@ -1422,7 +1420,6 @@ ui/issues/auxiliary/issue-42007-s.rs
 ui/issues/auxiliary/issue-4208-cc.rs
 ui/issues/auxiliary/issue-4545.rs
 ui/issues/auxiliary/issue-48984-aux.rs
-ui/issues/auxiliary/issue-49544.rs
 ui/issues/auxiliary/issue-51798.rs
 ui/issues/auxiliary/issue-52489.rs
 ui/issues/auxiliary/issue-5518.rs
@@ -1452,7 +1449,6 @@ ui/issues/issue-10465.rs
 ui/issues/issue-10545.rs
 ui/issues/issue-10638.rs
 ui/issues/issue-10656.rs
-ui/issues/issue-106755.rs
 ui/issues/issue-10683.rs
 ui/issues/issue-10718.rs
 ui/issues/issue-10734.rs
@@ -1541,7 +1537,6 @@ ui/issues/issue-14308.rs
 ui/issues/issue-14330.rs
 ui/issues/issue-14344.rs
 ui/issues/issue-14366.rs
-ui/issues/issue-14382.rs
 ui/issues/issue-14393.rs
 ui/issues/issue-14399.rs
 ui/issues/issue-14422.rs
@@ -1668,7 +1663,6 @@ ui/issues/issue-18446-2.rs
 ui/issues/issue-18446.rs
 ui/issues/issue-18464.rs
 ui/issues/issue-18501.rs
-ui/issues/issue-18514.rs
 ui/issues/issue-18532.rs
 ui/issues/issue-18539.rs
 ui/issues/issue-18566.rs
@@ -1683,7 +1677,6 @@ ui/issues/issue-18859.rs
 ui/issues/issue-18906.rs
 ui/issues/issue-18913.rs
 ui/issues/issue-18919.rs
-ui/issues/issue-18952.rs
 ui/issues/issue-18959.rs
 ui/issues/issue-18988.rs
 ui/issues/issue-19001.rs
@@ -1747,7 +1740,6 @@ ui/issues/issue-21033.rs
 ui/issues/issue-21140.rs
 ui/issues/issue-21160.rs
 ui/issues/issue-21174-2.rs
-ui/issues/issue-21174.rs
 ui/issues/issue-21177.rs
 ui/issues/issue-21202.rs
 ui/issues/issue-21245.rs
@@ -1803,7 +1795,6 @@ ui/issues/issue-22684.rs
 ui/issues/issue-22706.rs
 ui/issues/issue-22777.rs
 ui/issues/issue-22781.rs
-ui/issues/issue-22789.rs
 ui/issues/issue-2281-part1.rs
 ui/issues/issue-22814.rs
 ui/issues/issue-2284.rs
@@ -1828,7 +1819,6 @@ ui/issues/issue-23189.rs
 ui/issues/issue-23217.rs
 ui/issues/issue-23253.rs
 ui/issues/issue-23261.rs
-ui/issues/issue-23281.rs
 ui/issues/issue-23311.rs
 ui/issues/issue-23336.rs
 ui/issues/issue-23354-2.rs
@@ -1861,7 +1851,6 @@ ui/issues/issue-2428.rs
 ui/issues/issue-24308.rs
 ui/issues/issue-24322.rs
 ui/issues/issue-24352.rs
-ui/issues/issue-24353.rs
 ui/issues/issue-24357.rs
 ui/issues/issue-24363.rs
 ui/issues/issue-24365.rs
@@ -1877,7 +1866,6 @@ ui/issues/issue-24682.rs
 ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
 ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
 ui/issues/issue-2470-bounds-check-overflow.rs
-ui/issues/issue-2472.rs
 ui/issues/issue-24779.rs
 ui/issues/issue-24819.rs
 ui/issues/issue-2487-a.rs
@@ -2055,7 +2043,6 @@ ui/issues/issue-32086.rs
 ui/issues/issue-3220.rs
 ui/issues/issue-32292.rs
 ui/issues/issue-32324.rs
-ui/issues/issue-32326.rs
 ui/issues/issue-32377.rs
 ui/issues/issue-32389.rs
 ui/issues/issue-32518.rs
@@ -2078,18 +2065,15 @@ ui/issues/issue-33525.rs
 ui/issues/issue-33571.rs
 ui/issues/issue-33687.rs
 ui/issues/issue-33770.rs
-ui/issues/issue-3389.rs
 ui/issues/issue-33941.rs
 ui/issues/issue-34047.rs
 ui/issues/issue-34074.rs
 ui/issues/issue-34209.rs
-ui/issues/issue-34229.rs
 ui/issues/issue-3424.rs
 ui/issues/issue-3429.rs
 ui/issues/issue-34334.rs
 ui/issues/issue-34349.rs
 ui/issues/issue-34373.rs
-ui/issues/issue-34418.rs
 ui/issues/issue-34427.rs
 ui/issues/issue-3447.rs
 ui/issues/issue-34503.rs
@@ -2119,7 +2103,6 @@ ui/issues/issue-36075.rs
 ui/issues/issue-3609.rs
 ui/issues/issue-36116.rs
 ui/issues/issue-36260.rs
-ui/issues/issue-36278-prefix-nesting.rs
 ui/issues/issue-36299.rs
 ui/issues/issue-36379.rs
 ui/issues/issue-36400.rs
@@ -2132,7 +2115,6 @@ ui/issues/issue-36786-resolve-call.rs
 ui/issues/issue-3680.rs
 ui/issues/issue-36816.rs
 ui/issues/issue-36836.rs
-ui/issues/issue-36839.rs
 ui/issues/issue-36856.rs
 ui/issues/issue-36936.rs
 ui/issues/issue-36954.rs
@@ -2144,7 +2126,6 @@ ui/issues/issue-37131.rs
 ui/issues/issue-37311-type-length-limit/issue-37311.rs
 ui/issues/issue-37510.rs
 ui/issues/issue-3753.rs
-ui/issues/issue-37534.rs
 ui/issues/issue-37576.rs
 ui/issues/issue-3763.rs
 ui/issues/issue-37665.rs
@@ -2174,8 +2155,6 @@ ui/issues/issue-38942.rs
 ui/issues/issue-3895.rs
 ui/issues/issue-38954.rs
 ui/issues/issue-38987.rs
-ui/issues/issue-39089.rs
-ui/issues/issue-39211.rs
 ui/issues/issue-39367.rs
 ui/issues/issue-39548.rs
 ui/issues/issue-39687.rs
@@ -2196,7 +2175,6 @@ ui/issues/issue-40288-2.rs
 ui/issues/issue-40288.rs
 ui/issues/issue-40951.rs
 ui/issues/issue-41053.rs
-ui/issues/issue-41229-ref-str.rs
 ui/issues/issue-41298.rs
 ui/issues/issue-41479.rs
 ui/issues/issue-41498.rs
@@ -2235,7 +2213,6 @@ ui/issues/issue-43057.rs
 ui/issues/issue-43205.rs
 ui/issues/issue-43250.rs
 ui/issues/issue-43291.rs
-ui/issues/issue-4333.rs
 ui/issues/issue-4335.rs
 ui/issues/issue-43355.rs
 ui/issues/issue-43357.rs
@@ -2287,7 +2264,6 @@ ui/issues/issue-46604.rs
 ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs
 ui/issues/issue-46771.rs
 ui/issues/issue-46855.rs
-ui/issues/issue-46964.rs
 ui/issues/issue-46983.rs
 ui/issues/issue-47073-zero-padded-tuple-struct-indices.rs
 ui/issues/issue-47094.rs
@@ -2321,7 +2297,6 @@ ui/issues/issue-4875.rs
 ui/issues/issue-48984.rs
 ui/issues/issue-49298.rs
 ui/issues/issue-4935.rs
-ui/issues/issue-49544.rs
 ui/issues/issue-49632.rs
 ui/issues/issue-4968.rs
 ui/issues/issue-4972.rs
@@ -2372,9 +2347,7 @@ ui/issues/issue-52262.rs
 ui/issues/issue-52489.rs
 ui/issues/issue-52533.rs
 ui/issues/issue-52717.rs
-ui/issues/issue-5280.rs
 ui/issues/issue-5315.rs
-ui/issues/issue-5321-immediates-with-bare-self.rs
 ui/issues/issue-53251.rs
 ui/issues/issue-53275.rs
 ui/issues/issue-53300.rs
@@ -2384,9 +2357,7 @@ ui/issues/issue-53419.rs
 ui/issues/issue-53568.rs
 ui/issues/issue-5358-1.rs
 ui/issues/issue-53728.rs
-ui/issues/issue-53843.rs
 ui/issues/issue-54044.rs
-ui/issues/issue-54062.rs
 ui/issues/issue-54094.rs
 ui/issues/issue-5439.rs
 ui/issues/issue-54410.rs
@@ -2480,7 +2451,6 @@ ui/issues/issue-66923-show-error-for-correct-call.rs
 ui/issues/issue-67039-unsound-pin-partialeq.rs
 ui/issues/issue-6738.rs
 ui/issues/issue-67535.rs
-ui/issues/issue-67552.rs
 ui/issues/issue-68010-large-zst-consts.rs
 ui/issues/issue-68696-catch-during-unwind.rs
 ui/issues/issue-6892.rs
@@ -2506,7 +2476,6 @@ ui/issues/issue-7178.rs
 ui/issues/issue-72002.rs
 ui/issues/issue-72076.rs
 ui/issues/issue-72278.rs
-ui/issues/issue-7246.rs
 ui/issues/issue-7268.rs
 ui/issues/issue-72839-error-overflow.rs
 ui/issues/issue-72933-match-stack-overflow.rs
@@ -2578,7 +2547,6 @@ ui/issues/issue-9243.rs
 ui/issues/issue-9249.rs
 ui/issues/issue-9259.rs
 ui/issues/issue-92741.rs
-ui/issues/issue-9446.rs
 ui/issues/issue-9725.rs
 ui/issues/issue-9737.rs
 ui/issues/issue-9814.rs
diff --git a/tests/ui/issues/issue-54062.rs b/tests/ui/borrowck/private-field-access-in-mutex-issue-54062.rs
similarity index 80%
rename from tests/ui/issues/issue-54062.rs
rename to tests/ui/borrowck/private-field-access-in-mutex-issue-54062.rs
index 093d6601d4e2e..f145f9c3e529b 100644
--- a/tests/ui/issues/issue-54062.rs
+++ b/tests/ui/borrowck/private-field-access-in-mutex-issue-54062.rs
@@ -10,3 +10,5 @@ fn testing(test: Test) {
     let _ = test.comps.inner.try_lock();
     //~^ ERROR: field `inner` of struct `Mutex` is private
 }
+
+// https://github.com/rust-lang/rust/issues/54062
diff --git a/tests/ui/issues/issue-54062.stderr b/tests/ui/borrowck/private-field-access-in-mutex-issue-54062.stderr
similarity index 81%
rename from tests/ui/issues/issue-54062.stderr
rename to tests/ui/borrowck/private-field-access-in-mutex-issue-54062.stderr
index 75eef543f272e..3ca6dba427c10 100644
--- a/tests/ui/issues/issue-54062.stderr
+++ b/tests/ui/borrowck/private-field-access-in-mutex-issue-54062.stderr
@@ -1,5 +1,5 @@
 error[E0616]: field `inner` of struct `Mutex` is private
-  --> $DIR/issue-54062.rs:10:24
+  --> $DIR/private-field-access-in-mutex-issue-54062.rs:10:24
    |
 LL |     let _ = test.comps.inner.try_lock();
    |                        ^^^^^ private field
diff --git a/tests/ui/issues/issue-4333.rs b/tests/ui/cast/trait-object-cast-segfault-issue-4333.rs
similarity index 76%
rename from tests/ui/issues/issue-4333.rs
rename to tests/ui/cast/trait-object-cast-segfault-issue-4333.rs
index dccaa6f68bd03..24e86d4d930ad 100644
--- a/tests/ui/issues/issue-4333.rs
+++ b/tests/ui/cast/trait-object-cast-segfault-issue-4333.rs
@@ -7,3 +7,5 @@ pub fn main() {
     let stdout = &mut io::stdout() as &mut dyn io::Write;
     stdout.write(b"Hello!");
 }
+
+// https://github.com/rust-lang/rust/issues/4333
diff --git a/tests/ui/issues/issue-36278-prefix-nesting.rs b/tests/ui/coercion/dynamic-size-of-prefix-correctly-issue-36278.rs
similarity index 91%
rename from tests/ui/issues/issue-36278-prefix-nesting.rs
rename to tests/ui/coercion/dynamic-size-of-prefix-correctly-issue-36278.rs
index 3f2ca7a246064..78c0129faa164 100644
--- a/tests/ui/issues/issue-36278-prefix-nesting.rs
+++ b/tests/ui/coercion/dynamic-size-of-prefix-correctly-issue-36278.rs
@@ -18,3 +18,5 @@ fn main() {
     size_of_unsized = mem::size_of_val::<Ack<_>>(&y);
     assert_eq!(size_of_sized, size_of_unsized);
 }
+
+// https://github.com/rust-lang/rust/issues/36278
diff --git a/tests/ui/issues/issue-39211.rs b/tests/ui/const-generics/generic-parameter-in-const-expression-issue-39211.rs
similarity index 83%
rename from tests/ui/issues/issue-39211.rs
rename to tests/ui/const-generics/generic-parameter-in-const-expression-issue-39211.rs
index ab86afc34102b..b2566e5447119 100644
--- a/tests/ui/issues/issue-39211.rs
+++ b/tests/ui/const-generics/generic-parameter-in-const-expression-issue-39211.rs
@@ -12,3 +12,5 @@ fn m<M: Mat>() {
 }
 fn main() {
 }
+
+// https://github.com/rust-lang/rust/issues/39211
diff --git a/tests/ui/issues/issue-39211.stderr b/tests/ui/const-generics/generic-parameter-in-const-expression-issue-39211.stderr
similarity index 76%
rename from tests/ui/issues/issue-39211.stderr
rename to tests/ui/const-generics/generic-parameter-in-const-expression-issue-39211.stderr
index 2124bc667ff5f..e0594c11aef2d 100644
--- a/tests/ui/issues/issue-39211.stderr
+++ b/tests/ui/const-generics/generic-parameter-in-const-expression-issue-39211.stderr
@@ -1,5 +1,5 @@
 error: constant expression depends on a generic parameter
-  --> $DIR/issue-39211.rs:9:17
+  --> $DIR/generic-parameter-in-const-expression-issue-39211.rs:9:17
    |
 LL |     let a = [3; M::Row::DIM];
    |                 ^^^^^^^^^^^
@@ -7,7 +7,7 @@ LL |     let a = [3; M::Row::DIM];
    = note: this may fail depending on what value the parameter takes
 
 error: constant expression depends on a generic parameter
-  --> $DIR/issue-39211.rs:9:13
+  --> $DIR/generic-parameter-in-const-expression-issue-39211.rs:9:13
    |
 LL |     let a = [3; M::Row::DIM];
    |             ^^^^^^^^^^^^^^^^
diff --git a/tests/ui/issues/auxiliary/issue-2472-b.rs b/tests/ui/cross-crate/auxiliary/exporting-impl-from-root-causes-ice-issue-2472-b.rs
similarity index 100%
rename from tests/ui/issues/auxiliary/issue-2472-b.rs
rename to tests/ui/cross-crate/auxiliary/exporting-impl-from-root-causes-ice-issue-2472-b.rs
diff --git a/tests/ui/cross-crate/exporting-impl-from-root-causes-ice-issue-2472.rs b/tests/ui/cross-crate/exporting-impl-from-root-causes-ice-issue-2472.rs
new file mode 100644
index 0000000000000..40da743444622
--- /dev/null
+++ b/tests/ui/cross-crate/exporting-impl-from-root-causes-ice-issue-2472.rs
@@ -0,0 +1,15 @@
+//@ run-pass
+//@ aux-build:exporting-impl-from-root-causes-ice-issue-2472-b.rs
+
+
+extern crate exporting_impl_from_root_causes_ice_issue_2472_b as lib;
+
+use lib::{S, T};
+
+pub fn main() {
+    let s = S(());
+    s.foo();
+    s.bar();
+}
+
+// https://github.com/rust-lang/rust/issues/2472
diff --git a/tests/ui/issues/issue-34229.rs b/tests/ui/derives/invalid-derive-comparison-issue-34229.rs
similarity index 74%
rename from tests/ui/issues/issue-34229.rs
rename to tests/ui/derives/invalid-derive-comparison-issue-34229.rs
index 13e627a492f40..d77ca78dc8167 100644
--- a/tests/ui/issues/issue-34229.rs
+++ b/tests/ui/derives/invalid-derive-comparison-issue-34229.rs
@@ -3,3 +3,5 @@
 //~^ ERROR can't compare `Comparable`
 
 fn main() {}
+
+// https://github.com/rust-lang/rust/issues/34229
diff --git a/tests/ui/issues/issue-34229.stderr b/tests/ui/derives/invalid-derive-comparison-issue-34229.stderr
similarity index 92%
rename from tests/ui/issues/issue-34229.stderr
rename to tests/ui/derives/invalid-derive-comparison-issue-34229.stderr
index 2385284de0b16..b1033e2c0181f 100644
--- a/tests/ui/issues/issue-34229.stderr
+++ b/tests/ui/derives/invalid-derive-comparison-issue-34229.stderr
@@ -1,5 +1,5 @@
 error[E0277]: can't compare `Comparable` with `Comparable`
-  --> $DIR/issue-34229.rs:2:46
+  --> $DIR/invalid-derive-comparison-issue-34229.rs:2:46
    |
 LL | #[derive(PartialEq, PartialOrd)] struct Nope(Comparable);
    |                     ----------               ^^^^^^^^^^ no implementation for `Comparable < Comparable` and `Comparable > Comparable`
diff --git a/tests/ui/issues/issue-9446.rs b/tests/ui/drop/drop-immediate-non-box-ty-issue-9446.rs
similarity index 92%
rename from tests/ui/issues/issue-9446.rs
rename to tests/ui/drop/drop-immediate-non-box-ty-issue-9446.rs
index a6ea91e8785d2..ad3f7b64aa947 100644
--- a/tests/ui/issues/issue-9446.rs
+++ b/tests/ui/drop/drop-immediate-non-box-ty-issue-9446.rs
@@ -28,3 +28,5 @@ pub fn main() {
         Wrapper::new("Bob".to_string()).say_hi();
     }
 }
+
+// https://github.com/rust-lang/rust/issues/9446
diff --git a/tests/ui/issues/issue-32326.rs b/tests/ui/enum/recursive-enum-memory-issue-issue-32326.rs
similarity index 81%
rename from tests/ui/issues/issue-32326.rs
rename to tests/ui/enum/recursive-enum-memory-issue-issue-32326.rs
index e928c66e2cc7e..6b8b04a7c91ac 100644
--- a/tests/ui/issues/issue-32326.rs
+++ b/tests/ui/enum/recursive-enum-memory-issue-issue-32326.rs
@@ -8,3 +8,5 @@ enum Expr { //~ ERROR E0072
 }
 
 fn main() { }
+
+// https://github.com/rust-lang/rust/issues/32326
diff --git a/tests/ui/issues/issue-32326.stderr b/tests/ui/enum/recursive-enum-memory-issue-issue-32326.stderr
similarity index 87%
rename from tests/ui/issues/issue-32326.stderr
rename to tests/ui/enum/recursive-enum-memory-issue-issue-32326.stderr
index 1989a915cc14c..93a640ff90d58 100644
--- a/tests/ui/issues/issue-32326.stderr
+++ b/tests/ui/enum/recursive-enum-memory-issue-issue-32326.stderr
@@ -1,5 +1,5 @@
 error[E0072]: recursive type `Expr` has infinite size
-  --> $DIR/issue-32326.rs:5:1
+  --> $DIR/recursive-enum-memory-issue-issue-32326.rs:5:1
    |
 LL | enum Expr {
    | ^^^^^^^^^
diff --git a/tests/ui/issues/auxiliary/issue-18514.rs b/tests/ui/generics/auxiliary/generic-impl-method-match-autoderef-issue-18514.rs
similarity index 100%
rename from tests/ui/issues/auxiliary/issue-18514.rs
rename to tests/ui/generics/auxiliary/generic-impl-method-match-autoderef-issue-18514.rs
diff --git a/tests/ui/issues/issue-18514.rs b/tests/ui/generics/generic-impl-method-match-autoderef-issue-18514.rs
similarity index 66%
rename from tests/ui/issues/issue-18514.rs
rename to tests/ui/generics/generic-impl-method-match-autoderef-issue-18514.rs
index 89f58d3988d9e..ce4b5b14c6f76 100644
--- a/tests/ui/issues/issue-18514.rs
+++ b/tests/ui/generics/generic-impl-method-match-autoderef-issue-18514.rs
@@ -5,12 +5,14 @@
 // expression that autoderefs through an overloaded generic deref
 // impl.
 
-//@ aux-build:issue-18514.rs
+//@ aux-build:generic-impl-method-match-autoderef-issue-18514.rs
 
-extern crate issue_18514 as ice;
+extern crate generic_impl_method_match_autoderef_issue_18514 as ice;
 use ice::{Tr, St};
 
 fn main() {
     let st: St<()> = St(vec![]);
     st.tr();
 }
+
+// https://github.com/rust-lang/rust/issues/18514
diff --git a/tests/ui/issues/issue-2472.rs b/tests/ui/issues/issue-2472.rs
deleted file mode 100644
index f8f539ed1d19d..0000000000000
--- a/tests/ui/issues/issue-2472.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-//@ run-pass
-//@ aux-build:issue-2472-b.rs
-
-
-extern crate issue_2472_b;
-
-use issue_2472_b::{S, T};
-
-pub fn main() {
-    let s = S(());
-    s.foo();
-    s.bar();
-}
diff --git a/tests/ui/issues/issue-49544.rs b/tests/ui/issues/issue-49544.rs
deleted file mode 100644
index bb052501f8b15..0000000000000
--- a/tests/ui/issues/issue-49544.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-//@ aux-build:issue-49544.rs
-//@ check-pass
-
-extern crate issue_49544;
-use issue_49544::foo;
-
-fn main() {
-    let _ = foo();
-}
diff --git a/tests/ui/issues/auxiliary/issue-49544.rs b/tests/ui/iterators/auxiliary/iterator-adapter-undeclared-type-issue-49544.rs
similarity index 100%
rename from tests/ui/issues/auxiliary/issue-49544.rs
rename to tests/ui/iterators/auxiliary/iterator-adapter-undeclared-type-issue-49544.rs
diff --git a/tests/ui/iterators/iterator-adapter-undeclared-type-issue-49544.rs b/tests/ui/iterators/iterator-adapter-undeclared-type-issue-49544.rs
new file mode 100644
index 0000000000000..d490f2f913d6f
--- /dev/null
+++ b/tests/ui/iterators/iterator-adapter-undeclared-type-issue-49544.rs
@@ -0,0 +1,11 @@
+//@ aux-build:iterator-adapter-undeclared-type-issue-49544.rs
+//@ check-pass
+
+extern crate iterator_adapter_undeclared_type_issue_49544 as lib;
+use lib::foo;
+
+fn main() {
+    let _ = foo();
+}
+
+// https://github.com/rust-lang/rust/issues/49544
diff --git a/tests/ui/issues/issue-34418.rs b/tests/ui/macros/macro-invocation-with-curly-braces-issue-34418.rs
similarity index 79%
rename from tests/ui/issues/issue-34418.rs
rename to tests/ui/macros/macro-invocation-with-curly-braces-issue-34418.rs
index 0dcefb019359f..46dbdd35ef658 100644
--- a/tests/ui/issues/issue-34418.rs
+++ b/tests/ui/macros/macro-invocation-with-curly-braces-issue-34418.rs
@@ -17,3 +17,5 @@ fn g() {
 }
 
 fn main() {}
+
+// https://github.com/rust-lang/rust/issues/34418
diff --git a/tests/ui/issues/issue-106755.rs b/tests/ui/marker_trait_attr/conflicting-send-impls-for-marker-trait-issue-106755.rs
similarity index 92%
rename from tests/ui/issues/issue-106755.rs
rename to tests/ui/marker_trait_attr/conflicting-send-impls-for-marker-trait-issue-106755.rs
index d7e7122ebda16..891b8c1f74d6e 100644
--- a/tests/ui/issues/issue-106755.rs
+++ b/tests/ui/marker_trait_attr/conflicting-send-impls-for-marker-trait-issue-106755.rs
@@ -20,3 +20,5 @@ impl !Send for TestType<i32> {}
 //~^ ERROR `!Send` impls cannot be specialized
 
 fn main() {}
+
+// https://github.com/rust-lang/rust/issues/106755
diff --git a/tests/ui/issues/issue-106755.stderr b/tests/ui/marker_trait_attr/conflicting-send-impls-for-marker-trait-issue-106755.stderr
similarity index 79%
rename from tests/ui/issues/issue-106755.stderr
rename to tests/ui/marker_trait_attr/conflicting-send-impls-for-marker-trait-issue-106755.stderr
index da6b8c5c56325..a3aa000f5c216 100644
--- a/tests/ui/issues/issue-106755.stderr
+++ b/tests/ui/marker_trait_attr/conflicting-send-impls-for-marker-trait-issue-106755.stderr
@@ -1,5 +1,5 @@
 error[E0751]: found both positive and negative implementation of trait `Send` for type `TestType<_>`:
-  --> $DIR/issue-106755.rs:13:1
+  --> $DIR/conflicting-send-impls-for-marker-trait-issue-106755.rs:13:1
    |
 LL | unsafe impl<T: MyTrait + 'static> Send for TestType<T> {}
    | ------------------------------------------------------ positive implementation here
@@ -8,7 +8,7 @@ LL | impl<T: MyTrait> !Send for TestType<T> {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ negative implementation here
 
 error[E0119]: conflicting implementations of trait `Send` for type `TestType<_>`
-  --> $DIR/issue-106755.rs:17:1
+  --> $DIR/conflicting-send-impls-for-marker-trait-issue-106755.rs:17:1
    |
 LL | unsafe impl<T: MyTrait + 'static> Send for TestType<T> {}
    | ------------------------------------------------------ first implementation here
@@ -17,26 +17,26 @@ LL | unsafe impl<T: 'static> Send for TestType<T> {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `TestType<_>`
 
 error[E0367]: `!Send` impl requires `T: MyTrait` but the struct it is implemented for does not
-  --> $DIR/issue-106755.rs:13:9
+  --> $DIR/conflicting-send-impls-for-marker-trait-issue-106755.rs:13:9
    |
 LL | impl<T: MyTrait> !Send for TestType<T> {}
    |         ^^^^^^^
    |
 note: the implementor must specify the same requirement
-  --> $DIR/issue-106755.rs:9:1
+  --> $DIR/conflicting-send-impls-for-marker-trait-issue-106755.rs:9:1
    |
 LL | struct TestType<T>(::std::marker::PhantomData<T>);
    | ^^^^^^^^^^^^^^^^^^
 
 error[E0366]: `!Send` impls cannot be specialized
-  --> $DIR/issue-106755.rs:19:1
+  --> $DIR/conflicting-send-impls-for-marker-trait-issue-106755.rs:19:1
    |
 LL | impl !Send for TestType<i32> {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `i32` is not a generic parameter
 note: use the same sequence of generic lifetime, type and const parameters as the struct definition
-  --> $DIR/issue-106755.rs:9:1
+  --> $DIR/conflicting-send-impls-for-marker-trait-issue-106755.rs:9:1
    |
 LL | struct TestType<T>(::std::marker::PhantomData<T>);
    | ^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/issues/issue-46964.rs b/tests/ui/match/innocent-looking-match-crash-issue-46964.rs
similarity index 87%
rename from tests/ui/issues/issue-46964.rs
rename to tests/ui/match/innocent-looking-match-crash-issue-46964.rs
index 6a29d91df7383..c3efe8747035a 100644
--- a/tests/ui/issues/issue-46964.rs
+++ b/tests/ui/match/innocent-looking-match-crash-issue-46964.rs
@@ -17,3 +17,5 @@ pub fn crash() -> bool {
 }
 
 fn main() {}
+
+// https://github.com/rust-lang/rust/issues/46964
diff --git a/tests/ui/issues/issue-53843.rs b/tests/ui/methods/inherent-method-resolution-on-deref-type-issue-53843.rs
similarity index 86%
rename from tests/ui/issues/issue-53843.rs
rename to tests/ui/methods/inherent-method-resolution-on-deref-type-issue-53843.rs
index d4b0b1e332bdf..0b2ab9afc399e 100644
--- a/tests/ui/issues/issue-53843.rs
+++ b/tests/ui/methods/inherent-method-resolution-on-deref-type-issue-53843.rs
@@ -24,3 +24,5 @@ fn main() {
     let pin = Pin(&mut unit);
     pin.poll();
 }
+
+// https://github.com/rust-lang/rust/issues/53843
diff --git a/tests/ui/issues/issue-67552.rs b/tests/ui/recursion/recursive-impl-trait-iterator-by-ref-issue-67552.rs
similarity index 90%
rename from tests/ui/issues/issue-67552.rs
rename to tests/ui/recursion/recursive-impl-trait-iterator-by-ref-issue-67552.rs
index 53f0e931d60bc..0875d385ddcb5 100644
--- a/tests/ui/issues/issue-67552.rs
+++ b/tests/ui/recursion/recursive-impl-trait-iterator-by-ref-issue-67552.rs
@@ -29,3 +29,5 @@ where
         //~^ ERROR reached the recursion limit while instantiating
     }
 }
+
+// https://github.com/rust-lang/rust/issues/67552
diff --git a/tests/ui/issues/issue-67552.stderr b/tests/ui/recursion/recursive-impl-trait-iterator-by-ref-issue-67552.stderr
similarity index 75%
rename from tests/ui/issues/issue-67552.stderr
rename to tests/ui/recursion/recursive-impl-trait-iterator-by-ref-issue-67552.stderr
index def0a29f3e51e..a398466c4eb79 100644
--- a/tests/ui/issues/issue-67552.stderr
+++ b/tests/ui/recursion/recursive-impl-trait-iterator-by-ref-issue-67552.stderr
@@ -1,11 +1,11 @@
 error: reached the recursion limit while instantiating `rec::<&mut &mut &mut &mut &mut ...>`
-  --> $DIR/issue-67552.rs:28:9
+  --> $DIR/recursive-impl-trait-iterator-by-ref-issue-67552.rs:28:9
    |
 LL |         rec(identity(&mut it))
    |         ^^^^^^^^^^^^^^^^^^^^^^
    |
 note: `rec` defined here
-  --> $DIR/issue-67552.rs:21:1
+  --> $DIR/recursive-impl-trait-iterator-by-ref-issue-67552.rs:21:1
    |
 LL | / fn rec<T>(mut it: T)
 LL | | where
diff --git a/tests/ui/issues/issue-24353.rs b/tests/ui/return/early-return-with-unreachable-code-issue-24353.rs
similarity index 64%
rename from tests/ui/issues/issue-24353.rs
rename to tests/ui/return/early-return-with-unreachable-code-issue-24353.rs
index 369fc238d1173..13add4652d994 100644
--- a/tests/ui/issues/issue-24353.rs
+++ b/tests/ui/return/early-return-with-unreachable-code-issue-24353.rs
@@ -6,3 +6,5 @@ fn main() {
     let x = ();
     x
 }
+
+// https://github.com/rust-lang/rust/issues/24353
diff --git a/tests/ui/issues/issue-37534.rs b/tests/ui/sized/relaxing-default-bound-error-issue-37534.rs
similarity index 75%
rename from tests/ui/issues/issue-37534.rs
rename to tests/ui/sized/relaxing-default-bound-error-issue-37534.rs
index 09d60b7786b99..57b09da31a1c4 100644
--- a/tests/ui/issues/issue-37534.rs
+++ b/tests/ui/sized/relaxing-default-bound-error-issue-37534.rs
@@ -3,3 +3,5 @@ struct Foo<T: ?Hash> {}
 //~| ERROR relaxing a default bound only does something for `?Sized`
 
 fn main() {}
+
+// https://github.com/rust-lang/rust/issues/37534
diff --git a/tests/ui/issues/issue-37534.stderr b/tests/ui/sized/relaxing-default-bound-error-issue-37534.stderr
similarity index 80%
rename from tests/ui/issues/issue-37534.stderr
rename to tests/ui/sized/relaxing-default-bound-error-issue-37534.stderr
index 3219854bc70ce..4eb5e3c6b12af 100644
--- a/tests/ui/issues/issue-37534.stderr
+++ b/tests/ui/sized/relaxing-default-bound-error-issue-37534.stderr
@@ -1,5 +1,5 @@
 error[E0404]: expected trait, found derive macro `Hash`
-  --> $DIR/issue-37534.rs:1:16
+  --> $DIR/relaxing-default-bound-error-issue-37534.rs:1:16
    |
 LL | struct Foo<T: ?Hash> {}
    |                ^^^^ not a trait
@@ -10,7 +10,7 @@ LL + use std::hash::Hash;
    |
 
 error: relaxing a default bound only does something for `?Sized`; all other traits are not bound by default
-  --> $DIR/issue-37534.rs:1:15
+  --> $DIR/relaxing-default-bound-error-issue-37534.rs:1:15
    |
 LL | struct Foo<T: ?Hash> {}
    |               ^^^^^
diff --git a/tests/ui/issues/issue-3389.rs b/tests/ui/structs/trie-node-structure-usage-issue-3389.rs
similarity index 92%
rename from tests/ui/issues/issue-3389.rs
rename to tests/ui/structs/trie-node-structure-usage-issue-3389.rs
index 4e73a2cf0015e..1518e10794443 100644
--- a/tests/ui/issues/issue-3389.rs
+++ b/tests/ui/structs/trie-node-structure-usage-issue-3389.rs
@@ -24,3 +24,5 @@ pub fn main() {
     print_str_vector(node.content.clone());
 
 }
+
+// https://github.com/rust-lang/rust/issues/3389
diff --git a/tests/ui/issues/issue-39089.rs b/tests/ui/trait-bounds/for-binder-placement-error-issue-39089.rs
similarity index 69%
rename from tests/ui/issues/issue-39089.rs
rename to tests/ui/trait-bounds/for-binder-placement-error-issue-39089.rs
index 822c47503afe9..47976bdfff45a 100644
--- a/tests/ui/issues/issue-39089.rs
+++ b/tests/ui/trait-bounds/for-binder-placement-error-issue-39089.rs
@@ -2,3 +2,5 @@ fn f<T: ?for<'a> Sized>() {}
 //~^ ERROR `for<...>` binder should be placed before trait bound modifiers
 
 fn main() {}
+
+// https://github.com/rust-lang/rust/issues/39089
diff --git a/tests/ui/issues/issue-39089.stderr b/tests/ui/trait-bounds/for-binder-placement-error-issue-39089.stderr
similarity index 81%
rename from tests/ui/issues/issue-39089.stderr
rename to tests/ui/trait-bounds/for-binder-placement-error-issue-39089.stderr
index a81010aedff5a..6dc2a562b4769 100644
--- a/tests/ui/issues/issue-39089.stderr
+++ b/tests/ui/trait-bounds/for-binder-placement-error-issue-39089.stderr
@@ -1,5 +1,5 @@
 error: `for<...>` binder should be placed before trait bound modifiers
-  --> $DIR/issue-39089.rs:1:13
+  --> $DIR/for-binder-placement-error-issue-39089.rs:1:13
    |
 LL | fn f<T: ?for<'a> Sized>() {}
    |         -   ^^^^
diff --git a/tests/ui/issues/issue-23281.rs b/tests/ui/traits/dyn-trait-size-error-issue-23281.rs
similarity index 77%
rename from tests/ui/issues/issue-23281.rs
rename to tests/ui/traits/dyn-trait-size-error-issue-23281.rs
index 72716896426e4..8e44b8c879934 100644
--- a/tests/ui/issues/issue-23281.rs
+++ b/tests/ui/traits/dyn-trait-size-error-issue-23281.rs
@@ -10,3 +10,5 @@ struct Vec<T> {
 }
 
 fn main() {}
+
+// https://github.com/rust-lang/rust/issues/23281
diff --git a/tests/ui/issues/issue-23281.stderr b/tests/ui/traits/dyn-trait-size-error-issue-23281.stderr
similarity index 85%
rename from tests/ui/issues/issue-23281.stderr
rename to tests/ui/traits/dyn-trait-size-error-issue-23281.stderr
index ee079f2deeca3..7a927caee989d 100644
--- a/tests/ui/issues/issue-23281.stderr
+++ b/tests/ui/traits/dyn-trait-size-error-issue-23281.stderr
@@ -1,17 +1,17 @@
 error[E0277]: the size for values of type `(dyn Fn() + 'static)` cannot be known at compilation time
-  --> $DIR/issue-23281.rs:4:27
+  --> $DIR/dyn-trait-size-error-issue-23281.rs:4:27
    |
 LL |     pub fn function(funs: Vec<dyn Fn() -> ()>) {}
    |                           ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
    |
    = help: the trait `Sized` is not implemented for `(dyn Fn() + 'static)`
 note: required by an implicit `Sized` bound in `Vec`
-  --> $DIR/issue-23281.rs:8:12
+  --> $DIR/dyn-trait-size-error-issue-23281.rs:8:12
    |
 LL | struct Vec<T> {
    |            ^ required by the implicit `Sized` requirement on this type parameter in `Vec`
 help: you could relax the implicit `Sized` bound on `T` if it were used through indirection like `&T` or `Box<T>`
-  --> $DIR/issue-23281.rs:8:12
+  --> $DIR/dyn-trait-size-error-issue-23281.rs:8:12
    |
 LL | struct Vec<T> {
    |            ^ this could be changed to `T: ?Sized`...
diff --git a/tests/ui/issues/issue-36839.rs b/tests/ui/traits/trait-associated-type-bounds-issue-36839.rs
similarity index 86%
rename from tests/ui/issues/issue-36839.rs
rename to tests/ui/traits/trait-associated-type-bounds-issue-36839.rs
index 654c0f6e4b54a..156c063abc23f 100644
--- a/tests/ui/issues/issue-36839.rs
+++ b/tests/ui/traits/trait-associated-type-bounds-issue-36839.rs
@@ -19,3 +19,5 @@ impl<T> Broken for T {
 fn main() {
     let _m: &dyn Broken<Assoc=()> = &();
 }
+
+// https://github.com/rust-lang/rust/issues/36839
diff --git a/tests/ui/issues/issue-5280.rs b/tests/ui/traits/trait-implementation-for-primitive-type-issue-5280.rs
similarity index 84%
rename from tests/ui/issues/issue-5280.rs
rename to tests/ui/traits/trait-implementation-for-primitive-type-issue-5280.rs
index 66452c3677679..72a4283bc7e2b 100644
--- a/tests/ui/issues/issue-5280.rs
+++ b/tests/ui/traits/trait-implementation-for-primitive-type-issue-5280.rs
@@ -16,3 +16,5 @@ impl FontTableTagConversions for FontTableTag {
 pub fn main() {
     5.tag_to_string();
 }
+
+// https://github.com/rust-lang/rust/issues/5280
diff --git a/tests/ui/issues/issue-5321-immediates-with-bare-self.rs b/tests/ui/traits/trait-implementation-for-usize-issue-5321.rs
similarity index 78%
rename from tests/ui/issues/issue-5321-immediates-with-bare-self.rs
rename to tests/ui/traits/trait-implementation-for-usize-issue-5321.rs
index cb35a641c5e39..ab997b6627a5f 100644
--- a/tests/ui/issues/issue-5321-immediates-with-bare-self.rs
+++ b/tests/ui/traits/trait-implementation-for-usize-issue-5321.rs
@@ -13,3 +13,5 @@ impl Fooable for usize {
 pub fn main() {
     2.yes();
 }
+
+// https://github.com/rust-lang/rust/issues/5321
diff --git a/tests/ui/issues/issue-21174.rs b/tests/ui/transmutability/transmute-between-associated-types-with-lifetimers-issue-21174.rs
similarity index 83%
rename from tests/ui/issues/issue-21174.rs
rename to tests/ui/transmutability/transmute-between-associated-types-with-lifetimers-issue-21174.rs
index 07827425116af..22cb379ffdab0 100644
--- a/tests/ui/issues/issue-21174.rs
+++ b/tests/ui/transmutability/transmute-between-associated-types-with-lifetimers-issue-21174.rs
@@ -9,3 +9,5 @@ fn foo<'a, T: Trait<'a>>(value: T::A) {
 }
 
 fn main() { }
+
+// https://github.com/rust-lang/rust/issues/21174
diff --git a/tests/ui/issues/issue-21174.stderr b/tests/ui/transmutability/transmute-between-associated-types-with-lifetimers-issue-21174.stderr
similarity index 85%
rename from tests/ui/issues/issue-21174.stderr
rename to tests/ui/transmutability/transmute-between-associated-types-with-lifetimers-issue-21174.stderr
index a6b75c913524d..5ce0d959a20a5 100644
--- a/tests/ui/issues/issue-21174.stderr
+++ b/tests/ui/transmutability/transmute-between-associated-types-with-lifetimers-issue-21174.stderr
@@ -1,5 +1,5 @@
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
-  --> $DIR/issue-21174.rs:7:30
+  --> $DIR/transmute-between-associated-types-with-lifetimers-issue-21174.rs:7:30
    |
 LL |     let new: T::B = unsafe { std::mem::transmute(value) };
    |                              ^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/issues/issue-14382.rs b/tests/ui/type-inference/float-type-inference-unification-issue-14382.rs
similarity index 85%
rename from tests/ui/issues/issue-14382.rs
rename to tests/ui/type-inference/float-type-inference-unification-issue-14382.rs
index 74d938783aefe..5bf497d2eabc0 100644
--- a/tests/ui/issues/issue-14382.rs
+++ b/tests/ui/type-inference/float-type-inference-unification-issue-14382.rs
@@ -13,3 +13,5 @@ fn main() {
     let m : Matrix4<f32> = translate(x);
     println!("m: {:?}", m);
 }
+
+// https://github.com/rust-lang/rust/issues/14382
diff --git a/tests/ui/issues/issue-18952.rs b/tests/ui/unboxed-closures/fn-traits-overloading-arity-issue-18952.rs
similarity index 96%
rename from tests/ui/issues/issue-18952.rs
rename to tests/ui/unboxed-closures/fn-traits-overloading-arity-issue-18952.rs
index 9fdafb1ff4a90..4e3bc9b671a5e 100644
--- a/tests/ui/issues/issue-18952.rs
+++ b/tests/ui/unboxed-closures/fn-traits-overloading-arity-issue-18952.rs
@@ -54,3 +54,5 @@ fn main() {
     assert_eq!(foo(1, 1), (2, 2));
     assert_eq!(foo(1, 1, 1), (4, 4, 4));
 }
+
+// https://github.com/rust-lang/rust/issues/18952
diff --git a/tests/ui/issues/issue-22789.rs b/tests/ui/unboxed-closures/unboxed-closure-call-issue-22789.rs
similarity index 71%
rename from tests/ui/issues/issue-22789.rs
rename to tests/ui/unboxed-closures/unboxed-closure-call-issue-22789.rs
index 95ebe6baaa38b..0bc8bed05884c 100644
--- a/tests/ui/issues/issue-22789.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-call-issue-22789.rs
@@ -6,3 +6,5 @@ fn main() {
     let k = |x: i32| { x + 1 };
     Fn::call(&k, (0,));
 }
+
+// https://github.com/rust-lang/rust/issues/22789
diff --git a/tests/ui/issues/issue-7246.rs b/tests/ui/unreachable-code/unreachable-bool-read-issue-7246.rs
similarity index 80%
rename from tests/ui/issues/issue-7246.rs
rename to tests/ui/unreachable-code/unreachable-bool-read-issue-7246.rs
index 7b16fa024f8e4..8bbaa1025493f 100644
--- a/tests/ui/issues/issue-7246.rs
+++ b/tests/ui/unreachable-code/unreachable-bool-read-issue-7246.rs
@@ -9,3 +9,5 @@ pub unsafe fn g() {
 }
 
 pub fn main() {}
+
+// https://github.com/rust-lang/rust/issues/7246
diff --git a/tests/ui/issues/issue-7246.stderr b/tests/ui/unreachable-code/unreachable-bool-read-issue-7246.stderr
similarity index 78%
rename from tests/ui/issues/issue-7246.stderr
rename to tests/ui/unreachable-code/unreachable-bool-read-issue-7246.stderr
index 1fb6ab14e644b..cb8a71fa17d67 100644
--- a/tests/ui/issues/issue-7246.stderr
+++ b/tests/ui/unreachable-code/unreachable-bool-read-issue-7246.stderr
@@ -1,5 +1,5 @@
 error: unreachable statement
-  --> $DIR/issue-7246.rs:7:5
+  --> $DIR/unreachable-bool-read-issue-7246.rs:7:5
    |
 LL |     return;
    |     ------ any code following this expression is unreachable
@@ -7,13 +7,13 @@ LL |     if *ptr::null() {};
    |     ^^^^^^^^^^^^^^^^^^^ unreachable statement
    |
 note: the lint level is defined here
-  --> $DIR/issue-7246.rs:1:9
+  --> $DIR/unreachable-bool-read-issue-7246.rs:1:9
    |
 LL | #![deny(unreachable_code)]
    |         ^^^^^^^^^^^^^^^^
 
 warning: dereferencing a null pointer
-  --> $DIR/issue-7246.rs:7:8
+  --> $DIR/unreachable-bool-read-issue-7246.rs:7:8
    |
 LL |     if *ptr::null() {};
    |        ^^^^^^^^^^^^ this code causes undefined behavior when executed
diff --git a/tests/ui/issues/issue-41229-ref-str.rs b/tests/ui/unsized/unsized-function-argument-issue-41229.rs
similarity index 61%
rename from tests/ui/issues/issue-41229-ref-str.rs
rename to tests/ui/unsized/unsized-function-argument-issue-41229.rs
index fe5e6cd6ec5b1..9210431dc2f74 100644
--- a/tests/ui/issues/issue-41229-ref-str.rs
+++ b/tests/ui/unsized/unsized-function-argument-issue-41229.rs
@@ -2,3 +2,5 @@ pub fn example(ref s: str) {}
 //~^ ERROR the size for values of type
 
 fn main() {}
+
+// https://github.com/rust-lang/rust/issues/41229
diff --git a/tests/ui/issues/issue-41229-ref-str.stderr b/tests/ui/unsized/unsized-function-argument-issue-41229.stderr
similarity index 91%
rename from tests/ui/issues/issue-41229-ref-str.stderr
rename to tests/ui/unsized/unsized-function-argument-issue-41229.stderr
index d4ef2a7772591..905be55db6ffa 100644
--- a/tests/ui/issues/issue-41229-ref-str.stderr
+++ b/tests/ui/unsized/unsized-function-argument-issue-41229.stderr
@@ -1,5 +1,5 @@
 error[E0277]: the size for values of type `str` cannot be known at compilation time
-  --> $DIR/issue-41229-ref-str.rs:1:23
+  --> $DIR/unsized-function-argument-issue-41229.rs:1:23
    |
 LL | pub fn example(ref s: str) {}
    |                       ^^^ doesn't have a size known at compile-time