diff --git a/tests/ui/issues/issue-48728.rs b/tests/ui/coherence/clone-impl-unsized-slice.rs
similarity index 60%
rename from tests/ui/issues/issue-48728.rs
rename to tests/ui/coherence/clone-impl-unsized-slice.rs
index 8ad9289c65cf2..6a36df0166354 100644
--- a/tests/ui/issues/issue-48728.rs
+++ b/tests/ui/coherence/clone-impl-unsized-slice.rs
@@ -1,5 +1,5 @@
-// Regression test for #48728, an ICE that occurred computing
-// coherence "help" information.
+//! Regression test for <https://github.com/rust-lang/rust/issues/48728>.
+//! ICE occurred computing coherence "help" information.
 
 //@ check-pass
 #[derive(Clone)]
diff --git a/tests/ui/issues/issue-46771.rs b/tests/ui/issues/issue-46771.rs
deleted file mode 100644
index 22be8d6af8a7f..0000000000000
--- a/tests/ui/issues/issue-46771.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-fn main() {
-    struct Foo;
-    (1 .. 2).find(|_| Foo(0) == 0); //~ ERROR expected function, found `Foo`
-}
diff --git a/tests/ui/issues/issue-4759-1.rs b/tests/ui/issues/issue-4759-1.rs
deleted file mode 100644
index 7368a7b2f845b..0000000000000
--- a/tests/ui/issues/issue-4759-1.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-//@ run-pass
-trait U { fn f(self); }
-impl U for isize { fn f(self) {} }
-pub fn main() { 4.f(); }
diff --git a/tests/ui/methods/by-value-self-method-on-int.rs b/tests/ui/methods/by-value-self-method-on-int.rs
new file mode 100644
index 0000000000000..c27898b156d86
--- /dev/null
+++ b/tests/ui/methods/by-value-self-method-on-int.rs
@@ -0,0 +1,7 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/4759>.
+//! This used to trigger LLVM assertion.
+//@ run-pass
+
+trait U { fn f(self); }
+impl U for isize { fn f(self) {} }
+pub fn main() { 4.f(); }
diff --git a/tests/ui/issues/issue-4759.rs b/tests/ui/methods/destructure-and-call-self-method.rs
similarity index 60%
rename from tests/ui/issues/issue-4759.rs
rename to tests/ui/methods/destructure-and-call-self-method.rs
index 4b49442b4010f..a88276ec774f1 100644
--- a/tests/ui/issues/issue-4759.rs
+++ b/tests/ui/methods/destructure-and-call-self-method.rs
@@ -1,4 +1,7 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/4759>.
+//! Destructuring a struct and calling consuming method used to segfault.
 //@ run-pass
+
 #![allow(non_shorthand_field_patterns)]
 
 struct T { a: Box<isize> }
diff --git a/tests/ui/issues/issue-50415.rs b/tests/ui/range/inclusive-range-in-closure.rs
similarity index 71%
rename from tests/ui/issues/issue-50415.rs
rename to tests/ui/range/inclusive-range-in-closure.rs
index 5f6211eb149dd..b842fed586608 100644
--- a/tests/ui/issues/issue-50415.rs
+++ b/tests/ui/range/inclusive-range-in-closure.rs
@@ -1,4 +1,7 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/50415>.
+//! Test inclusive ranges in closures don't ICE.
 //@ run-pass
