diff --git a/tests/ui/issues/issue-17734.rs b/tests/ui/codegen/box-str-drop-glue.rs
similarity index 85%
rename from tests/ui/issues/issue-17734.rs
rename to tests/ui/codegen/box-str-drop-glue.rs
index 984adeece6de..6a25db722af7 100644
--- a/tests/ui/issues/issue-17734.rs
+++ b/tests/ui/codegen/box-str-drop-glue.rs
@@ -1,3 +1,4 @@
+//! regression test for <https://github.com/rust-lang/rust/issues/17734>
 //@ run-pass
 // Test that generating drop glue for Box<str> doesn't ICE
 
diff --git a/tests/ui/issues/issue-4735.rs b/tests/ui/drop/drop-noncopyable-raw-pointer.rs
similarity index 83%
rename from tests/ui/issues/issue-4735.rs
rename to tests/ui/drop/drop-noncopyable-raw-pointer.rs
index 1ca145bae420..8e980a23c904 100644
--- a/tests/ui/issues/issue-4735.rs
+++ b/tests/ui/drop/drop-noncopyable-raw-pointer.rs
@@ -1,3 +1,4 @@
+//! regression test for <https://github.com/rust-lang/rust/issues/4735>
 //@ run-pass
 
 use std::mem::transmute;