diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index 77414bec82d35..d68dfadd921f4 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -1439,36 +1439,8 @@ ui/issues/auxiliary/issue-9155.rs
 ui/issues/auxiliary/issue-9188.rs
 ui/issues/auxiliary/issue-9906.rs
 ui/issues/auxiliary/issue-9968.rs
-ui/issues/issue-10228.rs
-ui/issues/issue-10291.rs
-ui/issues/issue-102964.rs
-ui/issues/issue-10396.rs
-ui/issues/issue-10412.rs
-ui/issues/issue-10436.rs
-ui/issues/issue-10456.rs
-ui/issues/issue-10465.rs
-ui/issues/issue-10545.rs
-ui/issues/issue-10638.rs
 ui/issues/issue-10656.rs
-ui/issues/issue-106755.rs
-ui/issues/issue-10683.rs
-ui/issues/issue-10718.rs
-ui/issues/issue-10734.rs
-ui/issues/issue-10764.rs
-ui/issues/issue-10767.rs
-ui/issues/issue-10802.rs
-ui/issues/issue-10806.rs
-ui/issues/issue-10853.rs
-ui/issues/issue-10877.rs
-ui/issues/issue-10902.rs
-ui/issues/issue-11004.rs
-ui/issues/issue-11047.rs
-ui/issues/issue-11085.rs
-ui/issues/issue-11192.rs
-ui/issues/issue-11205.rs
 ui/issues/issue-11224.rs
-ui/issues/issue-11267.rs
-ui/issues/issue-11374.rs
 ui/issues/issue-11382.rs
 ui/issues/issue-11384.rs
 ui/issues/issue-11508.rs
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 7e295731c56bf..67a2d5f176ff0 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -17,7 +17,7 @@ use ignore::Walk;
 const ENTRY_LIMIT: u32 = 901;
 // FIXME: The following limits should be reduced eventually.
 
-const ISSUES_ENTRY_LIMIT: u32 = 1616;
+const ISSUES_ENTRY_LIMIT: u32 = 1577;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
     "rs",     // test source files
diff --git a/tests/ui/issues/issue-10396.rs b/tests/ui/array-slice-vec/array-pattern-matching.rs
similarity index 71%
rename from tests/ui/issues/issue-10396.rs
rename to tests/ui/array-slice-vec/array-pattern-matching.rs
index 082216d557cfc..5fc141bc46018 100644
--- a/tests/ui/issues/issue-10396.rs
+++ b/tests/ui/array-slice-vec/array-pattern-matching.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10396
+
 //@ check-pass
 #![allow(dead_code)]
 #[derive(Debug)]
diff --git a/tests/ui/issues/issue-11205.rs b/tests/ui/array-slice-vec/trait-object-arrays.rs
similarity index 95%
rename from tests/ui/issues/issue-11205.rs
rename to tests/ui/array-slice-vec/trait-object-arrays.rs
index 8530514f0edf7..45d69dce32389 100644
--- a/tests/ui/issues/issue-11205.rs
+++ b/tests/ui/array-slice-vec/trait-object-arrays.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/11205
+
 //@ run-pass
 
 #![allow(dead_code)]
diff --git a/tests/ui/issues/issue-11192.rs b/tests/ui/borrowck/closure-borrow-conflict.rs
similarity index 85%
rename from tests/ui/issues/issue-11192.rs
rename to tests/ui/borrowck/closure-borrow-conflict.rs
index 1a3d8c9fe5869..dff70d62d6f49 100644
--- a/tests/ui/issues/issue-11192.rs
+++ b/tests/ui/borrowck/closure-borrow-conflict.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/11192
+
 struct Foo {
     x: isize
 }
diff --git a/tests/ui/issues/issue-11192.stderr b/tests/ui/borrowck/closure-borrow-conflict.stderr
similarity index 93%
rename from tests/ui/issues/issue-11192.stderr
rename to tests/ui/borrowck/closure-borrow-conflict.stderr
index a8a18c49549d5..0e75117fed8a6 100644
--- a/tests/ui/issues/issue-11192.stderr
+++ b/tests/ui/borrowck/closure-borrow-conflict.stderr
@@ -1,5 +1,5 @@
 error[E0502]: cannot borrow `*ptr` as immutable because it is also borrowed as mutable