+
 fn main() {
     // Simplified test case
     let _ = || 0..=1;
diff --git a/tests/ui/issues/issue-47094.rs b/tests/ui/repr/conflicting-repr-enum-attrs.rs
similarity index 58%
rename from tests/ui/issues/issue-47094.rs
rename to tests/ui/repr/conflicting-repr-enum-attrs.rs
index c5d37feb1447f..d7e629d230c02 100644
--- a/tests/ui/issues/issue-47094.rs
+++ b/tests/ui/repr/conflicting-repr-enum-attrs.rs
@@ -1,3 +1,7 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/47094>.
+//! Test `conflicting representation hints` warning is being triggered
+//! when there are multiple repr attributes.
+
 #[repr(C, u8)] //~ ERROR conflicting representation hints
 //~^ WARN this was previously accepted
 enum Foo {
diff --git a/tests/ui/issues/issue-47094.stderr b/tests/ui/repr/conflicting-repr-enum-attrs.stderr
similarity index 90%
rename from tests/ui/issues/issue-47094.stderr
rename to tests/ui/repr/conflicting-repr-enum-attrs.stderr
index da414d68214a8..6810a2a2a1171 100644
--- a/tests/ui/issues/issue-47094.stderr
+++ b/tests/ui/repr/conflicting-repr-enum-attrs.stderr
@@ -1,5 +1,5 @@
 error[E0566]: conflicting representation hints
-  --> $DIR/issue-47094.rs:1:8
+  --> $DIR/conflicting-repr-enum-attrs.rs:5:8
    |
 LL | #[repr(C, u8)]
    |        ^  ^^
@@ -9,7 +9,7 @@ LL | #[repr(C, u8)]
    = note: `#[deny(conflicting_repr_hints)]` (part of `#[deny(future_incompatible)]`) on by default
 
 error[E0566]: conflicting representation hints
-  --> $DIR/issue-47094.rs:8:8
+  --> $DIR/conflicting-repr-enum-attrs.rs:12:8
    |
 LL | #[repr(C)]
    |        ^
@@ -25,7 +25,7 @@ error: aborting due to 2 previous errors
 For more information about this error, try `rustc --explain E0566`.
 Future incompatibility report: Future breakage diagnostic:
 error[E0566]: conflicting representation hints
-  --> $DIR/issue-47094.rs:1:8
+  --> $DIR/conflicting-repr-enum-attrs.rs:5:8
    |
 LL | #[repr(C, u8)]
    |        ^  ^^
@@ -36,7 +36,7 @@ LL | #[repr(C, u8)]
 
 Future breakage diagnostic:
 error[E0566]: conflicting representation hints
-  --> $DIR/issue-47094.rs:8:8
+  --> $DIR/conflicting-repr-enum-attrs.rs:12:8
    |
 LL | #[repr(C)]
    |        ^
diff --git a/tests/ui/issues/issue-4736.rs b/tests/ui/structs/tuple-struct-init-with-named-field.rs
similarity index 56%
rename from tests/ui/issues/issue-4736.rs
rename to tests/ui/structs/tuple-struct-init-with-named-field.rs
index 799d2d4809860..586d96284e170 100644
--- a/tests/ui/issues/issue-4736.rs
+++ b/tests/ui/structs/tuple-struct-init-with-named-field.rs
@@ -1,3 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/4736>.
+//! This used to ICE.
+
 struct NonCopyable(());
 
 fn main() {
diff --git a/tests/ui/issues/issue-4736.stderr b/tests/ui/structs/tuple-struct-init-with-named-field.stderr
similarity index 90%
rename from tests/ui/issues/issue-4736.stderr
rename to tests/ui/structs/tuple-struct-init-with-named-field.stderr
index b099e528ca8a8..1fb3b0be0b02e 100644
--- a/tests/ui/issues/issue-4736.stderr
+++ b/tests/ui/structs/tuple-struct-init-with-named-field.stderr
@@ -1,5 +1,5 @@
 error[E0560]: struct `NonCopyable` has no field named `p`
-  --> $DIR/issue-4736.rs:4:26
+  --> $DIR/tuple-struct-init-with-named-field.rs:7:26
    |
 LL | struct NonCopyable(());
    |        ----------- `NonCopyable` defined here
diff --git a/tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed b/tests/ui/suggestions/borrow-cast-or-binexpr-with-parens.fixed
similarity index 73%
rename from tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed
rename to tests/ui/suggestions/borrow-cast-or-binexpr-with-parens.fixed
index d8402cdf07e38..157ed7e609d07 100644
--- a/tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed
+++ b/tests/ui/suggestions/borrow-cast-or-binexpr-with-parens.fixed
@@ -1,3 +1,5 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/46756>.
+//! Test reference suggestion correctly puts cast in parentheses.
 //@ run-rustfix
 
 #![allow(unused)]
diff --git a/tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs b/tests/ui/suggestions/borrow-cast-or-binexpr-with-parens.rs
similarity index 73%
rename from tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs
rename to tests/ui/suggestions/borrow-cast-or-binexpr-with-parens.rs
index 0e04680911c80..3657cc67f7588 100644
--- a/tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs
+++ b/tests/ui/suggestions/borrow-cast-or-binexpr-with-parens.rs
@@ -1,3 +1,5 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/46756>.
+//! Test reference suggestion correctly puts cast in parentheses.
 //@ run-rustfix
 
 #![allow(unused)]
diff --git a/tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr b/tests/ui/suggestions/borrow-cast-or-binexpr-with-parens.stderr
similarity index 83%
rename from tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr
rename to tests/ui/suggestions/borrow-cast-or-binexpr-with-parens.stderr
index 211dd51289595..61b309291438c 100644
--- a/tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr
+++ b/tests/ui/suggestions/borrow-cast-or-binexpr-with-parens.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-46756-consider-borrowing-cast-or-binexpr.rs:12:42
+  --> $DIR/borrow-cast-or-binexpr-with-parens.rs:14:42
    |
 LL |     light_flows_our_war_of_mocking_words(behold as usize);
    |     ------------------------------------ ^^^^^^^^^^^^^^^ expected `&usize`, found `usize`
@@ -7,7 +7,7 @@ LL |     light_flows_our_war_of_mocking_words(behold as usize);
    |     arguments to this function are incorrect
    |
 note: function defined here
-  --> $DIR/issue-46756-consider-borrowing-cast-or-binexpr.rs:5:4
+  --> $DIR/borrow-cast-or-binexpr-with-parens.rs:7:4
    |
 LL | fn light_flows_our_war_of_mocking_words(and_yet: &usize) -> usize {
    |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ---------------
@@ -17,7 +17,7 @@ LL |     light_flows_our_war_of_mocking_words(&(behold as usize));
    |                                          ++               +
 
 error[E0308]: mismatched types
-  --> $DIR/issue-46756-consider-borrowing-cast-or-binexpr.rs:14:42
+  --> $DIR/borrow-cast-or-binexpr-with-parens.rs:16:42
    |
 LL |     light_flows_our_war_of_mocking_words(with_tears + 4);
    |     ------------------------------------ ^^^^^^^^^^^^^^ expected `&usize`, found `usize`
@@ -25,7 +25,7 @@ LL |     light_flows_our_war_of_mocking_words(with_tears + 4);
    |     arguments to this function are incorrect
    |
 note: function defined here
-  --> $DIR/issue-46756-consider-borrowing-cast-or-binexpr.rs:5:4
+  --> $DIR/borrow-cast-or-binexpr-with-parens.rs:7:4
    |
 LL | fn light_flows_our_war_of_mocking_words(and_yet: &usize) -> usize {
    |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ---------------
diff --git a/tests/ui/issues/issue-47309.rs b/tests/ui/traits/default-method/mono-item-collector-on-impl-with-lifetimes.rs
similarity index 54%
rename from tests/ui/issues/issue-47309.rs
rename to tests/ui/traits/default-method/mono-item-collector-on-impl-with-lifetimes.rs
index 99f1ccbc5758c..44c1e171835c8 100644
--- a/tests/ui/issues/issue-47309.rs
+++ b/tests/ui/traits/default-method/mono-item-collector-on-impl-with-lifetimes.rs
@@ -1,6 +1,6 @@
-// Make sure that the mono-item collector does not crash when trying to
-// instantiate a default impl of a method with lifetime parameters.
-// See https://github.com/rust-lang/rust/issues/47309
+//! Regression test for <https://github.com/rust-lang/rust/issues/47309>.
+//! Make sure that the mono-item collector does not crash when trying to
+//! instantiate a default impl of a method with lifetime parameters.
 
 //@ compile-flags:-Clink-dead-code
 //@ build-pass
diff --git a/tests/ui/typeck/call-unit-struct-as-fn.rs b/tests/ui/typeck/call-unit-struct-as-fn.rs
new file mode 100644
index 0000000000000..2fe2085dd72a9
--- /dev/null
+++ b/tests/ui/typeck/call-unit-struct-as-fn.rs
@@ -0,0 +1,7 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/46771>.
+//! Test calling unit struct as fn doesn't ICE.
+
+fn main() {
+    struct Foo;
+    (1 .. 2).find(|_| Foo(0) == 0); //~ ERROR expected function, found `Foo`
+}
diff --git a/tests/ui/issues/issue-46771.stderr b/tests/ui/typeck/call-unit-struct-as-fn.stderr
similarity index 90%
rename from tests/ui/issues/issue-46771.stderr
rename to tests/ui/typeck/call-unit-struct-as-fn.stderr
index fab55fbfd704a..8056d0df57f99 100644
--- a/tests/ui/issues/issue-46771.stderr
+++ b/tests/ui/typeck/call-unit-struct-as-fn.stderr
@@ -1,5 +1,5 @@
 error[E0618]: expected function, found `Foo`
-  --> $DIR/issue-46771.rs:3:23
+  --> $DIR/call-unit-struct-as-fn.rs:6:23
    |
 LL |     struct Foo;
    |     ---------- `Foo` defined here
diff --git a/tests/ui/issues/issue-48131.rs b/tests/ui/unsafe/unused-unsafe-in-nested-fn-lint.rs
similarity index 89%
rename from tests/ui/issues/issue-48131.rs
rename to tests/ui/unsafe/unused-unsafe-in-nested-fn-lint.rs
index a1084ea243b26..92b9bbfefc88e 100644
--- a/tests/ui/issues/issue-48131.rs
+++ b/tests/ui/unsafe/unused-unsafe-in-nested-fn-lint.rs
@@ -1,3 +1,5 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/48131>.
+
 // This note is annotated because the purpose of the test
 // is to ensure that certain other notes are not generated.
 #![deny(unused_unsafe)]
diff --git a/tests/ui/issues/issue-48131.stderr b/tests/ui/unsafe/unused-unsafe-in-nested-fn-lint.stderr
similarity index 72%
rename from tests/ui/issues/issue-48131.stderr
rename to tests/ui/unsafe/unused-unsafe-in-nested-fn-lint.stderr
index fe0cd4efae891..cc5fab4fcdf94 100644
--- a/tests/ui/issues/issue-48131.stderr
+++ b/tests/ui/unsafe/unused-unsafe-in-nested-fn-lint.stderr
@@ -1,17 +1,17 @@
 error: unnecessary `unsafe` block
-  --> $DIR/issue-48131.rs:9:9
+  --> $DIR/unused-unsafe-in-nested-fn-lint.rs:11:9
    |
 LL |         unsafe { /* unnecessary */ }
    |         ^^^^^^ unnecessary `unsafe` block
    |
 note: the lint level is defined here
-  --> $DIR/issue-48131.rs:3:9
+  --> $DIR/unused-unsafe-in-nested-fn-lint.rs:5:9
    |
 LL | #![deny(unused_unsafe)]
    |         ^^^^^^^^^^^^^
 
 error: unnecessary `unsafe` block
-  --> $DIR/issue-48131.rs:19:13
+  --> $DIR/unused-unsafe-in-nested-fn-lint.rs:21:13
    |
 LL |             unsafe { /* unnecessary */ }
    |             ^^^^^^ unnecessary `unsafe` block