diff --git a/tests/ui/issues/issue-23073.rs b/tests/ui/associated-types/ambiguous-associated-type-default.rs
similarity index 71%
rename from tests/ui/issues/issue-23073.rs
rename to tests/ui/associated-types/ambiguous-associated-type-default.rs
index a0ca91336c365..31d1355d41cee 100644
--- a/tests/ui/issues/issue-23073.rs
+++ b/tests/ui/associated-types/ambiguous-associated-type-default.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/23073
+
 #![feature(associated_type_defaults)]
 
 trait Foo { type T; }
diff --git a/tests/ui/issues/issue-23073.stderr b/tests/ui/associated-types/ambiguous-associated-type-default.stderr
similarity index 90%
rename from tests/ui/issues/issue-23073.stderr
rename to tests/ui/associated-types/ambiguous-associated-type-default.stderr
index 87dcf3b328923..38484756fa94a 100644
--- a/tests/ui/issues/issue-23073.stderr
+++ b/tests/ui/associated-types/ambiguous-associated-type-default.stderr
@@ -1,5 +1,5 @@
 error[E0223]: ambiguous associated type
-  --> $DIR/issue-23073.rs:6:17
+  --> $DIR/ambiguous-associated-type-default.rs:8:17
    |
 LL |     type FooT = <<Self as Bar>::Foo>::T;
    |                 ^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/issues/issue-20803.rs b/tests/ui/associated-types/assoc-type-add-output-via-operator-syntax.rs
similarity index 68%
rename from tests/ui/issues/issue-20803.rs
rename to tests/ui/associated-types/assoc-type-add-output-via-operator-syntax.rs
index 47bf52b31a026..180c3576595de 100644
--- a/tests/ui/issues/issue-20803.rs
+++ b/tests/ui/associated-types/assoc-type-add-output-via-operator-syntax.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/20803
+
 //@ run-pass
 use std::ops::Add;
 
diff --git a/tests/ui/issues/issue-37051.rs b/tests/ui/associated-types/assoc-type-default-without-override-in-impl.rs
similarity index 81%
rename from tests/ui/issues/issue-37051.rs
rename to tests/ui/associated-types/assoc-type-default-without-override-in-impl.rs
index fa9cc5964fe1f..c9f1760787102 100644
--- a/tests/ui/issues/issue-37051.rs
+++ b/tests/ui/associated-types/assoc-type-default-without-override-in-impl.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/37051
+
 //@ check-pass
 
 #![feature(associated_type_defaults)]
diff --git a/tests/ui/issues/issue-39970.rs b/tests/ui/associated-types/assoc-type-element-mismatch-in-hrtb.rs
similarity index 84%
rename from tests/ui/issues/issue-39970.rs
rename to tests/ui/associated-types/assoc-type-element-mismatch-in-hrtb.rs
index 40d3ae30a87c6..254fb0051ed30 100644
--- a/tests/ui/issues/issue-39970.rs
+++ b/tests/ui/associated-types/assoc-type-element-mismatch-in-hrtb.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/39970
+
 trait Array<'a> {
     type Element: 'a;
 }
diff --git a/tests/ui/issues/issue-39970.stderr b/tests/ui/associated-types/assoc-type-element-mismatch-in-hrtb.stderr
similarity index 80%
rename from tests/ui/issues/issue-39970.stderr
rename to tests/ui/associated-types/assoc-type-element-mismatch-in-hrtb.stderr
index 0fe73574bad6f..eff0a5b53ae06 100644
--- a/tests/ui/issues/issue-39970.stderr
+++ b/tests/ui/associated-types/assoc-type-element-mismatch-in-hrtb.stderr
@@ -1,16 +1,16 @@
 error[E0271]: type mismatch resolving `<() as Array<'a>>::Element == ()`
-  --> $DIR/issue-39970.rs:19:6
+  --> $DIR/assoc-type-element-mismatch-in-hrtb.rs:21:6
    |
 LL |     <() as Visit>::visit();
    |      ^^ type mismatch resolving `<() as Array<'a>>::Element == ()`
    |
 note: expected this to be `()`
-  --> $DIR/issue-39970.rs:10:20
+  --> $DIR/assoc-type-element-mismatch-in-hrtb.rs:12:20
    |
 LL |     type Element = &'a ();
    |                    ^^^^^^
 note: required for `()` to implement `Visit`
-  --> $DIR/issue-39970.rs:13:6
+  --> $DIR/assoc-type-element-mismatch-in-hrtb.rs:15:6
    |
 LL | impl Visit for () where
    |      ^^^^^     ^^
