diff --git a/tests/ui/issues/issue-4387.rs b/tests/ui/consts/arithmetic-expr-in-array-len.rs
similarity index 100%
rename from tests/ui/issues/issue-4387.rs
rename to tests/ui/consts/arithmetic-expr-in-array-len.rs
diff --git a/tests/ui/issues/issue-50518.rs b/tests/ui/consts/assoc-const-with-self-in-trait-object.rs
similarity index 100%
rename from tests/ui/issues/issue-50518.rs
rename to tests/ui/consts/assoc-const-with-self-in-trait-object.rs
diff --git a/tests/ui/issues/issue-39548.rs b/tests/ui/consts/bool-comparison-in-const-array-len.rs
similarity index 100%
rename from tests/ui/issues/issue-39548.rs
rename to tests/ui/consts/bool-comparison-in-const-array-len.rs
diff --git a/tests/ui/issues/issue-33287.rs b/tests/ui/consts/const-array-oob-in-range-expr.rs
similarity index 100%
rename from tests/ui/issues/issue-33287.rs
rename to tests/ui/consts/const-array-oob-in-range-expr.rs
diff --git a/tests/ui/issues/issue-53275.rs b/tests/ui/consts/empty-array-index-in-struct-init.rs
similarity index 100%
rename from tests/ui/issues/issue-53275.rs
rename to tests/ui/consts/empty-array-index-in-struct-init.rs
diff --git a/tests/ui/issues/issue-44239.fixed b/tests/ui/consts/local-var-in-associated-const.fixed
similarity index 100%
rename from tests/ui/issues/issue-44239.fixed
rename to tests/ui/consts/local-var-in-associated-const.fixed
diff --git a/tests/ui/issues/issue-44239.rs b/tests/ui/consts/local-var-in-associated-const.rs
similarity index 100%
rename from tests/ui/issues/issue-44239.rs
rename to tests/ui/consts/local-var-in-associated-const.rs
diff --git a/tests/ui/issues/issue-44239.stderr b/tests/ui/consts/local-var-in-associated-const.stderr
similarity index 100%
rename from tests/ui/issues/issue-44239.stderr
rename to tests/ui/consts/local-var-in-associated-const.stderr
diff --git a/tests/ui/issues/issue-25757.rs b/tests/ui/consts/method-reference-in-const-dyn-fn.rs
similarity index 100%
rename from tests/ui/issues/issue-25757.rs
rename to tests/ui/consts/method-reference-in-const-dyn-fn.rs
diff --git a/tests/ui/issues/issue-27433.fixed b/tests/ui/consts/non-constant-value-in-nested-const.fixed
similarity index 100%
rename from tests/ui/issues/issue-27433.fixed
rename to tests/ui/consts/non-constant-value-in-nested-const.fixed
diff --git a/tests/ui/issues/issue-27433.rs b/tests/ui/consts/non-constant-value-in-nested-const.rs
similarity index 100%
rename from tests/ui/issues/issue-27433.rs
rename to tests/ui/consts/non-constant-value-in-nested-const.rs
diff --git a/tests/ui/issues/issue-27433.stderr b/tests/ui/consts/non-constant-value-in-nested-const.stderr
similarity index 100%
rename from tests/ui/issues/issue-27433.stderr
rename to tests/ui/consts/non-constant-value-in-nested-const.stderr
diff --git a/tests/ui/issues/issue-17252.rs b/tests/ui/consts/recursive-const-stack-overflow.rs
similarity index 100%
rename from tests/ui/issues/issue-17252.rs
rename to tests/ui/consts/recursive-const-stack-overflow.rs
diff --git a/tests/ui/issues/issue-17252.stderr b/tests/ui/consts/recursive-const-stack-overflow.stderr
similarity index 100%
rename from tests/ui/issues/issue-17252.stderr
rename to tests/ui/consts/recursive-const-stack-overflow.stderr
diff --git a/tests/ui/issues/issue-30891.rs b/tests/ui/consts/short-circuit-or-with-const-bool.rs
similarity index 100%
rename from tests/ui/issues/issue-30891.rs
rename to tests/ui/consts/short-circuit-or-with-const-bool.rs
diff --git a/tests/ui/issues/issue-40951.rs b/tests/ui/consts/static-lifetime-inference-from-const-array.rs
similarity index 100%
rename from tests/ui/issues/issue-40951.rs
rename to tests/ui/consts/static-lifetime-inference-from-const-array.rs
diff --git a/tests/ui/issues/issue-49955.rs b/tests/ui/consts/static-ref-to-const-array-element.rs
similarity index 100%
rename from tests/ui/issues/issue-49955.rs
rename to tests/ui/consts/static-ref-to-const-array-element.rs