diff --git a/tests/ui/issues/issue-51655.rs b/tests/ui/consts/const_in_pattern/const-bytes-slice-pattern.rs
similarity index 67%
rename from tests/ui/issues/issue-51655.rs
rename to tests/ui/consts/const_in_pattern/const-bytes-slice-pattern.rs
index 05f71623d1419..028c7a74bd640 100644
--- a/tests/ui/issues/issue-51655.rs
+++ b/tests/ui/consts/const_in_pattern/const-bytes-slice-pattern.rs
@@ -1,4 +1,7 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/51655>.
+//! This used to ICE.
 //@ check-pass
+
 #![allow(dead_code)]
 
 const PATH_DOT: &[u8] = &[b'.'];
diff --git a/tests/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs b/tests/ui/debuginfo/auxiliary/cross-crate-multibyte-debuginfo-comments.rs
similarity index 85%
rename from tests/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
rename to tests/ui/debuginfo/auxiliary/cross-crate-multibyte-debuginfo-comments.rs
index 215145a64b177..eec8c8e1d0d4e 100644
--- a/tests/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
+++ b/tests/ui/debuginfo/auxiliary/cross-crate-multibyte-debuginfo-comments.rs
@@ -1,9 +1,10 @@
-use std::fmt;
+//! Auxiliary file for <https://github.com/rust-lang/rust/issues/24687>.
+//! This is a file with many multi-byte characters, to try to encourage
+//! the compiler to trip on them. The Drop implementation below will
+//! need to have its source location embedded into the debug info for
+//! the output file.
 
-// This ia file with many multi-byte characters, to try to encourage
-// the compiler to trip on them.  The Drop implementation below will
-// need to have its source location embedded into the debug info for
-// the output file.
+use std::fmt;
 
 // αααααααααααααααααααααααααααααααααααααααααααααααααααααααααααααααααααααα
 // ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
diff --git a/tests/ui/debuginfo/auxiliary/cross-crate-multibyte-debuginfo.rs b/tests/ui/debuginfo/auxiliary/cross-crate-multibyte-debuginfo.rs
new file mode 100644
index 0000000000000..695fccc4519a8
--- /dev/null
+++ b/tests/ui/debuginfo/auxiliary/cross-crate-multibyte-debuginfo.rs
@@ -0,0 +1,10 @@
+//! Auxiliary file for <https://github.com/rust-lang/rust/issues/24687>.
+//! This is a file that pulls in a separate file as a submodule, where
+//! that separate file has many multi-byte characters, to try to
+//! encourage the compiler to trip on them.
+#![crate_type="lib"]
+
+#[path = "cross-crate-multibyte-debuginfo-comments.rs"]
+mod issue_24687_mbcs_in_comments;
+
+pub use issue_24687_mbcs_in_comments::D;
diff --git a/tests/ui/issues/issue-24687-embed-debuginfo/main.rs b/tests/ui/debuginfo/cross-crate-multibyte-debuginfo.rs
similarity index 63%
rename from tests/ui/issues/issue-24687-embed-debuginfo/main.rs
rename to tests/ui/debuginfo/cross-crate-multibyte-debuginfo.rs
index d1ab717264b4c..026aecaa5f277 100644
--- a/tests/ui/issues/issue-24687-embed-debuginfo/main.rs
+++ b/tests/ui/debuginfo/cross-crate-multibyte-debuginfo.rs
@@ -1,8 +1,9 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/24687>.
 //@ run-pass
-//@ aux-build:issue-24687-lib.rs
+//@ aux-build:cross-crate-multibyte-debuginfo.rs
 //@ compile-flags:-g
 