-  --> $DIR/issue-11192.rs:20:10
+  --> $DIR/closure-borrow-conflict.rs:22:10
    |
 LL |     let mut test = |foo: &Foo| {
    |                    ----------- mutable borrow occurs here
diff --git a/tests/ui/issues/issue-11085.rs b/tests/ui/cfg/conditional-compilation-struct.rs
similarity index 88%
rename from tests/ui/issues/issue-11085.rs
rename to tests/ui/cfg/conditional-compilation-struct.rs
index c3f13199b308e..cd6dded54d30b 100644
--- a/tests/ui/issues/issue-11085.rs
+++ b/tests/ui/cfg/conditional-compilation-struct.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/11085
+
 //@ run-pass
 
 #![allow(dead_code)]
diff --git a/tests/ui/issues/issue-10718.rs b/tests/ui/closures/fnonce-closure-call.rs
similarity index 57%
rename from tests/ui/issues/issue-10718.rs
rename to tests/ui/closures/fnonce-closure-call.rs
index 68ac0bbe49fbc..262a193609fc9 100644
--- a/tests/ui/issues/issue-10718.rs
+++ b/tests/ui/closures/fnonce-closure-call.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10718
+
 //@ run-pass
 
 fn f<F:FnOnce()>(p: F) {
diff --git a/tests/ui/issues/issue-10734.rs b/tests/ui/drop/conditional-drop-behavior.rs
similarity index 93%
rename from tests/ui/issues/issue-10734.rs
rename to tests/ui/drop/conditional-drop-behavior.rs
index 6d815aeca076e..25f492bf9e087 100644
--- a/tests/ui/issues/issue-10734.rs
+++ b/tests/ui/drop/conditional-drop-behavior.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10734
+
 //@ run-pass
 #![allow(non_upper_case_globals)]
 
diff --git a/tests/ui/issues/issue-10802.rs b/tests/ui/drop/trait-object-drop-behavior.rs
similarity index 93%
rename from tests/ui/issues/issue-10802.rs
rename to tests/ui/drop/trait-object-drop-behavior.rs
index eca701ce98c95..a8a955ad83340 100644
--- a/tests/ui/issues/issue-10802.rs
+++ b/tests/ui/drop/trait-object-drop-behavior.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10802
+
 //@ run-pass
 #![allow(dead_code)]
 
diff --git a/tests/ui/issues/issue-10764.rs b/tests/ui/extern/extern-rust-fn-type-error.rs
similarity index 59%
rename from tests/ui/issues/issue-10764.rs
rename to tests/ui/extern/extern-rust-fn-type-error.rs
index bb915f58d9d25..f172f6e6b7d91 100644
--- a/tests/ui/issues/issue-10764.rs
+++ b/tests/ui/extern/extern-rust-fn-type-error.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10764
+
 fn f(_: extern "Rust" fn()) {}
 extern "C" fn bar() {}
 
diff --git a/tests/ui/issues/issue-10764.stderr b/tests/ui/extern/extern-rust-fn-type-error.stderr
similarity index 84%
rename from tests/ui/issues/issue-10764.stderr
rename to tests/ui/extern/extern-rust-fn-type-error.stderr
index f3bd0100a72a3..733ff06ab1a48 100644
--- a/tests/ui/issues/issue-10764.stderr
+++ b/tests/ui/extern/extern-rust-fn-type-error.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-10764.rs:4:15
+  --> $DIR/extern-rust-fn-type-error.rs:6:15
    |
 LL | fn main() { f(bar) }
    |             - ^^^ expected "Rust" fn, found "C" fn
@@ -9,7 +9,7 @@ LL | fn main() { f(bar) }
    = note: expected fn pointer `fn()`
                  found fn item `extern "C" fn() {bar}`
 note: function defined here
-  --> $DIR/issue-10764.rs:1:4
+  --> $DIR/extern-rust-fn-type-error.rs:3:4
    |
 LL | fn f(_: extern "Rust" fn()) {}
    |    ^ ---------------------
diff --git a/tests/ui/issues/issue-10877.rs b/tests/ui/extern/foreign-fn-pattern-error.rs
similarity index 87%
rename from tests/ui/issues/issue-10877.rs
rename to tests/ui/extern/foreign-fn-pattern-error.rs
index 15a383175b975..9a047d4f34e70 100644
--- a/tests/ui/issues/issue-10877.rs
+++ b/tests/ui/extern/foreign-fn-pattern-error.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10877
+
 struct Foo {
     x: isize,
 }
diff --git a/tests/ui/issues/issue-10877.stderr b/tests/ui/extern/foreign-fn-pattern-error.stderr
similarity index 81%
rename from tests/ui/issues/issue-10877.stderr
rename to tests/ui/extern/foreign-fn-pattern-error.stderr
index bd3797cba5585..bc89421462a6f 100644
--- a/tests/ui/issues/issue-10877.stderr
+++ b/tests/ui/extern/foreign-fn-pattern-error.stderr
@@ -1,23 +1,23 @@
 error[E0130]: patterns aren't allowed in foreign function declarations
-  --> $DIR/issue-10877.rs:5:12
+  --> $DIR/foreign-fn-pattern-error.rs:7:12
    |
 LL |     fn foo(1: ());
    |            ^ pattern not allowed in foreign function
 
 error[E0130]: patterns aren't allowed in foreign function declarations
-  --> $DIR/issue-10877.rs:7:12
+  --> $DIR/foreign-fn-pattern-error.rs:9:12
    |
 LL |     fn bar((): isize);
    |            ^^ pattern not allowed in foreign function
 
 error[E0130]: patterns aren't allowed in foreign function declarations
-  --> $DIR/issue-10877.rs:9:12
+  --> $DIR/foreign-fn-pattern-error.rs:11:12
    |
 LL |     fn baz(Foo { x }: isize);
    |            ^^^^^^^^^ pattern not allowed in foreign function
 
 error[E0130]: patterns aren't allowed in foreign function declarations
-  --> $DIR/issue-10877.rs:11:12
+  --> $DIR/foreign-fn-pattern-error.rs:13:12
    |
 LL |     fn qux((x, y): ());
    |            ^^^^^^ pattern not allowed in foreign function
diff --git a/tests/ui/issues/issue-10767.rs b/tests/ui/fn/boxed-fn-pointer.rs
similarity index 56%
rename from tests/ui/issues/issue-10767.rs
rename to tests/ui/fn/boxed-fn-pointer.rs
index 2060d15b4c787..f31df5c4227ce 100644
--- a/tests/ui/issues/issue-10767.rs
+++ b/tests/ui/fn/boxed-fn-pointer.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10767
+
 //@ run-pass
 
 pub fn main() {
diff --git a/tests/ui/issues/issue-10436.rs b/tests/ui/generics/generic-type-inference.rs
similarity index 77%
rename from tests/ui/issues/issue-10436.rs
rename to tests/ui/generics/generic-type-inference.rs
index 672aa2464dc13..456a9b86c3474 100644
--- a/tests/ui/issues/issue-10436.rs
+++ b/tests/ui/generics/generic-type-inference.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10436
+
 //@ run-pass
 fn works<T>(x: T) -> Vec<T> { vec![x] }
 
diff --git a/tests/ui/issues/issue-10806.rs b/tests/ui/imports/empty-use-statements.rs
similarity index 87%
rename from tests/ui/issues/issue-10806.rs
rename to tests/ui/imports/empty-use-statements.rs
index 31315dc7c93a5..f7fbc084ebfe4 100644
--- a/tests/ui/issues/issue-10806.rs
+++ b/tests/ui/imports/empty-use-statements.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10806
+
 //@ edition: 2015
 //@ run-pass
 #![allow(unused_imports)]
diff --git a/tests/ui/issues/issue-10291.rs b/tests/ui/lifetimes/closure-lifetime-bounds-error.rs
similarity index 72%
rename from tests/ui/issues/issue-10291.rs
rename to tests/ui/lifetimes/closure-lifetime-bounds-error.rs
index 31b9e1240461e..42dc6c2cafad8 100644
--- a/tests/ui/issues/issue-10291.rs
+++ b/tests/ui/lifetimes/closure-lifetime-bounds-error.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10291
+
 fn test<'x>(x: &'x isize) {
     drop::<Box<dyn for<'z> FnMut(&'z isize) -> &'z isize>>(Box::new(|z| {
         x
diff --git a/tests/ui/issues/issue-10291.stderr b/tests/ui/lifetimes/closure-lifetime-bounds-error.stderr
similarity index 87%
rename from tests/ui/issues/issue-10291.stderr
rename to tests/ui/lifetimes/closure-lifetime-bounds-error.stderr
index 68ed9a0de5d59..b8aef836d719b 100644
--- a/tests/ui/issues/issue-10291.stderr
+++ b/tests/ui/lifetimes/closure-lifetime-bounds-error.stderr
@@ -1,5 +1,5 @@
 error: lifetime may not live long enough
-  --> $DIR/issue-10291.rs:3:9
+  --> $DIR/closure-lifetime-bounds-error.rs:5:9
    |
 LL | fn test<'x>(x: &'x isize) {
    |         -- lifetime `'x` defined here
diff --git a/tests/ui/issues/issue-11374.rs b/tests/ui/lifetimes/container-lifetime-error.rs
similarity index 89%
rename from tests/ui/issues/issue-11374.rs
rename to tests/ui/lifetimes/container-lifetime-error.rs
index 60ee256c65a90..59d13d04e466a 100644
--- a/tests/ui/issues/issue-11374.rs
+++ b/tests/ui/lifetimes/container-lifetime-error.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/11374
+
 use std::io::{self, Read};
 use std::vec;
 
diff --git a/tests/ui/issues/issue-11374.stderr b/tests/ui/lifetimes/container-lifetime-error.stderr
similarity index 88%
rename from tests/ui/issues/issue-11374.stderr
rename to tests/ui/lifetimes/container-lifetime-error.stderr
index 3ae5cfc79f874..6bae4b0dfea1f 100644
--- a/tests/ui/issues/issue-11374.stderr
+++ b/tests/ui/lifetimes/container-lifetime-error.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-11374.rs:27:15
+  --> $DIR/container-lifetime-error.rs:29:15
    |
 LL |     c.read_to(v);
    |       ------- ^ expected `&mut [u8]`, found `Vec<_>`
@@ -9,7 +9,7 @@ LL |     c.read_to(v);
    = note: expected mutable reference `&mut [u8]`
                          found struct `Vec<_>`
 note: method defined here
-  --> $DIR/issue-11374.rs:13:12
+  --> $DIR/container-lifetime-error.rs:15:12
    |
 LL |     pub fn read_to(&mut self, vec: &mut [u8]) {
    |            ^^^^^^^            --------------
@@ -19,7 +19,7 @@ LL |     c.read_to(&mut v);
    |               ++++
 
 error[E0515]: cannot return value referencing local variable `r`
-  --> $DIR/issue-11374.rs:20:5
+  --> $DIR/container-lifetime-error.rs:22:5
    |
 LL |     Container::wrap(&mut r as &mut dyn io::Read)
    |     ^^^^^^^^^^^^^^^^------^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/issues/issue-10228.rs b/tests/ui/lifetimes/enum-lifetime-container.rs
similarity index 80%
rename from tests/ui/issues/issue-10228.rs
rename to tests/ui/lifetimes/enum-lifetime-container.rs
index a59ccf926f9c2..ebbefb619c616 100644
--- a/tests/ui/issues/issue-10228.rs
+++ b/tests/ui/lifetimes/enum-lifetime-container.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10228
+
 //@ run-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/tests/ui/issues/issue-10412.rs b/tests/ui/lifetimes/keyword-self-lifetime-error.rs
similarity index 91%
rename from tests/ui/issues/issue-10412.rs
rename to tests/ui/lifetimes/keyword-self-lifetime-error.rs
index 68ce0c2ea3cb7..a5b303df2fd44 100644
--- a/tests/ui/issues/issue-10412.rs
+++ b/tests/ui/lifetimes/keyword-self-lifetime-error.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10412
+
 trait Serializable<'self, T> {
     //~^ ERROR lifetimes cannot use keyword names
     fn serialize(val: &'self T) -> Vec<u8>; //~ ERROR lifetimes cannot use keyword names
diff --git a/tests/ui/issues/issue-10412.stderr b/tests/ui/lifetimes/keyword-self-lifetime-error.stderr
similarity index 78%
rename from tests/ui/issues/issue-10412.stderr
rename to tests/ui/lifetimes/keyword-self-lifetime-error.stderr
index c74ba1306cc48..b8c13d690b966 100644
--- a/tests/ui/issues/issue-10412.stderr
+++ b/tests/ui/lifetimes/keyword-self-lifetime-error.stderr
@@ -1,47 +1,47 @@
 error: lifetimes cannot use keyword names
-  --> $DIR/issue-10412.rs:1:20
+  --> $DIR/keyword-self-lifetime-error.rs:3:20
    |
 LL | trait Serializable<'self, T> {
    |                    ^^^^^
 
 error: lifetimes cannot use keyword names
-  --> $DIR/issue-10412.rs:3:24
+  --> $DIR/keyword-self-lifetime-error.rs:5:24
    |
 LL |     fn serialize(val: &'self T) -> Vec<u8>;
    |                        ^^^^^
 
 error: lifetimes cannot use keyword names
-  --> $DIR/issue-10412.rs:4:37
+  --> $DIR/keyword-self-lifetime-error.rs:6:37
    |
 LL |     fn deserialize(repr: &[u8]) -> &'self T;
    |                                     ^^^^^
 
 error: lifetimes cannot use keyword names
-  --> $DIR/issue-10412.rs:7:6
+  --> $DIR/keyword-self-lifetime-error.rs:9:6
    |
 LL | impl<'self> Serializable<str> for &'self str {
    |      ^^^^^
 
 error: lifetimes cannot use keyword names
-  --> $DIR/issue-10412.rs:7:36
+  --> $DIR/keyword-self-lifetime-error.rs:9:36
    |
 LL | impl<'self> Serializable<str> for &'self str {
    |                                    ^^^^^
 
 error: lifetimes cannot use keyword names
-  --> $DIR/issue-10412.rs:11:24
+  --> $DIR/keyword-self-lifetime-error.rs:13:24
    |
 LL |     fn serialize(val: &'self str) -> Vec<u8> {
    |                        ^^^^^
 
 error: lifetimes cannot use keyword names
-  --> $DIR/issue-10412.rs:15:37
+  --> $DIR/keyword-self-lifetime-error.rs:17:37
    |
 LL |     fn deserialize(repr: &[u8]) -> &'self str {
    |                                     ^^^^^
 
 error[E0726]: implicit elided lifetime not allowed here
-  --> $DIR/issue-10412.rs:7:13
+  --> $DIR/keyword-self-lifetime-error.rs:9:13
    |
 LL | impl<'self> Serializable<str> for &'self str {
    |             ^^^^^^^^^^^^^^^^^ expected lifetime parameter
diff --git a/tests/ui/issues/issue-10902.rs b/tests/ui/lifetimes/trait-lifetime-bounds.rs
similarity index 87%
rename from tests/ui/issues/issue-10902.rs
rename to tests/ui/lifetimes/trait-lifetime-bounds.rs
index 7cdf8808aa028..97c0d0bf554e4 100644
--- a/tests/ui/issues/issue-10902.rs
+++ b/tests/ui/lifetimes/trait-lifetime-bounds.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10902
+
 //@ check-pass
 #![allow(dead_code)]
 
diff --git a/tests/ui/issues/issue-10853.rs b/tests/ui/lint/inner-doc-attributes.rs
similarity index 68%
rename from tests/ui/issues/issue-10853.rs
rename to tests/ui/lint/inner-doc-attributes.rs
index 4c22393d9c0a3..ec13ae997878b 100644
--- a/tests/ui/issues/issue-10853.rs
+++ b/tests/ui/lint/inner-doc-attributes.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10853
+
 //@ check-pass
 
 #![deny(missing_docs)]
diff --git a/tests/ui/issues/issue-10638.rs b/tests/ui/parser/comment-parsing.rs
similarity index 74%
rename from tests/ui/issues/issue-10638.rs
rename to tests/ui/parser/comment-parsing.rs
index c6c6939bda539..00f6b0e09a892 100644
--- a/tests/ui/issues/issue-10638.rs
+++ b/tests/ui/parser/comment-parsing.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10638
+
 //@ run-pass
 
 pub fn main() {
diff --git a/tests/ui/issues/issue-10683.rs b/tests/ui/pattern/ascii-lowercase-match.rs
similarity index 68%
rename from tests/ui/issues/issue-10683.rs
rename to tests/ui/pattern/ascii-lowercase-match.rs
index 5657ec1864b2e..a4dfa56117c2b 100644
--- a/tests/ui/issues/issue-10683.rs
+++ b/tests/ui/pattern/ascii-lowercase-match.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10683
+
 //@ run-pass
 
 static NAME: &'static str = "hello world";
diff --git a/tests/ui/issues/issue-10545.rs b/tests/ui/privacy/private-struct-access-error.rs
similarity index 59%
rename from tests/ui/issues/issue-10545.rs
rename to tests/ui/privacy/private-struct-access-error.rs
index acd0714961906..8a8c8240c2d08 100644
--- a/tests/ui/issues/issue-10545.rs
+++ b/tests/ui/privacy/private-struct-access-error.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10545
+
 mod a {
     struct S;
     impl S { }
diff --git a/tests/ui/issues/issue-10545.stderr b/tests/ui/privacy/private-struct-access-error.stderr
similarity index 75%
rename from tests/ui/issues/issue-10545.stderr
rename to tests/ui/privacy/private-struct-access-error.stderr
index 9aa0421717480..1158158c4d1a6 100644
--- a/tests/ui/issues/issue-10545.stderr
+++ b/tests/ui/privacy/private-struct-access-error.stderr
@@ -1,11 +1,11 @@
 error[E0603]: struct `S` is private
-  --> $DIR/issue-10545.rs:6:14
+  --> $DIR/private-struct-access-error.rs:8:14
    |
 LL | fn foo(_: a::S) {
    |              ^ private struct
    |
 note: the struct `S` is defined here
-  --> $DIR/issue-10545.rs:2:5
+  --> $DIR/private-struct-access-error.rs:4:5
    |
 LL |     struct S;
    |     ^^^^^^^^^
diff --git a/tests/ui/issues/issue-11267.rs b/tests/ui/structs/mutable-unit-struct-borrow.rs
similarity index 82%
rename from tests/ui/issues/issue-11267.rs
rename to tests/ui/structs/mutable-unit-struct-borrow.rs
index 036ad1d54edcd..d96c4a4e79bc0 100644
--- a/tests/ui/issues/issue-11267.rs
+++ b/tests/ui/structs/mutable-unit-struct-borrow.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/11267
+
 //@ run-pass
 // Tests that unary structs can be mutably borrowed.
 
diff --git a/tests/ui/issues/issue-10456.rs b/tests/ui/traits/blanket-impl-trait-object.rs
similarity index 81%
rename from tests/ui/issues/issue-10456.rs
rename to tests/ui/traits/blanket-impl-trait-object.rs
index 51c740fd72937..f84214317746b 100644
--- a/tests/ui/issues/issue-10456.rs
+++ b/tests/ui/traits/blanket-impl-trait-object.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10456
+
 //@ check-pass
 
 pub struct Foo;
diff --git a/tests/ui/issues/issue-10465.rs b/tests/ui/traits/missing-trait-method-error.rs
similarity index 80%
rename from tests/ui/issues/issue-10465.rs
rename to tests/ui/traits/missing-trait-method-error.rs
index d899c3ffa9129..d5a500900ff03 100644
--- a/tests/ui/issues/issue-10465.rs
+++ b/tests/ui/traits/missing-trait-method-error.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/10465
+
 pub mod a {
     pub trait A {
         fn foo(&self);
diff --git a/tests/ui/issues/issue-10465.stderr b/tests/ui/traits/missing-trait-method-error.stderr
similarity index 91%
rename from tests/ui/issues/issue-10465.stderr
rename to tests/ui/traits/missing-trait-method-error.stderr
index 0f46ebe505aa9..6527bf1537d4d 100644
--- a/tests/ui/issues/issue-10465.stderr
+++ b/tests/ui/traits/missing-trait-method-error.stderr
@@ -1,5 +1,5 @@
 error[E0599]: no method named `foo` found for reference `&B` in the current scope
-  --> $DIR/issue-10465.rs:17:15
+  --> $DIR/missing-trait-method-error.rs:19:15
    |
 LL |             b.foo();
    |               ^^^ method not found in `&B`
diff --git a/tests/ui/issues/issue-106755.rs b/tests/ui/traits/negative-positive-impl-conflict.rs
similarity index 89%
rename from tests/ui/issues/issue-106755.rs
rename to tests/ui/traits/negative-positive-impl-conflict.rs
index d7e7122ebda16..f2965778431c9 100644
--- a/tests/ui/issues/issue-106755.rs
+++ b/tests/ui/traits/negative-positive-impl-conflict.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/106755
+
 //@ compile-flags:-Ztranslate-lang=en_US
 
 #![feature(negative_impls)]
diff --git a/tests/ui/issues/issue-106755.stderr b/tests/ui/traits/negative-positive-impl-conflict.stderr
similarity index 84%
rename from tests/ui/issues/issue-106755.stderr
rename to tests/ui/traits/negative-positive-impl-conflict.stderr
index da6b8c5c56325..ad4ec7ea24917 100644
--- a/tests/ui/issues/issue-106755.stderr
+++ b/tests/ui/traits/negative-positive-impl-conflict.stderr
@@ -1,5 +1,5 @@
 error[E0751]: found both positive and negative implementation of trait `Send` for type `TestType<_>`:
-  --> $DIR/issue-106755.rs:13:1
+  --> $DIR/negative-positive-impl-conflict.rs:15:1
    |
 LL | unsafe impl<T: MyTrait + 'static> Send for TestType<T> {}
    | ------------------------------------------------------ positive implementation here
@@ -8,7 +8,7 @@ LL | impl<T: MyTrait> !Send for TestType<T> {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ negative implementation here
 
 error[E0119]: conflicting implementations of trait `Send` for type `TestType<_>`
-  --> $DIR/issue-106755.rs:17:1
+  --> $DIR/negative-positive-impl-conflict.rs:19:1
    |
 LL | unsafe impl<T: MyTrait + 'static> Send for TestType<T> {}
    | ------------------------------------------------------ first implementation here
@@ -17,26 +17,26 @@ LL | unsafe impl<T: 'static> Send for TestType<T> {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `TestType<_>`
 
 error[E0367]: `!Send` impl requires `T: MyTrait` but the struct it is implemented for does not
-  --> $DIR/issue-106755.rs:13:9
+  --> $DIR/negative-positive-impl-conflict.rs:15:9
    |
 LL | impl<T: MyTrait> !Send for TestType<T> {}
    |         ^^^^^^^
    |
 note: the implementor must specify the same requirement
-  --> $DIR/issue-106755.rs:9:1
+  --> $DIR/negative-positive-impl-conflict.rs:11:1
    |
 LL | struct TestType<T>(::std::marker::PhantomData<T>);
    | ^^^^^^^^^^^^^^^^^^
 
 error[E0366]: `!Send` impls cannot be specialized
-  --> $DIR/issue-106755.rs:19:1
+  --> $DIR/negative-positive-impl-conflict.rs:21:1
    |
 LL | impl !Send for TestType<i32> {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `i32` is not a generic parameter
 note: use the same sequence of generic lifetime, type and const parameters as the struct definition
-  --> $DIR/issue-106755.rs:9:1
+  --> $DIR/negative-positive-impl-conflict.rs:11:1
    |
 LL | struct TestType<T>(::std::marker::PhantomData<T>);
    | ^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/issues/issue-102964.rs b/tests/ui/type-alias/mismatched-rc-foo-types.rs
similarity index 75%
rename from tests/ui/issues/issue-102964.rs
rename to tests/ui/type-alias/mismatched-rc-foo-types.rs
index 43ff23600766e..6b6fa3ed5e33d 100644
--- a/tests/ui/issues/issue-102964.rs
+++ b/tests/ui/type-alias/mismatched-rc-foo-types.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/102964
+
 use std::rc::Rc;
 type Foo<'a, T> = &'a dyn Fn(&T);
 type RcFoo<'a, T> = Rc<Foo<'a, T>>;
diff --git a/tests/ui/issues/issue-102964.stderr b/tests/ui/type-alias/mismatched-rc-foo-types.stderr
similarity index 93%
rename from tests/ui/issues/issue-102964.stderr
rename to tests/ui/type-alias/mismatched-rc-foo-types.stderr
index 0e2761f3f57b1..5534bd5a2df08 100644
--- a/tests/ui/issues/issue-102964.stderr
+++ b/tests/ui/type-alias/mismatched-rc-foo-types.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-102964.rs:5:41
+  --> $DIR/mismatched-rc-foo-types.rs:7:41
    |
 LL | fn bar_function<T>(function: Foo<T>) -> RcFoo<T> {
    |    ------------                         ^^^^^^^^ expected `Rc<&dyn Fn(&T)>`, found `()`
diff --git a/tests/ui/issues/issue-11047.rs b/tests/ui/type-alias/static-method-type-alias.rs
similarity index 87%
rename from tests/ui/issues/issue-11047.rs
rename to tests/ui/type-alias/static-method-type-alias.rs
index 6e1b2856afcde..efb336fb4f76d 100644
--- a/tests/ui/issues/issue-11047.rs
+++ b/tests/ui/type-alias/static-method-type-alias.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/11047
+
 //@ run-pass
 // Test that static methods can be invoked on `type` aliases
 
diff --git a/tests/ui/issues/issue-11004.rs b/tests/ui/unsafe/raw-pointer-field-access-error.rs
similarity index 88%
rename from tests/ui/issues/issue-11004.rs
rename to tests/ui/unsafe/raw-pointer-field-access-error.rs
index 0c34554c12d11..04b45b2d3c68c 100644
--- a/tests/ui/issues/issue-11004.rs
+++ b/tests/ui/unsafe/raw-pointer-field-access-error.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/11004
+
 use std::mem;
 
 struct A { x: i32, y: f64 }
diff --git a/tests/ui/issues/issue-11004.stderr b/tests/ui/unsafe/raw-pointer-field-access-error.stderr
similarity index 85%
rename from tests/ui/issues/issue-11004.stderr
rename to tests/ui/unsafe/raw-pointer-field-access-error.stderr
index 6d157c9113024..e9a205a5fa64e 100644
--- a/tests/ui/issues/issue-11004.stderr
+++ b/tests/ui/unsafe/raw-pointer-field-access-error.stderr
@@ -1,5 +1,5 @@
 error[E0609]: no field `x` on type `*mut A`
-  --> $DIR/issue-11004.rs:7:21
+  --> $DIR/raw-pointer-field-access-error.rs:9:21
    |
 LL |     let x : i32 = n.x;
    |                     ^ unknown field
@@ -10,7 +10,7 @@ LL |     let x : i32 = (*n).x;
    |                   ++ +
 
 error[E0609]: no field `y` on type `*mut A`
-  --> $DIR/issue-11004.rs:8:21
+  --> $DIR/raw-pointer-field-access-error.rs:10:21
    |
 LL |     let y : f64 = n.y;
    |                     ^ unknown field