diff --git a/tests/ui/issues/issue-31769.rs b/tests/ui/attributes/dont-allow-inline-and-repr-at-invalid-positions.rs
similarity index 70%
rename from tests/ui/issues/issue-31769.rs
rename to tests/ui/attributes/dont-allow-inline-and-repr-at-invalid-positions.rs
index 354c1be9ed554..f295ecf302598 100644
--- a/tests/ui/issues/issue-31769.rs
+++ b/tests/ui/attributes/dont-allow-inline-and-repr-at-invalid-positions.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/31769>
 fn main() {
     #[inline] struct Foo;  //~ ERROR attribute cannot be used on
     #[repr(C)] fn foo() {} //~ ERROR attribute should be applied to a struct, enum, or union
diff --git a/tests/ui/issues/issue-31769.stderr b/tests/ui/attributes/dont-allow-inline-and-repr-at-invalid-positions.stderr
similarity index 77%
rename from tests/ui/issues/issue-31769.stderr
rename to tests/ui/attributes/dont-allow-inline-and-repr-at-invalid-positions.stderr
index 0f75e84f2a704..fc8e22f171c20 100644
--- a/tests/ui/issues/issue-31769.stderr
+++ b/tests/ui/attributes/dont-allow-inline-and-repr-at-invalid-positions.stderr
@@ -1,5 +1,5 @@
 error: `#[inline]` attribute cannot be used on structs
-  --> $DIR/issue-31769.rs:2:5
+  --> $DIR/dont-allow-inline-and-repr-at-invalid-positions.rs:3:5
    |
 LL |     #[inline] struct Foo;
    |     ^^^^^^^^^
@@ -7,7 +7,7 @@ LL |     #[inline] struct Foo;
    = help: `#[inline]` can only be applied to functions
 
 error[E0517]: attribute should be applied to a struct, enum, or union
-  --> $DIR/issue-31769.rs:3:12
+  --> $DIR/dont-allow-inline-and-repr-at-invalid-positions.rs:4:12
    |
 LL |     #[repr(C)] fn foo() {}
    |            ^   ----------- not a struct, enum, or union
diff --git a/tests/ui/issues/issue-33202.rs b/tests/ui/attributes/repr-on-single-variant-Enum.rs
similarity index 67%
rename from tests/ui/issues/issue-33202.rs
rename to tests/ui/attributes/repr-on-single-variant-Enum.rs
index 3fef98606afab..ab45c76ef5aae 100644
--- a/tests/ui/issues/issue-33202.rs
+++ b/tests/ui/attributes/repr-on-single-variant-Enum.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/33202>
 //@ run-pass
 #[repr(C)]
 pub enum CPOption<T> {
diff --git a/tests/ui/issues/issue-38763.rs b/tests/ui/foreign/foreign-fn-with-more-than-8-byte-arg-size.rs
similarity index 72%
rename from tests/ui/issues/issue-38763.rs
rename to tests/ui/foreign/foreign-fn-with-more-than-8-byte-arg-size.rs
index 87c758db1723c..4bd78a423cd2c 100644
--- a/tests/ui/issues/issue-38763.rs
+++ b/tests/ui/foreign/foreign-fn-with-more-than-8-byte-arg-size.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/38763>
 //@ run-pass
 //@ needs-threads
 
diff --git a/tests/ui/issues/issue-19001.rs b/tests/ui/recursion/recursive-struct-with-raw-pointer-field.rs
similarity index 73%
rename from tests/ui/issues/issue-19001.rs
rename to tests/ui/recursion/recursive-struct-with-raw-pointer-field.rs
index 51aebf88c95fb..97fa08fab1d93 100644
--- a/tests/ui/issues/issue-19001.rs
+++ b/tests/ui/recursion/recursive-struct-with-raw-pointer-field.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/19001>
 //@ run-pass
 #![allow(dead_code)]
 // check that we handle recursive arrays correctly in `type_of`