diff --git a/tests/ui/issues/issue-28983.rs b/tests/ui/associated-types/assoc-type-in-extern-fn-signature.rs
similarity index 86%
rename from tests/ui/issues/issue-28983.rs
rename to tests/ui/associated-types/assoc-type-in-extern-fn-signature.rs
index 90a4793787d4e..ffd26ad8462f5 100644
--- a/tests/ui/issues/issue-28983.rs
+++ b/tests/ui/associated-types/assoc-type-in-extern-fn-signature.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/28983
+
 //@ run-pass
 pub trait Test { type T; }
 
diff --git a/tests/ui/issues/issue-19632.rs b/tests/ui/associated-types/assoc-type-in-generic-struct-bound.rs
similarity index 69%
rename from tests/ui/issues/issue-19632.rs
rename to tests/ui/associated-types/assoc-type-in-generic-struct-bound.rs
index a99ab5f5ebe1d..4aa4b5f3caa10 100644
--- a/tests/ui/issues/issue-19632.rs
+++ b/tests/ui/associated-types/assoc-type-in-generic-struct-bound.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/19632
+
 //@ check-pass
 #![allow(dead_code)]
 
diff --git a/tests/ui/issues/issue-20797.rs b/tests/ui/associated-types/assoc-type-in-strategy-pattern-iterator.rs
similarity index 97%
rename from tests/ui/issues/issue-20797.rs
rename to tests/ui/associated-types/assoc-type-in-strategy-pattern-iterator.rs
index 3d3160c6e85d6..0291b225f6955 100644
--- a/tests/ui/issues/issue-20797.rs
+++ b/tests/ui/associated-types/assoc-type-in-strategy-pattern-iterator.rs
@@ -1,6 +1,6 @@
 //@ build-pass
 
-// Regression test for #20797.
+// Regression test for https://github.com/rust-lang/rust/issues/20797
 
 use std::default::Default;
 use std::io;
diff --git a/tests/ui/issues/issue-26127.rs b/tests/ui/associated-types/assoc-type-in-struct-constructor.rs
similarity index 71%
rename from tests/ui/issues/issue-26127.rs
rename to tests/ui/associated-types/assoc-type-in-struct-constructor.rs
index 45f50efdccbdb..b041260cfb356 100644
--- a/tests/ui/issues/issue-26127.rs
+++ b/tests/ui/associated-types/assoc-type-in-struct-constructor.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/26127
+
 //@ run-pass
 trait Tr { type T; }
 impl Tr for u8 { type T=(); }
diff --git a/tests/ui/issues/issue-19631.rs b/tests/ui/associated-types/assoc-type-in-unused-where-clause.rs
similarity index 73%
rename from tests/ui/issues/issue-19631.rs
rename to tests/ui/associated-types/assoc-type-in-unused-where-clause.rs
index d13ac216e36ea..7f570015fc752 100644
--- a/tests/ui/issues/issue-19631.rs
+++ b/tests/ui/associated-types/assoc-type-in-unused-where-clause.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/19631
+
 //@ check-pass
 #![allow(dead_code)]
 
diff --git a/tests/ui/issues/issue-36036-associated-type-layout.rs b/tests/ui/associated-types/assoc-type-layout-unsized-allowed-sized-used.rs
similarity index 79%
rename from tests/ui/issues/issue-36036-associated-type-layout.rs
rename to tests/ui/associated-types/assoc-type-layout-unsized-allowed-sized-used.rs
index 63f9927c67826..1e6fc4ebbb38f 100644
--- a/tests/ui/issues/issue-36036-associated-type-layout.rs
+++ b/tests/ui/associated-types/assoc-type-layout-unsized-allowed-sized-used.rs
@@ -1,5 +1,6 @@
 //@ run-pass
-// Issue 36036: computing the layout of a type composed from another
+// Regression test for https://github.com/rust-lang/rust/issues/36036
+// computing the layout of a type composed from another
 // trait's associated type caused compiler to ICE when the associated
 // type was allowed to be unsized, even though the known instantiated
 // type is itself sized.
diff --git a/tests/ui/issues/issue-23336.rs b/tests/ui/associated-types/assoc-type-method-call-via-blanket-impl.rs
similarity index 77%
rename from tests/ui/issues/issue-23336.rs
rename to tests/ui/associated-types/assoc-type-method-call-via-blanket-impl.rs
index e71c2af0c85d6..d4fa38124a77c 100644
--- a/tests/ui/issues/issue-23336.rs
+++ b/tests/ui/associated-types/assoc-type-method-call-via-blanket-impl.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/23336
+
 //@ run-pass
 pub trait Data { fn doit(&self) {} }
 impl<T> Data for T {}
diff --git a/tests/ui/issues/issue-17732.rs b/tests/ui/associated-types/assoc-type-named-string.rs
similarity index 73%
rename from tests/ui/issues/issue-17732.rs
rename to tests/ui/associated-types/assoc-type-named-string.rs
index e093ed7f41fb0..03449e2cdabe5 100644
--- a/tests/ui/issues/issue-17732.rs
+++ b/tests/ui/associated-types/assoc-type-named-string.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/17732
+
 //@ check-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
