diff --git a/tests/ui/issues/issue-28625.rs b/tests/ui/issues/issue-28625.rs
deleted file mode 100644
index 54ed408e74881..0000000000000
--- a/tests/ui/issues/issue-28625.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-//@ normalize-stderr: "\d+ bits" -> "N bits"
-
-trait Bar {
-    type Bar;
-}
-
-struct ArrayPeano<T: Bar> {
-    data: T::Bar,
-}
-
-fn foo<T>(a: &ArrayPeano<T>) -> &[T] where T: Bar {
-    unsafe { std::mem::transmute(a) } //~ ERROR cannot transmute between types of different sizes
-}
-
-impl Bar for () {
-    type Bar = ();
-}
-
-fn main() {
-    let x: ArrayPeano<()> = ArrayPeano { data: () };
-    foo(&x);
-}
diff --git a/tests/ui/transmute/transmute-associated-type-to-slice.rs b/tests/ui/transmute/transmute-associated-type-to-slice.rs
new file mode 100644
index 0000000000000..9521a944391cc
--- /dev/null
+++ b/tests/ui/transmute/transmute-associated-type-to-slice.rs
@@ -0,0 +1,23 @@
+//! regression test for <https://github.com/rust-lang/rust/issues/28625>
+//@ normalize-stderr: "\d+ bits" -> "N bits"
+
+trait MyTrait {
+    type MyType;
+}
+
+struct ArrayPeano<T: MyTrait> {
+    data: T::MyType,
+}
+
+fn foo<T>(a: &ArrayPeano<T>) -> &[T] where T: MyTrait {
+    unsafe { std::mem::transmute(a) } //~ ERROR cannot transmute between types of different sizes
+}
+
+impl MyTrait for () {
+    type MyType = ();
+}
+
+fn main() {
+    let x: ArrayPeano<()> = ArrayPeano { data: () };
+    foo(&x);
+}
diff --git a/tests/ui/issues/issue-28625.stderr b/tests/ui/transmute/transmute-associated-type-to-slice.stderr
similarity index 87%
rename from tests/ui/issues/issue-28625.stderr
rename to tests/ui/transmute/transmute-associated-type-to-slice.stderr
index 3600622a45424..ada3153165e57 100644
--- a/tests/ui/issues/issue-28625.stderr
+++ b/tests/ui/transmute/transmute-associated-type-to-slice.stderr
@@ -1,5 +1,5 @@
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
-  --> $DIR/issue-28625.rs:12:14
+  --> $DIR/transmute-associated-type-to-slice.rs:13:14
    |
 LL |     unsafe { std::mem::transmute(a) }
    |              ^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/issues/issue-23477.rs b/tests/ui/transmute/transmute-slice-to-dst.rs
similarity index 77%
rename from tests/ui/issues/issue-23477.rs
rename to tests/ui/transmute/transmute-slice-to-dst.rs
index fa69a1d762682..c1f77bee284dd 100644
--- a/tests/ui/issues/issue-23477.rs
+++ b/tests/ui/transmute/transmute-slice-to-dst.rs
@@ -1,3 +1,4 @@
+//! regression test for <https://github.com/rust-lang/rust/issues/23477>
 //@ build-pass
 //@ compile-flags: -g