diff --git a/src/test/ui/issues/auxiliary/issue-10028.rs b/src/test/ui/drop/auxiliary/issue-10028.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-10028.rs
rename to src/test/ui/drop/auxiliary/issue-10028.rs
diff --git a/src/test/ui/issues/issue-10028.rs b/src/test/ui/drop/issue-10028.rs
similarity index 100%
rename from src/test/ui/issues/issue-10028.rs
rename to src/test/ui/drop/issue-10028.rs
diff --git a/src/test/ui/issues/issue-10025.rs b/src/test/ui/extern/issue-10025.rs
similarity index 100%
rename from src/test/ui/issues/issue-10025.rs
rename to src/test/ui/extern/issue-10025.rs
diff --git a/src/test/ui/issues/auxiliary/issue-10031-aux.rs b/src/test/ui/issues/auxiliary/issue-10031-aux.rs
deleted file mode 100644
index e2abeb99ea829..0000000000000
--- a/src/test/ui/issues/auxiliary/issue-10031-aux.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub struct Wrap<A>(pub A);
diff --git a/src/test/ui/issues/issue-10031.rs b/src/test/ui/issues/issue-10031.rs
deleted file mode 100644
index 136df05c2397a..0000000000000
--- a/src/test/ui/issues/issue-10031.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// run-pass
-// aux-build:issue-10031-aux.rs
-// pretty-expanded FIXME #23616
-
-extern crate issue_10031_aux;
-
-pub fn main() {
-    let _ = issue_10031_aux::Wrap(());
-}
diff --git a/src/test/ui/issues/issue-10176.rs b/src/test/ui/never_type/issue-10176.rs
similarity index 100%
rename from src/test/ui/issues/issue-10176.rs
rename to src/test/ui/never_type/issue-10176.rs
diff --git a/src/test/ui/issues/issue-10176.stderr b/src/test/ui/never_type/issue-10176.stderr
similarity index 100%
rename from src/test/ui/issues/issue-10176.stderr
rename to src/test/ui/never_type/issue-10176.stderr
diff --git a/src/test/ui/issues/issue-10200.rs b/src/test/ui/resolve/issue-10200.rs
similarity index 100%
rename from src/test/ui/issues/issue-10200.rs
rename to src/test/ui/resolve/issue-10200.rs
diff --git a/src/test/ui/issues/issue-10200.stderr b/src/test/ui/resolve/issue-10200.stderr
similarity index 100%
rename from src/test/ui/issues/issue-10200.stderr
rename to src/test/ui/resolve/issue-10200.stderr