diff --git a/tests/ui/issues/issue-31299.rs b/tests/ui/associated-types/sized-recursive-type-via-associated-type.rs
similarity index 85%
rename from tests/ui/issues/issue-31299.rs
rename to tests/ui/associated-types/sized-recursive-type-via-associated-type.rs
index b01b73bf373e8..2c2a3820d42d0 100644
--- a/tests/ui/issues/issue-31299.rs
+++ b/tests/ui/associated-types/sized-recursive-type-via-associated-type.rs
@@ -1,6 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/31299>
 //@ run-pass
-// Regression test for #31299. This was generating an overflow error
-// because of eager normalization:
+// This was generating an overflow error because of eager normalization:
 //
 // proving `M: Sized` requires
 // - proving `PtrBack<Vec<M>>: Sized` requires
diff --git a/tests/ui/issues/issue-27997.rs b/tests/ui/codegen/correctly-monomorphize-generic-drop-impl.rs
similarity index 91%
rename from tests/ui/issues/issue-27997.rs
rename to tests/ui/codegen/correctly-monomorphize-generic-drop-impl.rs
index 85317cec061ad..1a81632970c97 100644
--- a/tests/ui/issues/issue-27997.rs
+++ b/tests/ui/codegen/correctly-monomorphize-generic-drop-impl.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/27997>
 //@ run-pass
 use std::sync::atomic::{Ordering, AtomicUsize};
 
diff --git a/tests/ui/issues/issue-35815.rs b/tests/ui/codegen/dont-roundup-dst-prefix-size-to-alignment.rs
similarity index 80%
rename from tests/ui/issues/issue-35815.rs
rename to tests/ui/codegen/dont-roundup-dst-prefix-size-to-alignment.rs
index 1a09d8041e459..19bf627e6ddf2 100644
--- a/tests/ui/issues/issue-35815.rs
+++ b/tests/ui/codegen/dont-roundup-dst-prefix-size-to-alignment.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/35815>
 //@ run-pass
 #![allow(dead_code)]
 use std::mem;
diff --git a/tests/ui/issues/issue-47486.rs b/tests/ui/consts/size_of-requires-type-annotation-in-const.rs
similarity index 67%
rename from tests/ui/issues/issue-47486.rs
rename to tests/ui/consts/size_of-requires-type-annotation-in-const.rs
index d686f02a9fe39..3e4a9fd076b47 100644
--- a/tests/ui/issues/issue-47486.rs
+++ b/tests/ui/consts/size_of-requires-type-annotation-in-const.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/47486>
 fn main() {
     () < std::mem::size_of::<_>(); //~ ERROR: mismatched types
     [0u8; std::mem::size_of::<_>()]; //~ ERROR: type annotations needed
diff --git a/tests/ui/issues/issue-47486.stderr b/tests/ui/consts/size_of-requires-type-annotation-in-const.stderr
similarity index 82%
rename from tests/ui/issues/issue-47486.stderr
rename to tests/ui/consts/size_of-requires-type-annotation-in-const.stderr
index c7e9af70e64a7..3ca15af5e1782 100644
--- a/tests/ui/issues/issue-47486.stderr
+++ b/tests/ui/consts/size_of-requires-type-annotation-in-const.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-47486.rs:2:10
+  --> $DIR/size_of-requires-type-annotation-in-const.rs:3:10
    |
 LL |     () < std::mem::size_of::<_>();
    |     --   ^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found `usize`
@@ -7,7 +7,7 @@ LL |     () < std::mem::size_of::<_>();
    |     expected because this is `()`
 
 error[E0282]: type annotations needed
-  --> $DIR/issue-47486.rs:3:11
+  --> $DIR/size_of-requires-type-annotation-in-const.rs:4:11
    |
 LL |     [0u8; std::mem::size_of::<_>()];
    |           ^^^^^^^^^^^^^^^^^^^^^^ cannot infer type of the type parameter `T` declared on the function `size_of`
diff --git a/tests/ui/issues/issue-46855.rs b/tests/ui/mir/dont-use-operand-as-place-for-zst.rs
similarity index 84%
rename from tests/ui/issues/issue-46855.rs
rename to tests/ui/mir/dont-use-operand-as-place-for-zst.rs
index acea242046fde..0d1d12d5b404c 100644
--- a/tests/ui/issues/issue-46855.rs
+++ b/tests/ui/mir/dont-use-operand-as-place-for-zst.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/46855>
 //@ run-pass
 #![allow(dead_code)]
 //@ compile-flags: -Zmir-opt-level=1
diff --git a/tests/ui/issues/issue-50811.rs b/tests/ui/mir/validate-various-comparison-behavior.rs
similarity index 95%
rename from tests/ui/issues/issue-50811.rs
rename to tests/ui/mir/validate-various-comparison-behavior.rs
index aaf1c17f59b5f..c1aaa4c35ae15 100644
--- a/tests/ui/issues/issue-50811.rs
+++ b/tests/ui/mir/validate-various-comparison-behavior.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/50811>
 //@ run-pass
 #![feature(test)]
 #![allow(invalid_nan_comparisons)]