diff --git a/tests/ui/issues/issue-16683.rs b/tests/ui/lifetimes/elided-self-lifetime-in-trait-fn.rs
similarity index 68%
rename from tests/ui/issues/issue-16683.rs
rename to tests/ui/lifetimes/elided-self-lifetime-in-trait-fn.rs
index 72fa21bddd186..5ac39c6f5d9bf 100644
--- a/tests/ui/issues/issue-16683.rs
+++ b/tests/ui/lifetimes/elided-self-lifetime-in-trait-fn.rs
@@ -1,3 +1,4 @@
+//! regression test for <https://github.com/rust-lang/rust/issues/16683>
 trait T<'a> {
     fn a(&'a self) -> &'a bool;
     fn b(&self) {
diff --git a/tests/ui/issues/issue-16683.stderr b/tests/ui/lifetimes/elided-self-lifetime-in-trait-fn.stderr
similarity index 87%
rename from tests/ui/issues/issue-16683.stderr
rename to tests/ui/lifetimes/elided-self-lifetime-in-trait-fn.stderr
index 39b22ed1f1568..383afaf782f9a 100644
--- a/tests/ui/issues/issue-16683.stderr
+++ b/tests/ui/lifetimes/elided-self-lifetime-in-trait-fn.stderr
@@ -1,5 +1,5 @@
 error: lifetime may not live long enough
-  --> $DIR/issue-16683.rs:4:9
+  --> $DIR/elided-self-lifetime-in-trait-fn.rs:5:9
    |
 LL | trait T<'a> {
    |         -- lifetime `'a` defined here
diff --git a/tests/ui/issues/issue-17405.rs b/tests/ui/pattern/struct_pattern_on_tuple_enum.rs
similarity index 69%
rename from tests/ui/issues/issue-17405.rs
rename to tests/ui/pattern/struct_pattern_on_tuple_enum.rs
index 14781a7d3f7ea..a827788419394 100644
--- a/tests/ui/issues/issue-17405.rs
+++ b/tests/ui/pattern/struct_pattern_on_tuple_enum.rs
@@ -1,3 +1,4 @@
+//! regression test for <https://github.com/rust-lang/rust/issues/17405>
 enum Foo {
     Bar(isize)
 }
diff --git a/tests/ui/issues/issue-17405.stderr b/tests/ui/pattern/struct_pattern_on_tuple_enum.stderr
similarity index 85%
rename from tests/ui/issues/issue-17405.stderr
rename to tests/ui/pattern/struct_pattern_on_tuple_enum.stderr
index 47f5bf4dc330a..a322b363aa9c4 100644
--- a/tests/ui/issues/issue-17405.stderr
+++ b/tests/ui/pattern/struct_pattern_on_tuple_enum.stderr
@@ -1,5 +1,5 @@
 error[E0574]: expected struct, variant or union type, found enum `Foo`
-  --> $DIR/issue-17405.rs:7:9
+  --> $DIR/struct_pattern_on_tuple_enum.rs:8:9
    |
 LL |         Foo { i } => ()
    |         ^^^ not a struct, variant or union type
diff --git a/tests/ui/issues/issue-18389.rs b/tests/ui/privacy/trait_more_private_than_item.rs
similarity index 83%
rename from tests/ui/issues/issue-18389.rs
rename to tests/ui/privacy/trait_more_private_than_item.rs
index 0ab3f14545727..f55a494abd212 100644
--- a/tests/ui/issues/issue-18389.rs
+++ b/tests/ui/privacy/trait_more_private_than_item.rs
@@ -1,3 +1,4 @@
+//! regression test for <https://github.com/rust-lang/rust/issues/18389>
 //@ check-pass
 
 use std::any::Any;
diff --git a/tests/ui/issues/issue-18389.stderr b/tests/ui/privacy/trait_more_private_than_item.stderr
similarity index 84%
rename from tests/ui/issues/issue-18389.stderr
rename to tests/ui/privacy/trait_more_private_than_item.stderr
index 4706d1ba1779e..03bffcd390c55 100644
--- a/tests/ui/issues/issue-18389.stderr
+++ b/tests/ui/privacy/trait_more_private_than_item.stderr
@@ -1,5 +1,5 @@
 warning: trait `Private<<Self as Public>::P, <Self as Public>::R>` is more private than the item `Public`
-  --> $DIR/issue-18389.rs:9:1
+  --> $DIR/trait_more_private_than_item.rs:10:1
    |
 LL | / pub trait Public: Private<
 LL | |
@@ -9,7 +9,7 @@ LL | | > {
    | |_^ trait `Public` is reachable at visibility `pub`
    |
 note: but trait `Private<<Self as Public>::P, <Self as Public>::R>` is only usable at visibility `pub(crate)`
-  --> $DIR/issue-18389.rs:6:1
+  --> $DIR/trait_more_private_than_item.rs:7:1
    |
 LL | trait Private<P, R> {
    | ^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/issues/issue-18119.rs b/tests/ui/resolve/impl-on-non-type.rs
similarity index 75%
rename from tests/ui/issues/issue-18119.rs
rename to tests/ui/resolve/impl-on-non-type.rs
index e48dc51a2c644..3db13d520f9fe 100644
--- a/tests/ui/issues/issue-18119.rs
+++ b/tests/ui/resolve/impl-on-non-type.rs
@@ -1,3 +1,4 @@
+//! regression test for <https://github.com/rust-lang/rust/issues/18119>
 const X: u8 = 1;
 static Y: u8 = 1;
 fn foo() {}
diff --git a/tests/ui/issues/issue-18119.stderr b/tests/ui/resolve/impl-on-non-type.stderr
similarity index 78%
rename from tests/ui/issues/issue-18119.stderr
rename to tests/ui/resolve/impl-on-non-type.stderr
index ddee5a9da7a42..99cc405015b58 100644
--- a/tests/ui/issues/issue-18119.stderr
+++ b/tests/ui/resolve/impl-on-non-type.stderr
@@ -1,17 +1,17 @@
 error[E0573]: expected type, found constant `X`
-  --> $DIR/issue-18119.rs:5:6
+  --> $DIR/impl-on-non-type.rs:6:6
    |
 LL | impl X {}
    |      ^ not a type
 
 error[E0573]: expected type, found static `Y`
-  --> $DIR/issue-18119.rs:7:6
+  --> $DIR/impl-on-non-type.rs:8:6
    |
 LL | impl Y {}
    |      ^ not a type
 
 error[E0573]: expected type, found function `foo`
-  --> $DIR/issue-18119.rs:9:6
+  --> $DIR/impl-on-non-type.rs:10:6
    |
 LL | impl foo {}
    |      ^^^ not a type
diff --git a/tests/ui/issues/issue-17994.rs b/tests/ui/type-alias/unused_type_parameter.rs
similarity index 58%
rename from tests/ui/issues/issue-17994.rs
rename to tests/ui/type-alias/unused_type_parameter.rs
index ab37a172eaa74..64fb98be1bf74 100644
--- a/tests/ui/issues/issue-17994.rs
+++ b/tests/ui/type-alias/unused_type_parameter.rs
@@ -1,3 +1,4 @@
+//! regression test for <https://github.com/rust-lang/rust/issues/17994>
 trait Tr {}
 type Huh<T> where T: Tr = isize; //~ ERROR type parameter `T` is never used
 fn main() {}
diff --git a/tests/ui/issues/issue-17994.stderr b/tests/ui/type-alias/unused_type_parameter.stderr
similarity index 88%
rename from tests/ui/issues/issue-17994.stderr
rename to tests/ui/type-alias/unused_type_parameter.stderr
index f149e5d08faac..a9ddbc8c5001d 100644
--- a/tests/ui/issues/issue-17994.stderr
+++ b/tests/ui/type-alias/unused_type_parameter.stderr
@@ -1,5 +1,5 @@
 error[E0091]: type parameter `T` is never used
-  --> $DIR/issue-17994.rs:2:10
+  --> $DIR/unused_type_parameter.rs:3:10
    |
 LL | type Huh<T> where T: Tr = isize;
    |          ^ unused type parameter