diff --git a/tests/ui/issues/issue-4972.rs b/tests/ui/deref/box-pattern-trait-object-cannot-deref.rs
similarity index 80%
rename from tests/ui/issues/issue-4972.rs
rename to tests/ui/deref/box-pattern-trait-object-cannot-deref.rs
index 3f1c6f855007..a144fb360513 100644
--- a/tests/ui/issues/issue-4972.rs
+++ b/tests/ui/deref/box-pattern-trait-object-cannot-deref.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/4972
+
 #![feature(box_patterns)]
 
 trait MyTrait {
diff --git a/tests/ui/issues/issue-4972.stderr b/tests/ui/deref/box-pattern-trait-object-cannot-deref.stderr
similarity index 85%
rename from tests/ui/issues/issue-4972.stderr
rename to tests/ui/deref/box-pattern-trait-object-cannot-deref.stderr
index 8de3909ca305..451fbf4fbcd3 100644
--- a/tests/ui/issues/issue-4972.stderr
+++ b/tests/ui/deref/box-pattern-trait-object-cannot-deref.stderr
@@ -1,5 +1,5 @@
 error[E0033]: type `Box<(dyn MyTrait + 'static)>` cannot be dereferenced
-  --> $DIR/issue-4972.rs:13:25
+  --> $DIR/box-pattern-trait-object-cannot-deref.rs:15:25
    |
 LL |         TraitWrapper::A(box ref map) => map,
    |                         ^^^^^^^^^^^ type `Box<(dyn MyTrait + 'static)>` cannot be dereferenced
diff --git a/tests/ui/issues/issue-27697.rs b/tests/ui/deref/deref-impl-for-dyn-trait.rs
similarity index 81%
rename from tests/ui/issues/issue-27697.rs
rename to tests/ui/deref/deref-impl-for-dyn-trait.rs
index 87ee190c01c4..4d15d05c45f5 100644
--- a/tests/ui/issues/issue-27697.rs
+++ b/tests/ui/deref/deref-impl-for-dyn-trait.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/27697
+
 //@ check-pass
 
 use std::ops::Deref;
diff --git a/tests/ui/issues/issue-16774.rs b/tests/ui/deref/deref-mut-closure-drop-order.rs
similarity index 91%
rename from tests/ui/issues/issue-16774.rs
rename to tests/ui/deref/deref-mut-closure-drop-order.rs
index bef7f0f975cf..b95ae68f1734 100644
--- a/tests/ui/issues/issue-16774.rs
+++ b/tests/ui/deref/deref-mut-closure-drop-order.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/16774
+
 //@ run-pass
 #![feature(box_patterns)]
 
diff --git a/tests/ui/issues/issue-26205.rs b/tests/ui/deref/deref-mut-method-through-box.rs
similarity index 84%
rename from tests/ui/issues/issue-26205.rs
rename to tests/ui/deref/deref-mut-method-through-box.rs
index de1846e3e017..984b6e55dbdc 100644
--- a/tests/ui/issues/issue-26205.rs
+++ b/tests/ui/deref/deref-mut-method-through-box.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/26205
+
 //@ check-pass
 #![allow(dead_code)]
 use std::ops::{Deref, DerefMut};
diff --git a/tests/ui/issues/issue-22992-2.rs b/tests/ui/deref/deref-newtype-method-call.rs
similarity index 73%
rename from tests/ui/issues/issue-22992-2.rs
rename to tests/ui/deref/deref-newtype-method-call.rs
index c2edb4286585..9e773eb86692 100644
--- a/tests/ui/issues/issue-22992-2.rs
+++ b/tests/ui/deref/deref-newtype-method-call.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/22992
+
 //@ run-pass
 struct A(B);
 struct B;
diff --git a/tests/ui/issues/issue-24589.rs b/tests/ui/deref/deref-newtype-slice-coercion.rs
similarity index 73%
rename from tests/ui/issues/issue-24589.rs
rename to tests/ui/deref/deref-newtype-slice-coercion.rs
index e08e06a88b84..2947c9c36368 100644
--- a/tests/ui/issues/issue-24589.rs
+++ b/tests/ui/deref/deref-newtype-slice-coercion.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/24589
+
 //@ run-pass
 pub struct _X([u8]);
 
diff --git a/tests/ui/issues/issue-38381.rs b/tests/ui/deref/deref-target-in-fn-type.rs
similarity index 62%
rename from tests/ui/issues/issue-38381.rs
rename to tests/ui/deref/deref-target-in-fn-type.rs
index a51ee78eb76f..4a14d289ea30 100644
--- a/tests/ui/issues/issue-38381.rs
+++ b/tests/ui/deref/deref-target-in-fn-type.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/38381
+
 //@ check-pass
 
 use std::ops::Deref;
diff --git a/tests/ui/issues/issue-26186.rs b/tests/ui/deref/deref-to-dyn-fn-mut-callable.rs
similarity index 95%
rename from tests/ui/issues/issue-26186.rs
rename to tests/ui/deref/deref-to-dyn-fn-mut-callable.rs
index 225cfb4876aa..62a52fcd7cbf 100644
--- a/tests/ui/issues/issue-26186.rs
+++ b/tests/ui/deref/deref-to-dyn-fn-mut-callable.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/26186
+
 //@ check-pass
 use std::sync::Mutex;
 use std::cell::RefCell;