-extern crate issue_24687_lib as d;
+extern crate cross_crate_multibyte_debuginfo as d;
 
 fn main() {
     // Create a `D`, which has a destructor whose body will be codegen'ed
diff --git a/tests/ui/issues/issue-50618.rs b/tests/ui/functional-struct-update/fru-unknown-field-in-closure.rs
similarity index 75%
rename from tests/ui/issues/issue-50618.rs
rename to tests/ui/functional-struct-update/fru-unknown-field-in-closure.rs
index 5f762bc431e12..c9fb4e2774938 100644
--- a/tests/ui/issues/issue-50618.rs
+++ b/tests/ui/functional-struct-update/fru-unknown-field-in-closure.rs
@@ -1,3 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/50618>.
+//! This used to ICE.
+
 struct Point {
     pub x: u64,
     pub y: u64,
diff --git a/tests/ui/issues/issue-50618.stderr b/tests/ui/functional-struct-update/fru-unknown-field-in-closure.stderr
similarity index 86%
rename from tests/ui/issues/issue-50618.stderr
rename to tests/ui/functional-struct-update/fru-unknown-field-in-closure.stderr
index 1a3514fb715d1..990e65c87aaae 100644
--- a/tests/ui/issues/issue-50618.stderr
+++ b/tests/ui/functional-struct-update/fru-unknown-field-in-closure.stderr
@@ -1,5 +1,5 @@
 error[E0560]: struct `Point` has no field named `nonexistent`
-  --> $DIR/issue-50618.rs:14:13
+  --> $DIR/fru-unknown-field-in-closure.rs:17:13
    |
 LL |             nonexistent: 0,
    |             ^^^^^^^^^^^ `Point` does not have this field
diff --git a/tests/ui/issues/issue-51116.rs b/tests/ui/inference/need_type_info/for-loop-nested-array-inference.rs
similarity index 66%
rename from tests/ui/issues/issue-51116.rs
rename to tests/ui/inference/need_type_info/for-loop-nested-array-inference.rs
index 4c21cbfc61d43..a6f35620fcc9b 100644
--- a/tests/ui/issues/issue-51116.rs
+++ b/tests/ui/inference/need_type_info/for-loop-nested-array-inference.rs
@@ -1,3 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/51116>.
+//! This used to leak internal `__next` ident into suggestion.
+
 fn main() {
     let tiles = Default::default();
     for row in &mut tiles {
diff --git a/tests/ui/issues/issue-51116.stderr b/tests/ui/inference/need_type_info/for-loop-nested-array-inference.stderr
similarity index 81%
rename from tests/ui/issues/issue-51116.stderr
rename to tests/ui/inference/need_type_info/for-loop-nested-array-inference.stderr
index 4839a0d46095f..75f84797cecd9 100644
--- a/tests/ui/issues/issue-51116.stderr
+++ b/tests/ui/inference/need_type_info/for-loop-nested-array-inference.stderr
@@ -1,5 +1,5 @@
 error[E0282]: type annotations needed
-  --> $DIR/issue-51116.rs:5:13
+  --> $DIR/for-loop-nested-array-inference.rs:8:13
    |
 LL |             *tile = 0;
    |             ^^^^^ cannot infer type
diff --git a/tests/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs b/tests/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
deleted file mode 100644
index 5b1b1389cebb3..0000000000000
--- a/tests/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![crate_type="lib"]
-
-// This is a file that pulls in a separate file as a submodule, where
-// that separate file has many multi-byte characters, to try to
-// encourage the compiler to trip on them.
-
-#[path = "issue-24687-mbcs-in-comments.rs"]
-mod issue_24687_mbcs_in_comments;
-
-pub use issue_24687_mbcs_in_comments::D;
diff --git a/tests/ui/issues/issue-5315.rs b/tests/ui/issues/issue-5315.rs
deleted file mode 100644
index 29a6f8f2934a1..0000000000000
--- a/tests/ui/issues/issue-5315.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-//@ run-pass
-
-struct A(#[allow(dead_code)] bool);
-
-pub fn main() {
-    let f = A;
-    f(true);
-}
diff --git a/tests/ui/issues/issue-67039-unsound-pin-partialeq.rs b/tests/ui/issues/issue-67039-unsound-pin-partialeq.rs
deleted file mode 100644
index a496e58a79bdd..0000000000000
--- a/tests/ui/issues/issue-67039-unsound-pin-partialeq.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Pin's PartialEq implementation allowed to access the pointer allowing for
-// unsoundness by using Rc::get_mut to move value within Rc.
-// See https://internals.rust-lang.org/t/unsoundness-in-pin/11311/73 for more details.
-
-use std::ops::Deref;
-use std::pin::Pin;
-use std::rc::Rc;
-
-struct Apple;
-
-impl Deref for Apple {
-    type Target = Apple;
-    fn deref(&self) -> &Apple {
-        &Apple
-    }
-}
-
-impl PartialEq<Rc<Apple>> for Apple {
-    fn eq(&self, _rc: &Rc<Apple>) -> bool {
-        unreachable!()
-    }
-}
-
-fn main() {
-    let _ = Pin::new(Apple) == Rc::pin(Apple);
-    //~^ ERROR type mismatch resolving
-}
diff --git a/tests/ui/issues/issue-67039-unsound-pin-partialeq.stderr b/tests/ui/issues/issue-67039-unsound-pin-partialeq.stderr
deleted file mode 100644
index 9164e4696eb34..0000000000000
--- a/tests/ui/issues/issue-67039-unsound-pin-partialeq.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0271]: type mismatch resolving `<Rc<Apple> as Deref>::Target == Rc<Apple>`
-  --> $DIR/issue-67039-unsound-pin-partialeq.rs:25:29
-   |
-LL |     let _ = Pin::new(Apple) == Rc::pin(Apple);
-   |                             ^^ expected `Rc<Apple>`, found `Apple`
-   |
-   = note: expected struct `Rc<Apple>`
-              found struct `Apple`
-   = note: required for `Pin<Apple>` to implement `PartialEq<Pin<Rc<Apple>>>`
-
-error: aborting due to 1 previous error
-
-For more information about this error, try `rustc --explain E0271`.
diff --git a/tests/ui/issues/issue-5067.rs b/tests/ui/macros/repetition-matches-empty-token-tree.rs
similarity index 92%
rename from tests/ui/issues/issue-5067.rs
rename to tests/ui/macros/repetition-matches-empty-token-tree.rs
index 47d07f0df014c..eb722764fc63a 100644
--- a/tests/ui/issues/issue-5067.rs
+++ b/tests/ui/macros/repetition-matches-empty-token-tree.rs
@@ -1,10 +1,11 @@
-#![allow(unused_macros)]
-
-// Tests that repetition matchers cannot match the empty token tree (since that would be
-// ambiguous).
+//! Regression test for <https://github.com/rust-lang/rust/issues/5067>.
+//! Tests that repetition matchers cannot match the empty token tree (since that would be
+//! ambiguous).
 
 //@ edition:2018
 
+#![allow(unused_macros)]
+
 macro_rules! foo {
     ( $()* ) => {};
     //~^ ERROR repetition matches empty token tree
diff --git a/tests/ui/issues/issue-5067.stderr b/tests/ui/macros/repetition-matches-empty-token-tree.stderr
similarity index 67%
rename from tests/ui/issues/issue-5067.stderr
rename to tests/ui/macros/repetition-matches-empty-token-tree.stderr
index 7ffc6071407c5..eba436c233ca7 100644
--- a/tests/ui/issues/issue-5067.stderr
+++ b/tests/ui/macros/repetition-matches-empty-token-tree.stderr
@@ -1,107 +1,107 @@
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:9:8
+  --> $DIR/repetition-matches-empty-token-tree.rs:10:8
    |
 LL |     ( $()* ) => {};
    |        ^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:11:8
+  --> $DIR/repetition-matches-empty-token-tree.rs:12:8
    |
 LL |     ( $()+ ) => {};
    |        ^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:13:8
+  --> $DIR/repetition-matches-empty-token-tree.rs:14:8
    |
 LL |     ( $()? ) => {};
    |        ^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:18:9
+  --> $DIR/repetition-matches-empty-token-tree.rs:19:9
    |
 LL |     ( [$()*] ) => {};
    |         ^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:20:9
+  --> $DIR/repetition-matches-empty-token-tree.rs:21:9
    |
 LL |     ( [$()+] ) => {};
    |         ^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:22:9
+  --> $DIR/repetition-matches-empty-token-tree.rs:23:9
    |
 LL |     ( [$()?] ) => {};
    |         ^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:27:8
+  --> $DIR/repetition-matches-empty-token-tree.rs:28:8
    |
 LL |     ( $($()* $(),* $(a)* $(a),* )* ) => {};
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:29:8
+  --> $DIR/repetition-matches-empty-token-tree.rs:30:8
    |
 LL |     ( $($()* $(),* $(a)* $(a),* )+ ) => {};
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:31:8
+  --> $DIR/repetition-matches-empty-token-tree.rs:32:8
    |
 LL |     ( $($()* $(),* $(a)* $(a),* )? ) => {};
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:33:8
+  --> $DIR/repetition-matches-empty-token-tree.rs:34:8
    |
 LL |     ( $($()? $(),* $(a)? $(a),* )* ) => {};
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:35:8
+  --> $DIR/repetition-matches-empty-token-tree.rs:36:8
    |
 LL |     ( $($()? $(),* $(a)? $(a),* )+ ) => {};
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:37:8
+  --> $DIR/repetition-matches-empty-token-tree.rs:38:8
    |
 LL |     ( $($()? $(),* $(a)? $(a),* )? ) => {};
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:47:12
+  --> $DIR/repetition-matches-empty-token-tree.rs:48:12
    |
 LL |     ( $(a $()+)* ) => {};
    |            ^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:49:12
+  --> $DIR/repetition-matches-empty-token-tree.rs:50:12
    |
 LL |     ( $(a $()*)+ ) => {};
    |            ^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:51:12
+  --> $DIR/repetition-matches-empty-token-tree.rs:52:12
    |
 LL |     ( $(a $()+)? ) => {};
    |            ^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:53:12
+  --> $DIR/repetition-matches-empty-token-tree.rs:54:12
    |
 LL |     ( $(a $()?)+ ) => {};
    |            ^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:60:18
+  --> $DIR/repetition-matches-empty-token-tree.rs:61:18
    |
 LL |     (a $e1:expr $($(, a $e2:expr)*)*) => ([$e1 $($(, $e2)*)*]);
    |                  ^^^^^^^^^^^^^^^^^^
 
 error: repetition matches empty token tree
-  --> $DIR/issue-5067.rs:71:8
+  --> $DIR/repetition-matches-empty-token-tree.rs:72:8
    |
 LL |     ( $()* ) => {};
    |        ^^
diff --git a/tests/ui/issues/issue-52262.rs b/tests/ui/moves/move-out-of-shared-ref-deref.rs
similarity index 89%
rename from tests/ui/issues/issue-52262.rs
rename to tests/ui/moves/move-out-of-shared-ref-deref.rs
index 547643f0d6e20..6adb7811c5d4d 100644
--- a/tests/ui/issues/issue-52262.rs
+++ b/tests/ui/moves/move-out-of-shared-ref-deref.rs
@@ -1,3 +1,5 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/52262>.
+
 #[derive(Debug)]
 enum MyError {
     NotFound { key: Vec<u8> },
diff --git a/tests/ui/issues/issue-52262.stderr b/tests/ui/moves/move-out-of-shared-ref-deref.stderr
similarity index 92%
rename from tests/ui/issues/issue-52262.stderr
rename to tests/ui/moves/move-out-of-shared-ref-deref.stderr
index 51959f22b97a4..7a7158dfbdbef 100644
--- a/tests/ui/issues/issue-52262.stderr
+++ b/tests/ui/moves/move-out-of-shared-ref-deref.stderr
@@ -1,5 +1,5 @@
 error[E0507]: cannot move out of `*key` which is behind a shared reference
-  --> $DIR/issue-52262.rs:15:35
+  --> $DIR/move-out-of-shared-ref-deref.rs:17:35
    |
 LL |                 String::from_utf8(*key).unwrap()
    |                                   ^^^^ move occurs because `*key` has type `Vec<u8>`, which does not implement the `Copy` trait
diff --git a/tests/ui/issues/issue-51102.rs b/tests/ui/pattern/struct-pattern-nonexistent-field.rs
similarity index 84%
rename from tests/ui/issues/issue-51102.rs
rename to tests/ui/pattern/struct-pattern-nonexistent-field.rs
index b5ddc7221d06a..ed74bdf937145 100644
--- a/tests/ui/issues/issue-51102.rs
+++ b/tests/ui/pattern/struct-pattern-nonexistent-field.rs
@@ -1,3 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/51102>.
+//! Test matching non-existing fields via struct pattern syntax in closures doesn't ICE.
+
 enum SimpleEnum {
     NoState,
 }
diff --git a/tests/ui/issues/issue-51102.stderr b/tests/ui/pattern/struct-pattern-nonexistent-field.stderr
similarity index 85%
rename from tests/ui/issues/issue-51102.stderr
rename to tests/ui/pattern/struct-pattern-nonexistent-field.stderr
index 09c52292dccaf..4eddc55bb5490 100644
--- a/tests/ui/issues/issue-51102.stderr
+++ b/tests/ui/pattern/struct-pattern-nonexistent-field.stderr
@@ -1,5 +1,5 @@
 error[E0026]: struct `SimpleStruct` does not have a field named `state`
-  --> $DIR/issue-51102.rs:13:17
+  --> $DIR/struct-pattern-nonexistent-field.rs:16:17
    |
 LL |                 state: 0,
    |                 ^^^^^
@@ -8,7 +8,7 @@ LL |                 state: 0,
    |                 help: `SimpleStruct` has a field named `no_state_here`
 
 error[E0025]: field `no_state_here` bound multiple times in the pattern
-  --> $DIR/issue-51102.rs:24:17
+  --> $DIR/struct-pattern-nonexistent-field.rs:27:17
    |
 LL |                 no_state_here: 0,
    |                 ---------------- first use of `no_state_here`
@@ -16,7 +16,7 @@ LL |                 no_state_here: 1
    |                 ^^^^^^^^^^^^^^^^ multiple uses of `no_state_here` in pattern
 
 error[E0026]: variant `SimpleEnum::NoState` does not have a field named `state`
-  --> $DIR/issue-51102.rs:33:17
+  --> $DIR/struct-pattern-nonexistent-field.rs:36:17
    |
 LL |                 state: 0
    |                 ^^^^^ variant `SimpleEnum::NoState` does not have this field
diff --git a/tests/ui/structs-enums/call-tuple-struct-ctor-as-fn.rs b/tests/ui/structs-enums/call-tuple-struct-ctor-as-fn.rs
new file mode 100644
index 0000000000000..b715c9d3eaab2
--- /dev/null
+++ b/tests/ui/structs-enums/call-tuple-struct-ctor-as-fn.rs
@@ -0,0 +1,10 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/5315>.
+//! Test calling tuple struct constructor doesn't cause segfault.
+//@ run-pass
+
+struct A(#[allow(dead_code)] bool);
+
+pub fn main() {
+    let f = A;
+    f(true);
+}
diff --git a/tests/ui/issues/issue-51907.rs b/tests/ui/traits/object/extern-c-trait-object-methods.rs
similarity index 75%
rename from tests/ui/issues/issue-51907.rs
rename to tests/ui/traits/object/extern-c-trait-object-methods.rs
index bf3f629df4970..f1ee19fc67cf2 100644
--- a/tests/ui/issues/issue-51907.rs
+++ b/tests/ui/traits/object/extern-c-trait-object-methods.rs
@@ -1,4 +1,7 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/51907>.
+//! Test extern `C` trait object methods don't ICE.
 //@ run-pass
+
 trait Foo {
     extern "C" fn borrow(&self);
     extern "C" fn take(self: Box<Self>);