diff --git a/tests/ui/issues/issue-20009.rs b/tests/ui/associated-types/assoc-type-output-is-sized.rs
similarity index 73%
rename from tests/ui/issues/issue-20009.rs
rename to tests/ui/associated-types/assoc-type-output-is-sized.rs
index 4d091f3a962c6..8ef4595843df2 100644
--- a/tests/ui/issues/issue-20009.rs
+++ b/tests/ui/associated-types/assoc-type-output-is-sized.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/20009
+
 //@ check-pass
 // Check that associated types are `Sized`
 
diff --git a/tests/ui/issues/issue-20971.rs b/tests/ui/associated-types/assoc-type-projection-in-box-return.rs
similarity index 83%
rename from tests/ui/issues/issue-20971.rs
rename to tests/ui/associated-types/assoc-type-projection-in-box-return.rs
index 31dd910191935..6c95467d141aa 100644
--- a/tests/ui/issues/issue-20971.rs
+++ b/tests/ui/associated-types/assoc-type-projection-in-box-return.rs
@@ -1,4 +1,4 @@
-// Regression test for Issue #20971.
+// Regression test for Issue https://github.com/rust-lang/rust/issues/20971
 
 //@ run-fail
 //@ error-pattern:Hello, world!
diff --git a/tests/ui/issues/issue-19850.rs b/tests/ui/associated-types/assoc-type-projection-in-let-binding.rs
similarity index 84%
rename from tests/ui/issues/issue-19850.rs
rename to tests/ui/associated-types/assoc-type-projection-in-let-binding.rs
index 485b1a763900b..0438bcd96e1f5 100644
--- a/tests/ui/issues/issue-19850.rs
+++ b/tests/ui/associated-types/assoc-type-projection-in-let-binding.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/19850
+
 //@ check-pass
 #![allow(unused_variables)]
 // Test that `<Type as Trait>::Output` and `Self::Output` are accepted as type annotations in let
diff --git a/tests/ui/issues/issue-23406.rs b/tests/ui/associated-types/assoc-type-projection-on-ref-lifetime.rs
similarity index 72%
rename from tests/ui/issues/issue-23406.rs
rename to tests/ui/associated-types/assoc-type-projection-on-ref-lifetime.rs
index 819f0feb6147a..b70d0a7468ff1 100644
--- a/tests/ui/issues/issue-23406.rs
+++ b/tests/ui/associated-types/assoc-type-projection-on-ref-lifetime.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/23406
+
 //@ build-pass
 #![allow(dead_code)]
 trait Inner {
diff --git a/tests/ui/issues/issue-37109.rs b/tests/ui/associated-types/assoc-type-ref-in-tuple-return.rs
similarity index 75%
rename from tests/ui/issues/issue-37109.rs
rename to tests/ui/associated-types/assoc-type-ref-in-tuple-return.rs
index 5276266523d8d..a587affb52ef8 100644
--- a/tests/ui/issues/issue-37109.rs
+++ b/tests/ui/associated-types/assoc-type-ref-in-tuple-return.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/37109
+
 //@ run-pass
 trait ToRef<'a> {
     type Ref: 'a;
diff --git a/tests/ui/issues/issue-23992.rs b/tests/ui/associated-types/assoc-type-returns-outer-wrapping-self.rs
similarity index 84%
rename from tests/ui/issues/issue-23992.rs
rename to tests/ui/associated-types/assoc-type-returns-outer-wrapping-self.rs
index 08a99d357bc43..74e941962a16b 100644
--- a/tests/ui/issues/issue-23992.rs
+++ b/tests/ui/associated-types/assoc-type-returns-outer-wrapping-self.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/23992
+
 //@ run-pass
 pub struct Outer<T: Trait>(T);
 pub struct Inner<'a> { value: &'a bool }
