diff --git a/tests/ui/issues/issue-3874.rs b/tests/ui/binding/ref-in-let-lhs-in-field.rs
similarity index 76%
rename from tests/ui/issues/issue-3874.rs
rename to tests/ui/binding/ref-in-let-lhs-in-field.rs
index 251e8e1da6d34..75ba4536545d5 100644
--- a/tests/ui/issues/issue-3874.rs
+++ b/tests/ui/binding/ref-in-let-lhs-in-field.rs
@@ -1,3 +1,4 @@
+//! regression test for <https://github.com/rust-lang/rust/issues/3874>
 //@ build-pass
 #![allow(dead_code)]
 
diff --git a/tests/ui/issues/issue-4972.rs b/tests/ui/box/deref-borrowed-trait-object-in-box.rs
similarity index 80%
rename from tests/ui/issues/issue-4972.rs
rename to tests/ui/box/deref-borrowed-trait-object-in-box.rs
index 3f1c6f855007c..61cb2b2a8ae2e 100644
--- a/tests/ui/issues/issue-4972.rs
+++ b/tests/ui/box/deref-borrowed-trait-object-in-box.rs
@@ -1,3 +1,4 @@
+//! 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/box/deref-borrowed-trait-object-in-box.stderr
similarity index 86%
rename from tests/ui/issues/issue-4972.stderr
rename to tests/ui/box/deref-borrowed-trait-object-in-box.stderr
index 8de3909ca305e..083133c468cab 100644
--- a/tests/ui/issues/issue-4972.stderr
+++ b/tests/ui/box/deref-borrowed-trait-object-in-box.stderr
@@ -1,5 +1,5 @@
 error[E0033]: type `Box<(dyn MyTrait + 'static)>` cannot be dereferenced
-  --> $DIR/issue-4972.rs:13:25
+  --> $DIR/deref-borrowed-trait-object-in-box.rs:14:25
    |
 LL |         TraitWrapper::A(box ref map) => map,
    |                         ^^^^^^^^^^^ type `Box<(dyn MyTrait + 'static)>` cannot be dereferenced