diff --git a/tests/ui/issues/issue-34427.rs b/tests/ui/codegen/arm-collect-into-vec-codegen-regression.rs
similarity index 80%
rename from tests/ui/issues/issue-34427.rs
rename to tests/ui/codegen/arm-collect-into-vec-codegen-regression.rs
index 519e839ad5f41..e739dbf803429 100644
--- a/tests/ui/issues/issue-34427.rs
+++ b/tests/ui/codegen/arm-collect-into-vec-codegen-regression.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-// Issue #34427: On ARM, the code in `foo` at one time was generating
+// Issue https://github.com/rust-lang/rust/issues/34427: On ARM, the code in `foo` at one time was generating
 // a machine code instruction of the form: `str r0, [r0, rN]!` (for
 // some N), which is not legal because the source register and base
 // register cannot be identical in the preindexed form signalled by
diff --git a/tests/ui/issues/issue-36856.rs b/tests/ui/codegen/bool-negation-with-debug-info.rs
similarity index 67%
rename from tests/ui/issues/issue-36856.rs
rename to tests/ui/codegen/bool-negation-with-debug-info.rs
index afeba012fa0d6..6c79da1ddf895 100644
--- a/tests/ui/issues/issue-36856.rs
+++ b/tests/ui/codegen/bool-negation-with-debug-info.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-// Regression test for #36856.
+// Regression test for https://github.com/rust-lang/rust/issues/36856
 
 //@ compile-flags:-g
 
diff --git a/tests/ui/issues/issue-20644.rs b/tests/ui/codegen/codegen-binder-not-ignored-in-generic-fn.rs
similarity index 89%
rename from tests/ui/issues/issue-20644.rs
rename to tests/ui/codegen/codegen-binder-not-ignored-in-generic-fn.rs
index 09a2ee7217c3a..747217a18f283 100644
--- a/tests/ui/issues/issue-20644.rs
+++ b/tests/ui/codegen/codegen-binder-not-ignored-in-generic-fn.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/20644
+
 //@ build-pass
 #![allow(dead_code)]
 #![allow(unused_imports)]
diff --git a/tests/ui/issues/issue-41696.rs b/tests/ui/codegen/no-codegen-blowup-in-deeply-nested-struct.rs
similarity index 96%
rename from tests/ui/issues/issue-41696.rs
rename to tests/ui/codegen/no-codegen-blowup-in-deeply-nested-struct.rs
index 0b01efe7a7b13..dcca59ef0229f 100644
--- a/tests/ui/issues/issue-41696.rs
+++ b/tests/ui/codegen/no-codegen-blowup-in-deeply-nested-struct.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/41696
+
 //@ run-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/tests/ui/issues/issue-50761.rs b/tests/ui/codegen/no-divide-by-zero-in-llvm-type.rs
similarity index 83%
rename from tests/ui/issues/issue-50761.rs
rename to tests/ui/codegen/no-divide-by-zero-in-llvm-type.rs
index 8f5a32e0a001d..99bbaddf3c723 100644
--- a/tests/ui/issues/issue-50761.rs
+++ b/tests/ui/codegen/no-divide-by-zero-in-llvm-type.rs
@@ -1,3 +1,4 @@
+// Regression test for https://github.com/rust-lang/rust/issues/50761
 // Confirm that we don't accidentally divide or mod by zero in llvm_type
 
 //@ build-pass
diff --git a/tests/ui/issues/issue-47364.rs b/tests/ui/codegen/no-segfault-with-multiple-codegen-units.rs
similarity index 95%
rename from tests/ui/issues/issue-47364.rs
rename to tests/ui/codegen/no-segfault-with-multiple-codegen-units.rs
index 79cd5ed92a883..a8f723158a13a 100644
--- a/tests/ui/issues/issue-47364.rs
+++ b/tests/ui/codegen/no-segfault-with-multiple-codegen-units.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/47364
+
 //@ run-pass
 #![allow(unused_variables)]
 //@ compile-flags: -C codegen-units=8 -O