diff --git a/tests/ui/issues/issue-32377.rs b/tests/ui/intrinsics/transmute-phantomdata-generic-unequal-size.rs
similarity index 83%
rename from tests/ui/issues/issue-32377.rs
rename to tests/ui/intrinsics/transmute-phantomdata-generic-unequal-size.rs
index 6737f9820efd9..203894a7217a7 100644
--- a/tests/ui/issues/issue-32377.rs
+++ b/tests/ui/intrinsics/transmute-phantomdata-generic-unequal-size.rs
@@ -1,3 +1,4 @@
+//! regression test for <https://github.com/rust-lang/rust/issues/32377>
 //@ normalize-stderr: "\d+ bits" -> "N bits"
 
 use std::mem;
diff --git a/tests/ui/issues/issue-32377.stderr b/tests/ui/intrinsics/transmute-phantomdata-generic-unequal-size.stderr
similarity index 85%
rename from tests/ui/issues/issue-32377.stderr
rename to tests/ui/intrinsics/transmute-phantomdata-generic-unequal-size.stderr
index 01a81cea1eca9..76fda2f2c417d 100644
--- a/tests/ui/issues/issue-32377.stderr
+++ b/tests/ui/intrinsics/transmute-phantomdata-generic-unequal-size.stderr
@@ -1,5 +1,5 @@
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
-  --> $DIR/issue-32377.rs:15:14
+  --> $DIR/transmute-phantomdata-generic-unequal-size.rs:16:14
    |
 LL |     unsafe { mem::transmute(x) }
    |              ^^^^^^^^^^^^^^
diff --git a/tests/ui/issues/issue-25746-bool-transmute.rs b/tests/ui/transmute/transmute-bool-u8.rs
similarity index 73%
rename from tests/ui/issues/issue-25746-bool-transmute.rs
rename to tests/ui/transmute/transmute-bool-u8.rs
index 046dcf83f62d6..502683b6d1366 100644
--- a/tests/ui/issues/issue-25746-bool-transmute.rs
+++ b/tests/ui/transmute/transmute-bool-u8.rs
@@ -1,4 +1,5 @@
-//@ run-pass
+//! regression test for <https://github.com/rust-lang/rust/issues/25746>
+//@ build-pass
 #![allow(unnecessary_transmutes)]
 use std::mem::transmute;