diff --git a/tests/ui/consts/arithmetic-expr-in-array-len.rs b/tests/ui/consts/arithmetic-expr-in-array-len.rs
new file mode 100644
index 0000000000000..758833b485bd3
--- /dev/null
+++ b/tests/ui/consts/arithmetic-expr-in-array-len.rs
@@ -0,0 +1,7 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/4387
+
+//@ run-pass
+
+pub fn main() {
+    let _foo = [0; 2*4];
+}
diff --git a/tests/ui/issues/issue-50518.rs b/tests/ui/consts/assoc-const-with-self-in-trait-object.rs
similarity index 90%
rename from tests/ui/issues/issue-50518.rs
rename to tests/ui/consts/assoc-const-with-self-in-trait-object.rs
index 9ac0a297fef3d..653dc05ae0303 100644
--- a/tests/ui/issues/issue-50518.rs
+++ b/tests/ui/consts/assoc-const-with-self-in-trait-object.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/50518
+
 //@ check-pass
 use std::marker::PhantomData;
 
diff --git a/tests/ui/issues/issue-39548.rs b/tests/ui/consts/bool-comparison-in-const-array-len.rs
similarity index 57%
rename from tests/ui/issues/issue-39548.rs
rename to tests/ui/consts/bool-comparison-in-const-array-len.rs
index e46114154f9d5..028ec16a21c66 100644
--- a/tests/ui/issues/issue-39548.rs
+++ b/tests/ui/consts/bool-comparison-in-const-array-len.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/39548
+
 //@ run-pass
 type Array = [(); ((1 < 2) == false) as usize];
 
diff --git a/tests/ui/issues/issue-33287.rs b/tests/ui/consts/const-array-oob-in-range-expr.rs
similarity index 70%
rename from tests/ui/issues/issue-33287.rs
rename to tests/ui/consts/const-array-oob-in-range-expr.rs
index 4d0f757b7a59f..da95bf5fcc57e 100644
--- a/tests/ui/issues/issue-33287.rs
+++ b/tests/ui/consts/const-array-oob-in-range-expr.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/33287
+
 //@ build-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/tests/ui/issues/issue-53275.rs b/tests/ui/consts/empty-array-index-in-struct-init.rs
similarity index 61%
rename from tests/ui/issues/issue-53275.rs
rename to tests/ui/consts/empty-array-index-in-struct-init.rs
index 13c35c8fdaad5..c0b77abf03517 100644
--- a/tests/ui/issues/issue-53275.rs
+++ b/tests/ui/consts/empty-array-index-in-struct-init.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/53275
+
 //@ build-pass
 
 #![crate_type = "lib"]
