diff --git a/tests/ui/issues/issue-17746.rs b/tests/ui/autoref-autoderef/reborrow-mut-self-to-ref-self-method.rs
similarity index 77%
rename from tests/ui/issues/issue-17746.rs
rename to tests/ui/autoref-autoderef/reborrow-mut-self-to-ref-self-method.rs
index 231fcb41a1130..139208c13dc97 100644
--- a/tests/ui/issues/issue-17746.rs
+++ b/tests/ui/autoref-autoderef/reborrow-mut-self-to-ref-self-method.rs
@@ -1,6 +1,7 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17746>.
+
 //@ check-pass
 #![allow(dead_code)]
-// Regression test for #17746
 
 fn main() {}
 
diff --git a/tests/ui/issues/issue-17322.rs b/tests/ui/coercion/box-dyn-to-ref-dyn.rs
similarity index 73%
rename from tests/ui/issues/issue-17322.rs
rename to tests/ui/coercion/box-dyn-to-ref-dyn.rs
index 014e6b718f149..e2cdbb6d17d27 100644
--- a/tests/ui/issues/issue-17322.rs
+++ b/tests/ui/coercion/box-dyn-to-ref-dyn.rs
@@ -1,3 +1,5 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17322>.
+
 //@ run-pass
 
 use std::io::{self, Write};
diff --git a/tests/ui/issues/auxiliary/issue-16643.rs b/tests/ui/cross-crate/auxiliary/for-loop-in-match-on-self.rs
similarity index 81%
rename from tests/ui/issues/auxiliary/issue-16643.rs
rename to tests/ui/cross-crate/auxiliary/for-loop-in-match-on-self.rs
index 7808e0119f69f..307f23c10e284 100644
--- a/tests/ui/issues/auxiliary/issue-16643.rs
+++ b/tests/ui/cross-crate/auxiliary/for-loop-in-match-on-self.rs
@@ -1,3 +1,5 @@
+//! Auxiliary crate for <https://github.com/rust-lang/rust/issues/16643>.
+
 #![crate_type = "lib"]
 
 pub struct TreeBuilder<H> { pub h: H }
diff --git a/tests/ui/cross-crate/for-loop-in-match-on-self.rs b/tests/ui/cross-crate/for-loop-in-match-on-self.rs
new file mode 100644
index 0000000000000..e2d960e29757e
--- /dev/null
+++ b/tests/ui/cross-crate/for-loop-in-match-on-self.rs
@@ -0,0 +1,12 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/16643>.
+//! Tests that method which matches on self with for loop doesn't ICE cross-crate.
+
+//@ run-pass
+//@ aux-build:for-loop-in-match-on-self.rs
+
+
+extern crate for_loop_in_match_on_self as i;
+
+pub fn main() {
+    i::TreeBuilder { h: 3 }.process_token();
+}
diff --git a/tests/ui/issues/issue-16530.rs b/tests/ui/derives/derive-hash-on-unit-struct.rs
similarity index 66%
rename from tests/ui/issues/issue-16530.rs
rename to tests/ui/derives/derive-hash-on-unit-struct.rs
index a24c6f09d39ce..8d261a6d08b5d 100644
--- a/tests/ui/issues/issue-16530.rs
+++ b/tests/ui/derives/derive-hash-on-unit-struct.rs
@@ -1,3 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/16530>.
+//! Tests that unit struct produce same constant hash instead of ICE'ing.
+
 //@ run-pass
 #![allow(deprecated)]
 
diff --git a/tests/ui/issues/issue-17771.rs b/tests/ui/dst/reborrow-mut-dyn-trait-field.rs
similarity index 64%
rename from tests/ui/issues/issue-17771.rs
rename to tests/ui/dst/reborrow-mut-dyn-trait-field.rs
index 2e27cfceb8c35..994c81077440e 100644
--- a/tests/ui/issues/issue-17771.rs
+++ b/tests/ui/dst/reborrow-mut-dyn-trait-field.rs
@@ -1,3 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17771>.
+//! Tests that borrowing mut dyn trait field in a method doesn't cause ICE.
+
 //@ run-pass
 #![allow(dead_code)]
 
diff --git a/tests/ui/issues/issue-16643.rs b/tests/ui/issues/issue-16643.rs
deleted file mode 100644
index 6cef11ffa8761..0000000000000
--- a/tests/ui/issues/issue-16643.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-//@ run-pass
-//@ aux-build:issue-16643.rs
-
-
-extern crate issue_16643 as i;
-
-pub fn main() {
-    i::TreeBuilder { h: 3 }.process_token();
-}
diff --git a/tests/ui/issues/issue-16278.rs b/tests/ui/lexer/crlf-in-byte-string-literal.rs
similarity index 71%
rename from tests/ui/issues/issue-16278.rs
rename to tests/ui/lexer/crlf-in-byte-string-literal.rs
index 0d3b4a90ce727..1290133d7014e 100644
--- a/tests/ui/issues/issue-16278.rs
+++ b/tests/ui/lexer/crlf-in-byte-string-literal.rs
@@ -1,3 +1,5 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/16278>.
+
 //@ run-pass
 // ignore-tidy-cr
 
