diff --git a/tests/ui/issues/issue-43923.rs b/tests/ui/coercion/generic-fn-items-in-array-literal.rs
similarity index 74%
rename from tests/ui/issues/issue-43923.rs
rename to tests/ui/coercion/generic-fn-items-in-array-literal.rs
index 4cd46b6ca6025..cbc5d391ed1fe 100644
--- a/tests/ui/issues/issue-43923.rs
+++ b/tests/ui/coercion/generic-fn-items-in-array-literal.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/43923>
 //@ run-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/tests/ui/issues/issue-33241.rs b/tests/ui/dst/tuple-with-unsized-tail-field.rs
similarity index 78%
rename from tests/ui/issues/issue-33241.rs
rename to tests/ui/dst/tuple-with-unsized-tail-field.rs
index 1c497876a90da..db81106f0422b 100644
--- a/tests/ui/issues/issue-33241.rs
+++ b/tests/ui/dst/tuple-with-unsized-tail-field.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/33241>
 //@ check-pass
 
 use std::fmt;
diff --git a/tests/ui/issues/issue-35988.rs b/tests/ui/enum/unsized-field-in-enum-variant.rs
similarity index 53%
rename from tests/ui/issues/issue-35988.rs
rename to tests/ui/enum/unsized-field-in-enum-variant.rs
index 5cf2f8e5212d1..a2640e1ba5b13 100644
--- a/tests/ui/issues/issue-35988.rs
+++ b/tests/ui/enum/unsized-field-in-enum-variant.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/35988>
 enum E {
     V([Box<E>]),
     //~^ ERROR the size for values of type
diff --git a/tests/ui/issues/issue-35988.stderr b/tests/ui/enum/unsized-field-in-enum-variant.stderr
similarity index 93%
rename from tests/ui/issues/issue-35988.stderr
rename to tests/ui/enum/unsized-field-in-enum-variant.stderr
index 4a674b010ea62..7ea40614da22d 100644
--- a/tests/ui/issues/issue-35988.stderr
+++ b/tests/ui/enum/unsized-field-in-enum-variant.stderr
@@ -1,5 +1,5 @@
 error[E0277]: the size for values of type `[Box<E>]` cannot be known at compilation time
-  --> $DIR/issue-35988.rs:2:7
+  --> $DIR/unsized-field-in-enum-variant.rs:3:7
    |
 LL |     V([Box<E>]),
    |       ^^^^^^^^ doesn't have a size known at compile-time
diff --git a/tests/ui/issues/issue-44023.rs b/tests/ui/error-emitter/multibyte-char-in-diagnostic-source-line.rs
similarity index 64%
rename from tests/ui/issues/issue-44023.rs
rename to tests/ui/error-emitter/multibyte-char-in-diagnostic-source-line.rs
index e4320b7dac592..4b1843bb5fb0f 100644
--- a/tests/ui/issues/issue-44023.rs
+++ b/tests/ui/error-emitter/multibyte-char-in-diagnostic-source-line.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/44023>
 pub fn main () {}
 
 fn საჭმელად_გემრიელი_სადილი ( ) -> isize { //~ ERROR mismatched types
diff --git a/tests/ui/issues/issue-44023.stderr b/tests/ui/error-emitter/multibyte-char-in-diagnostic-source-line.stderr
similarity index 87%
rename from tests/ui/issues/issue-44023.stderr
rename to tests/ui/error-emitter/multibyte-char-in-diagnostic-source-line.stderr
index 8554154fba515..9ced2d882b8f6 100644
--- a/tests/ui/issues/issue-44023.stderr
+++ b/tests/ui/error-emitter/multibyte-char-in-diagnostic-source-line.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-44023.rs:3:36
+  --> $DIR/multibyte-char-in-diagnostic-source-line.rs:4:36
    |
 LL | fn საჭმელად_გემრიელი_სადილი ( ) -> isize {
    |    ------------------------        ^^^^^ expected `isize`, found `()`
diff --git a/tests/ui/feature-gates/auxiliary/unstable-crate-import-gated-in-2018-edition.rs b/tests/ui/feature-gates/auxiliary/unstable-crate-import-gated-in-2018-edition.rs
new file mode 100644
index 0000000000000..f725a948d6aec
--- /dev/null
+++ b/tests/ui/feature-gates/auxiliary/unstable-crate-import-gated-in-2018-edition.rs
@@ -0,0 +1,4 @@
+//! Auxiliary crate for regression test of <https://github.com/rust-lang/rust/issues/52489>
+#![crate_type = "lib"]
+#![unstable(feature = "unstable_crate_import_gated_in_2018_edition", issue = "none")]
+#![feature(staged_api)]
diff --git a/tests/ui/feature-gates/unstable-crate-import-gated-in-2018-edition.rs b/tests/ui/feature-gates/unstable-crate-import-gated-in-2018-edition.rs
new file mode 100644
index 0000000000000..9e2036357ff63
--- /dev/null
+++ b/tests/ui/feature-gates/unstable-crate-import-gated-in-2018-edition.rs
@@ -0,0 +1,9 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/52489>
+//@ edition:2018
+//@ aux-build:unstable-crate-import-gated-in-2018-edition.rs
+//@ compile-flags: --extern unstable_crate_import_gated_in_2018_edition
+
+use unstable_crate_import_gated_in_2018_edition;
+//~^ ERROR use of unstable library feature `unstable_crate_import_gated_in_2018_edition`
+
+fn main() {}
diff --git a/tests/ui/feature-gates/unstable-crate-import-gated-in-2018-edition.stderr b/tests/ui/feature-gates/unstable-crate-import-gated-in-2018-edition.stderr
new file mode 100644
index 0000000000000..d9ef6c01ca0ab
--- /dev/null
+++ b/tests/ui/feature-gates/unstable-crate-import-gated-in-2018-edition.stderr
@@ -0,0 +1,12 @@
+error[E0658]: use of unstable library feature `unstable_crate_import_gated_in_2018_edition`
+  --> $DIR/unstable-crate-import-gated-in-2018-edition.rs:6:5
+   |
+LL | use unstable_crate_import_gated_in_2018_edition;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = help: add `#![feature(unstable_crate_import_gated_in_2018_edition)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/issues/issue-3556.rs b/tests/ui/fmt/format-enum-with-recursive-variant.rs
similarity index 93%
rename from tests/ui/issues/issue-3556.rs
rename to tests/ui/fmt/format-enum-with-recursive-variant.rs
index 72fd46e0a4a1c..9ea7c4d91a6c2 100644
--- a/tests/ui/issues/issue-3556.rs
+++ b/tests/ui/fmt/format-enum-with-recursive-variant.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/3556>
 //@ run-pass
 #![allow(dead_code)]
 
diff --git a/tests/ui/issues/issue-43431.rs b/tests/ui/fn_traits/fn-trait-ufcs-call-in-impl.rs
similarity index 82%
rename from tests/ui/issues/issue-43431.rs
rename to tests/ui/fn_traits/fn-trait-ufcs-call-in-impl.rs
index 0286336910e10..8ccf231215689 100644
--- a/tests/ui/issues/issue-43431.rs
+++ b/tests/ui/fn_traits/fn-trait-ufcs-call-in-impl.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/43431>
 #![feature(fn_traits)]
 
 trait CallSingle<A, B> {
diff --git a/tests/ui/issues/issue-43431.stderr b/tests/ui/fn_traits/fn-trait-ufcs-call-in-impl.stderr
similarity index 86%
rename from tests/ui/issues/issue-43431.stderr
rename to tests/ui/fn_traits/fn-trait-ufcs-call-in-impl.stderr
index 27a720408e4b7..33dbbfd7ac077 100644
--- a/tests/ui/issues/issue-43431.stderr
+++ b/tests/ui/fn_traits/fn-trait-ufcs-call-in-impl.stderr
@@ -1,5 +1,5 @@
 error[E0229]: associated item constraints are not allowed here
-  --> $DIR/issue-43431.rs:9:27
+  --> $DIR/fn-trait-ufcs-call-in-impl.rs:10:27
    |
 LL |         <Self as Fn(A) -> B>::call(self, (a,))
    |                           ^ associated item constraint not allowed here
diff --git a/tests/ui/issues/issue-45510.rs b/tests/ui/fn_traits/overloaded-fnonce-resolution.rs
similarity index 91%
rename from tests/ui/issues/issue-45510.rs
rename to tests/ui/fn_traits/overloaded-fnonce-resolution.rs
index d73218a385924..0f7a8649fd627 100644
--- a/tests/ui/issues/issue-45510.rs
+++ b/tests/ui/fn_traits/overloaded-fnonce-resolution.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/45510>
 // Test overloaded resolution of fn_traits.
 //@ run-pass
 
diff --git a/tests/ui/issues/issue-39687.rs b/tests/ui/fn_traits/parenthesized-fn-trait-in-qualified-path.rs
similarity index 65%
rename from tests/ui/issues/issue-39687.rs
rename to tests/ui/fn_traits/parenthesized-fn-trait-in-qualified-path.rs
index 58f981b63d11d..479b23ac30542 100644
--- a/tests/ui/issues/issue-39687.rs
+++ b/tests/ui/fn_traits/parenthesized-fn-trait-in-qualified-path.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/39687>
 #![feature(fn_traits)]
 
 fn main() {
diff --git a/tests/ui/issues/issue-39687.stderr b/tests/ui/fn_traits/parenthesized-fn-trait-in-qualified-path.stderr
similarity index 82%
rename from tests/ui/issues/issue-39687.stderr
rename to tests/ui/fn_traits/parenthesized-fn-trait-in-qualified-path.stderr
index 87e5fdc2d8f22..b863561f02855 100644
--- a/tests/ui/issues/issue-39687.stderr
+++ b/tests/ui/fn_traits/parenthesized-fn-trait-in-qualified-path.stderr
@@ -1,5 +1,5 @@
 error[E0229]: associated item constraints are not allowed here
-  --> $DIR/issue-39687.rs:4:14
+  --> $DIR/parenthesized-fn-trait-in-qualified-path.rs:5:14
    |
 LL |     <fn() as Fn()>::call;
    |              ^^^^ associated item constraint not allowed here
diff --git a/tests/ui/issues/auxiliary/issue-52489.rs b/tests/ui/issues/auxiliary/issue-52489.rs
deleted file mode 100644
index f53bf7db52536..0000000000000
--- a/tests/ui/issues/auxiliary/issue-52489.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#![crate_type = "lib"]
-#![unstable(feature = "issue_52489_unstable", issue = "none")]
-#![feature(staged_api)]
diff --git a/tests/ui/issues/issue-52489.rs b/tests/ui/issues/issue-52489.rs
deleted file mode 100644
index c1e1cb41c76d6..0000000000000
--- a/tests/ui/issues/issue-52489.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-//@ edition:2018
-//@ aux-build:issue-52489.rs
-//@ compile-flags:--extern issue_52489
-
-use issue_52489;
-//~^ ERROR use of unstable library feature `issue_52489_unstable`
-
-fn main() {}
diff --git a/tests/ui/issues/issue-52489.stderr b/tests/ui/issues/issue-52489.stderr
deleted file mode 100644
index 8e5b87b7f0fd2..0000000000000
--- a/tests/ui/issues/issue-52489.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0658]: use of unstable library feature `issue_52489_unstable`
-  --> $DIR/issue-52489.rs:5:5
-   |
-LL | use issue_52489;
-   |     ^^^^^^^^^^^
-   |
-   = help: add `#![feature(issue_52489_unstable)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
-
-error: aborting due to 1 previous error
-
-For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/issues/issue-37733.rs b/tests/ui/parser/accept-lifetime-list-empty-or-trailing-comma.rs
similarity index 57%
rename from tests/ui/issues/issue-37733.rs
rename to tests/ui/parser/accept-lifetime-list-empty-or-trailing-comma.rs
index fff42e9fc3c99..3bac134f39682 100644
--- a/tests/ui/issues/issue-37733.rs
+++ b/tests/ui/parser/accept-lifetime-list-empty-or-trailing-comma.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/37733>
 //@ build-pass
 #![allow(dead_code)]
 type A = for<> fn();