diff --git a/tests/ui/issues/issue-44239.fixed b/tests/ui/consts/local-var-in-associated-const.fixed
similarity index 75%
rename from tests/ui/issues/issue-44239.fixed
rename to tests/ui/consts/local-var-in-associated-const.fixed
index 5466726fc9d4b..94d8b6ed44877 100644
--- a/tests/ui/issues/issue-44239.fixed
+++ b/tests/ui/consts/local-var-in-associated-const.fixed
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/44239
+
 //@ run-rustfix
 #![allow(dead_code, non_upper_case_globals)]
 fn main() {
diff --git a/tests/ui/issues/issue-44239.rs b/tests/ui/consts/local-var-in-associated-const.rs
similarity index 75%
rename from tests/ui/issues/issue-44239.rs
rename to tests/ui/consts/local-var-in-associated-const.rs
index b07c3f6dbeffc..18a06911b3252 100644
--- a/tests/ui/issues/issue-44239.rs
+++ b/tests/ui/consts/local-var-in-associated-const.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/44239
+
 //@ run-rustfix
 #![allow(dead_code, non_upper_case_globals)]
 fn main() {
diff --git a/tests/ui/issues/issue-44239.stderr b/tests/ui/consts/local-var-in-associated-const.stderr
similarity index 88%
rename from tests/ui/issues/issue-44239.stderr
rename to tests/ui/consts/local-var-in-associated-const.stderr
index 8048e32f149a9..c85cc6b93ff57 100644
--- a/tests/ui/issues/issue-44239.stderr
+++ b/tests/ui/consts/local-var-in-associated-const.stderr
@@ -1,5 +1,5 @@
 error[E0435]: attempt to use a non-constant value in a constant
-  --> $DIR/issue-44239.rs:8:26
+  --> $DIR/local-var-in-associated-const.rs:10:26
    |
 LL |         const N: usize = n;
    |                          ^ non-constant value
diff --git a/tests/ui/issues/issue-25757.rs b/tests/ui/consts/method-reference-in-const-dyn-fn.rs
similarity index 77%
rename from tests/ui/issues/issue-25757.rs
rename to tests/ui/consts/method-reference-in-const-dyn-fn.rs
index dc9c2ffaa6fad..edb6efc770096 100644
--- a/tests/ui/issues/issue-25757.rs
+++ b/tests/ui/consts/method-reference-in-const-dyn-fn.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/25757
+
 //@ run-pass
 struct Foo {
     a: u32
diff --git a/tests/ui/issues/issue-27433.fixed b/tests/ui/consts/non-constant-value-in-nested-const.fixed
similarity index 72%
rename from tests/ui/issues/issue-27433.fixed
rename to tests/ui/consts/non-constant-value-in-nested-const.fixed
index f847b698976a0..9942537b48934 100644
--- a/tests/ui/issues/issue-27433.fixed
+++ b/tests/ui/consts/non-constant-value-in-nested-const.fixed
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/27433
+
 //@ run-rustfix
 fn main() {
     let foo = 42u32;
diff --git a/tests/ui/issues/issue-27433.rs b/tests/ui/consts/non-constant-value-in-nested-const.rs
similarity index 72%
rename from tests/ui/issues/issue-27433.rs
rename to tests/ui/consts/non-constant-value-in-nested-const.rs
index 9bbc5bcbb459d..fbaba2de615d6 100644
--- a/tests/ui/issues/issue-27433.rs
+++ b/tests/ui/consts/non-constant-value-in-nested-const.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/27433
+
 //@ run-rustfix
 fn main() {
     let foo = 42u32;
diff --git a/tests/ui/issues/issue-27433.stderr b/tests/ui/consts/non-constant-value-in-nested-const.stderr
similarity index 87%
rename from tests/ui/issues/issue-27433.stderr
rename to tests/ui/consts/non-constant-value-in-nested-const.stderr
index d8fd3d84ecbbc..c50bb8651716a 100644
--- a/tests/ui/issues/issue-27433.stderr
+++ b/tests/ui/consts/non-constant-value-in-nested-const.stderr
@@ -1,5 +1,5 @@
 error[E0435]: attempt to use a non-constant value in a constant
-  --> $DIR/issue-27433.rs:5:23
+  --> $DIR/non-constant-value-in-nested-const.rs:7:23
    |
 LL |     const FOO : u32 = foo;
    |                       ^^^ non-constant value
diff --git a/tests/ui/issues/issue-17252.rs b/tests/ui/consts/recursive-const-stack-overflow.rs
similarity index 81%
rename from tests/ui/issues/issue-17252.rs
rename to tests/ui/consts/recursive-const-stack-overflow.rs
index dd002bfd187a0..aee95a685b20a 100644
--- a/tests/ui/issues/issue-17252.rs
+++ b/tests/ui/consts/recursive-const-stack-overflow.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/17252
+
 const FOO: usize = FOO; //~ ERROR E0391
 //@ ignore-parallel-frontend query cycle
 fn main() {
diff --git a/tests/ui/issues/issue-17252.stderr b/tests/ui/consts/recursive-const-stack-overflow.stderr
similarity index 82%
rename from tests/ui/issues/issue-17252.stderr
rename to tests/ui/consts/recursive-const-stack-overflow.stderr
index b0d9d94e07ddf..054102f0978ab 100644
--- a/tests/ui/issues/issue-17252.stderr
+++ b/tests/ui/consts/recursive-const-stack-overflow.stderr
@@ -1,36 +1,36 @@
 error[E0391]: cycle detected when checking if `FOO` is a trivial const
-  --> $DIR/issue-17252.rs:1:1
+  --> $DIR/recursive-const-stack-overflow.rs:3:1
    |
 LL | const FOO: usize = FOO;
    | ^^^^^^^^^^^^^^^^
    |
 note: ...which requires building MIR for `FOO`...
-  --> $DIR/issue-17252.rs:1:1
+  --> $DIR/recursive-const-stack-overflow.rs:3:1
    |
 LL | const FOO: usize = FOO;
    | ^^^^^^^^^^^^^^^^
    = note: ...which again requires checking if `FOO` is a trivial const, completing the cycle
 note: cycle used when simplifying constant for the type system `FOO`
-  --> $DIR/issue-17252.rs:1:1
+  --> $DIR/recursive-const-stack-overflow.rs:3:1
    |
 LL | const FOO: usize = FOO;
    | ^^^^^^^^^^^^^^^^
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
 error[E0391]: cycle detected when checking if `main::BAR` is a trivial const
-  --> $DIR/issue-17252.rs:6:9
+  --> $DIR/recursive-const-stack-overflow.rs:8:9
    |
 LL |         const BAR: usize = BAR;
    |         ^^^^^^^^^^^^^^^^
    |
 note: ...which requires building MIR for `main::BAR`...
-  --> $DIR/issue-17252.rs:6:9
+  --> $DIR/recursive-const-stack-overflow.rs:8:9
    |
 LL |         const BAR: usize = BAR;
    |         ^^^^^^^^^^^^^^^^
    = note: ...which again requires checking if `main::BAR` is a trivial const, completing the cycle
 note: cycle used when simplifying constant for the type system `main::BAR`
-  --> $DIR/issue-17252.rs:6:9
+  --> $DIR/recursive-const-stack-overflow.rs:8:9
    |
 LL |         const BAR: usize = BAR;
    |         ^^^^^^^^^^^^^^^^
diff --git a/tests/ui/issues/issue-30891.rs b/tests/ui/consts/short-circuit-or-with-const-bool.rs
similarity index 66%
rename from tests/ui/issues/issue-30891.rs
rename to tests/ui/consts/short-circuit-or-with-const-bool.rs
index 25b7165d01167..aafe9cefa2220 100644
--- a/tests/ui/issues/issue-30891.rs
+++ b/tests/ui/consts/short-circuit-or-with-const-bool.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/30891
+
 //@ run-pass
 const ERROR_CONST: bool = true;
 
diff --git a/tests/ui/issues/issue-40951.rs b/tests/ui/consts/static-lifetime-inference-from-const-array.rs
similarity index 73%
rename from tests/ui/issues/issue-40951.rs
rename to tests/ui/consts/static-lifetime-inference-from-const-array.rs
index e99fe76c08527..05edbd66052af 100644
--- a/tests/ui/issues/issue-40951.rs
+++ b/tests/ui/consts/static-lifetime-inference-from-const-array.rs
@@ -1,6 +1,6 @@
 //@ run-pass
 #![allow(unused_variables)]
-// Regression test for #40951.
+// Regression test for https://github.com/rust-lang/rust/issues/40951.
 
 const FOO: [&'static str; 1] = ["foo"];
 
diff --git a/tests/ui/issues/issue-49955.rs b/tests/ui/consts/static-ref-to-const-array-element.rs
similarity index 81%
rename from tests/ui/issues/issue-49955.rs
rename to tests/ui/consts/static-ref-to-const-array-element.rs
index c2f160bd6d4cc..b53ffc2685619 100644
--- a/tests/ui/issues/issue-49955.rs
+++ b/tests/ui/consts/static-ref-to-const-array-element.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/49955
+
 //@ run-pass
 
 const ALL_THE_NUMS: [u32; 1] = [
diff --git a/tests/ui/issues/issue-4387.rs b/tests/ui/issues/issue-4387.rs
deleted file mode 100644
index 10f607aacbd2d..0000000000000
--- a/tests/ui/issues/issue-4387.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-//@ run-pass
-
-pub fn main() {
-    let _foo = [0; 2*4];
-}