diff --git a/tests/ui/issues/issue-44247.rs b/tests/ui/associated-consts/assoc-const-and-type-same-name.rs
similarity index 76%
rename from tests/ui/issues/issue-44247.rs
rename to tests/ui/associated-consts/assoc-const-and-type-same-name.rs
index 1ddd5a6dc0b3f..a7304562f593d 100644
--- a/tests/ui/issues/issue-44247.rs
+++ b/tests/ui/associated-consts/assoc-const-and-type-same-name.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/44247
+
 //@ check-pass
 #![allow(dead_code)]
 trait T {
diff --git a/tests/ui/issues/issue-31267-additional.rs b/tests/ui/associated-consts/assoc-const-in-array-initializer.rs
similarity index 78%
rename from tests/ui/issues/issue-31267-additional.rs
rename to tests/ui/associated-consts/assoc-const-in-array-initializer.rs
index ef7a5002bf162..9787d8d677621 100644
--- a/tests/ui/issues/issue-31267-additional.rs
+++ b/tests/ui/associated-consts/assoc-const-in-array-initializer.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/31267
+
 //@ run-pass
 
 #[derive(Clone, Copy, Debug)]
diff --git a/tests/ui/issues/issue-24947.rs b/tests/ui/associated-consts/assoc-const-in-array-size.rs
similarity index 75%
rename from tests/ui/issues/issue-24947.rs
rename to tests/ui/associated-consts/assoc-const-in-array-size.rs
index c607cb7ec89d6..b6db21550a435 100644
--- a/tests/ui/issues/issue-24947.rs
+++ b/tests/ui/associated-consts/assoc-const-in-array-size.rs
@@ -1,6 +1,6 @@
 //@ run-pass
-// #24947 ICE using a trait-associated const in an array size
-
+// Regression test for https://github.com/rust-lang/rust/issues/24947
+// ICE using a trait-associated const in an array size
 
 struct Foo;
 
diff --git a/tests/ui/issues/issue-25145.rs b/tests/ui/associated-consts/assoc-const-in-static-array-size.rs
similarity index 66%
rename from tests/ui/issues/issue-25145.rs
rename to tests/ui/associated-consts/assoc-const-in-static-array-size.rs
index 7edaa91d4a0cf..a7700f7c48610 100644
--- a/tests/ui/issues/issue-25145.rs
+++ b/tests/ui/associated-consts/assoc-const-in-static-array-size.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/25145
+
 //@ run-pass
 
 struct S;
diff --git a/tests/ui/issues/issue-42956.rs b/tests/ui/associated-consts/assoc-const-through-assoc-type-path.rs
similarity index 81%
rename from tests/ui/issues/issue-42956.rs
rename to tests/ui/associated-consts/assoc-const-through-assoc-type-path.rs
index 5d6d4249a7d88..5202bdd6d82f1 100644
--- a/tests/ui/issues/issue-42956.rs
+++ b/tests/ui/associated-consts/assoc-const-through-assoc-type-path.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/42956
+
 //@ check-pass
 #![allow(dead_code)]
 
diff --git a/tests/ui/issues/issue-28586.rs b/tests/ui/associated-consts/no-assoc-item-bytes-on-usize.rs
similarity index 63%
rename from tests/ui/issues/issue-28586.rs
rename to tests/ui/associated-consts/no-assoc-item-bytes-on-usize.rs
index 9520e0e51a15a..7b05a074c3672 100644
--- a/tests/ui/issues/issue-28586.rs
+++ b/tests/ui/associated-consts/no-assoc-item-bytes-on-usize.rs
@@ -1,4 +1,4 @@
-// Regression test for issue #28586
+// Regression test for issue https://github.com/rust-lang/rust/issues/28586
 
 pub trait Foo {}
 impl Foo for [u8; usize::BYTES] {}
diff --git a/tests/ui/issues/issue-28586.stderr b/tests/ui/associated-consts/no-assoc-item-bytes-on-usize.stderr
similarity index 87%
rename from tests/ui/issues/issue-28586.stderr
rename to tests/ui/associated-consts/no-assoc-item-bytes-on-usize.stderr
index dda147954facd..982d58cf0ac58 100644
--- a/tests/ui/issues/issue-28586.stderr
+++ b/tests/ui/associated-consts/no-assoc-item-bytes-on-usize.stderr
@@ -1,5 +1,5 @@
 error[E0599]: no associated function or constant named `BYTES` found for type `usize` in the current scope
-  --> $DIR/issue-28586.rs:4:26
+  --> $DIR/no-assoc-item-bytes-on-usize.rs:4:26
    |
 LL | impl Foo for [u8; usize::BYTES] {}
    |                          ^^^^^ associated function or constant not found in `usize`
diff --git a/tests/ui/issues/issue-34780.rs b/tests/ui/associated-consts/trait-const-with-phantom-data-lifetime.rs
similarity index 65%
rename from tests/ui/issues/issue-34780.rs
rename to tests/ui/associated-consts/trait-const-with-phantom-data-lifetime.rs
index 4470e3af682b0..16be49f299690 100644
--- a/tests/ui/issues/issue-34780.rs
+++ b/tests/ui/associated-consts/trait-const-with-phantom-data-lifetime.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/34780
+
 //@ check-pass
 
 use std::marker::PhantomData;