diff --git a/tests/ui/issues/issue-21909.rs b/tests/ui/associated-types/bound-references-sibling-assoc-type.rs
similarity index 67%
rename from tests/ui/issues/issue-21909.rs
rename to tests/ui/associated-types/bound-references-sibling-assoc-type.rs
index ffc75f1f08cdd..18709cec121aa 100644
--- a/tests/ui/issues/issue-21909.rs
+++ b/tests/ui/associated-types/bound-references-sibling-assoc-type.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/21909
+
 //@ check-pass
 
 trait A<X> {
diff --git a/tests/ui/issues/issue-34839.rs b/tests/ui/associated-types/enum-variant-with-assoc-type-and-lifetimes.rs
similarity index 83%
rename from tests/ui/issues/issue-34839.rs
rename to tests/ui/associated-types/enum-variant-with-assoc-type-and-lifetimes.rs
index 73edba5817af3..64de3df1e7c92 100644
--- a/tests/ui/issues/issue-34839.rs
+++ b/tests/ui/associated-types/enum-variant-with-assoc-type-and-lifetimes.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/34839
+
 //@ check-pass
 
 trait RegularExpression: Sized {
diff --git a/tests/ui/issues/issue-25679.rs b/tests/ui/associated-types/method-on-impl-with-assoc-type-projection.rs
similarity index 100%
rename from tests/ui/issues/issue-25679.rs
rename to tests/ui/associated-types/method-on-impl-with-assoc-type-projection.rs
diff --git a/tests/ui/issues/issue-25693.rs b/tests/ui/associated-types/recursive-enum-with-assoc-type-selfref.rs
similarity index 100%
rename from tests/ui/issues/issue-25693.rs
rename to tests/ui/associated-types/recursive-enum-with-assoc-type-selfref.rs
diff --git a/tests/ui/issues/issue-35600.rs b/tests/ui/associated-types/same-name-assoc-type-and-method.rs
similarity index 76%
rename from tests/ui/issues/issue-35600.rs
rename to tests/ui/associated-types/same-name-assoc-type-and-method.rs
index 40df0b6dfd890..21990ee150ab6 100644
--- a/tests/ui/issues/issue-35600.rs
+++ b/tests/ui/associated-types/same-name-assoc-type-and-method.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/35600
+
 //@ run-pass
 #![allow(non_camel_case_types)]
 #![allow(unused_variables)]
diff --git a/tests/ui/issues/issue-27281.rs b/tests/ui/associated-types/self-type-alias-for-assoc-type.rs
similarity index 78%
rename from tests/ui/issues/issue-27281.rs
rename to tests/ui/associated-types/self-type-alias-for-assoc-type.rs
index e76fd135dcd23..14864ede2a8be 100644
--- a/tests/ui/issues/issue-27281.rs
+++ b/tests/ui/associated-types/self-type-alias-for-assoc-type.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/27281
+
 //@ check-pass
 pub trait Trait<'a> {
     type T;
diff --git a/tests/ui/issues/issue-18809.rs b/tests/ui/associated-types/simple-associated-type-impl.rs
similarity index 64%
rename from tests/ui/issues/issue-18809.rs
rename to tests/ui/associated-types/simple-associated-type-impl.rs
index d3ef6abc8bdc8..1ebaf3b281786 100644
--- a/tests/ui/issues/issue-18809.rs
+++ b/tests/ui/associated-types/simple-associated-type-impl.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/18809
+
 //@ check-pass
 trait Tup {
     type T0;
diff --git a/tests/ui/issues/issue-43357.rs b/tests/ui/associated-types/size-of-assoc-type-output.rs
similarity index 66%
rename from tests/ui/issues/issue-43357.rs
rename to tests/ui/associated-types/size-of-assoc-type-output.rs
index fd20bac804074..c8f1865a3a5c1 100644
--- a/tests/ui/issues/issue-43357.rs
+++ b/tests/ui/associated-types/size-of-assoc-type-output.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/43357
+
 //@ check-pass
 #![allow(dead_code)]
 trait Trait {
diff --git a/tests/ui/issues/issue-19482.rs b/tests/ui/associated-types/unspecified-assoc-type-in-trait-object.rs
similarity index 78%
rename from tests/ui/issues/issue-19482.rs
rename to tests/ui/associated-types/unspecified-assoc-type-in-trait-object.rs
index 9d0c8d96d29a6..45b0171bccba0 100644
--- a/tests/ui/issues/issue-19482.rs
+++ b/tests/ui/associated-types/unspecified-assoc-type-in-trait-object.rs
@@ -1,3 +1,4 @@
+// Regression test for https://github.com/rust-lang/rust/issues/19842
 // Test that a partially specified trait object with unspecified associated
 // type does not type-check.
 
diff --git a/tests/ui/issues/issue-19482.stderr b/tests/ui/associated-types/unspecified-assoc-type-in-trait-object.stderr
similarity index 87%
rename from tests/ui/issues/issue-19482.stderr
rename to tests/ui/associated-types/unspecified-assoc-type-in-trait-object.stderr
index 5ac5130b2cd6c..0bcd91e31c2c4 100644
--- a/tests/ui/issues/issue-19482.stderr
+++ b/tests/ui/associated-types/unspecified-assoc-type-in-trait-object.stderr
@@ -1,5 +1,5 @@
 error[E0191]: the value of the associated type `A` in `Foo` must be specified
-  --> $DIR/issue-19482.rs:10:16
+  --> $DIR/unspecified-assoc-type-in-trait-object.rs:11:16
    |
 LL |     type A;
    |     ------ `A` defined here