diff --git a/tests/ui/issues/issue-17033.rs b/tests/ui/mismatched_types/deref-fn-ptr-arg-type-mismatch.rs
similarity index 73%
rename from tests/ui/issues/issue-17033.rs
rename to tests/ui/mismatched_types/deref-fn-ptr-arg-type-mismatch.rs
index b8eec3b6b2505..b7d20e711a8d5 100644
--- a/tests/ui/issues/issue-17033.rs
+++ b/tests/ui/mismatched_types/deref-fn-ptr-arg-type-mismatch.rs
@@ -1,3 +1,5 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17033>.
+
 fn f<'r>(p: &'r mut fn(p: &mut ())) {
     (*p)(()) //~  ERROR mismatched types
              //~| NOTE expected `&mut ()`, found `()`
diff --git a/tests/ui/issues/issue-17033.stderr b/tests/ui/mismatched_types/deref-fn-ptr-arg-type-mismatch.stderr
similarity index 87%
rename from tests/ui/issues/issue-17033.stderr
rename to tests/ui/mismatched_types/deref-fn-ptr-arg-type-mismatch.stderr
index 0b42274223a0d..e7748e27ad465 100644
--- a/tests/ui/issues/issue-17033.stderr
+++ b/tests/ui/mismatched_types/deref-fn-ptr-arg-type-mismatch.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-17033.rs:2:10
+  --> $DIR/deref-fn-ptr-arg-type-mismatch.rs:4:10
    |
 LL |     (*p)(())
    |     ---- ^^ expected `&mut ()`, found `()`
diff --git a/tests/ui/issues/issue-16596.rs b/tests/ui/regions/relate-bound-region-ref-type-param.rs
similarity index 80%
rename from tests/ui/issues/issue-16596.rs
rename to tests/ui/regions/relate-bound-region-ref-type-param.rs
index 51441e8e782ac..f6a637fc864d8 100644
--- a/tests/ui/issues/issue-16596.rs
+++ b/tests/ui/regions/relate-bound-region-ref-type-param.rs
@@ -1,3 +1,5 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/16596>.
+
 //@ check-pass
 #![allow(dead_code)]
 
diff --git a/tests/ui/issues/issue-16562.rs b/tests/ui/typeck/unconstrained-impl-extra-parameter.rs
similarity index 79%
rename from tests/ui/issues/issue-16562.rs
rename to tests/ui/typeck/unconstrained-impl-extra-parameter.rs
index e16a35158c35a..abc62d4f21878 100644
--- a/tests/ui/issues/issue-16562.rs
+++ b/tests/ui/typeck/unconstrained-impl-extra-parameter.rs
@@ -1,3 +1,5 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/16562>.
+
 trait MatrixShape {}
 
 struct Col<D, C> {
diff --git a/tests/ui/issues/issue-16562.stderr b/tests/ui/typeck/unconstrained-impl-extra-parameter.stderr
similarity index 87%
rename from tests/ui/issues/issue-16562.stderr
rename to tests/ui/typeck/unconstrained-impl-extra-parameter.stderr
index ac957fdb069d0..bafdae904f4b5 100644
--- a/tests/ui/issues/issue-16562.stderr
+++ b/tests/ui/typeck/unconstrained-impl-extra-parameter.stderr
@@ -1,5 +1,5 @@
 error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates
-  --> $DIR/issue-16562.rs:10:6
+  --> $DIR/unconstrained-impl-extra-parameter.rs:12:6
    |
 LL | impl<T, M: MatrixShape> Collection for Col<M, usize> {
    |      ^--
diff --git a/tests/ui/issues/issue-16739.rs b/tests/ui/unboxed-closures/rust-call-shim-through-trait-box.rs
similarity index 86%
rename from tests/ui/issues/issue-16739.rs
rename to tests/ui/unboxed-closures/rust-call-shim-through-trait-box.rs
index 39cc1b78fcee6..0c2a9cede99d3 100644
--- a/tests/ui/issues/issue-16739.rs
+++ b/tests/ui/unboxed-closures/rust-call-shim-through-trait-box.rs
@@ -1,9 +1,10 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/16739>.
+//! Test that unboxing shim for calling rust-call ABI methods through a
+//! trait box works and does not cause an ICE.
+
 //@ run-pass
 #![feature(unboxed_closures, fn_traits)]
 
-// Test that unboxing shim for calling rust-call ABI methods through a
-// trait box works and does not cause an ICE.
-
 struct Foo { foo: u32 }
 
 impl FnMut<()> for Foo {