diff --git a/tests/ui/issues/issue-31267.rs b/tests/ui/associated-consts/associated-const-access.rs
similarity index 100%
rename from tests/ui/issues/issue-31267.rs
rename to tests/ui/associated-consts/associated-const-access.rs
diff --git a/tests/ui/issues/issue-49824.rs b/tests/ui/closures/nested-closure-escape-borrow.rs
similarity index 100%
rename from tests/ui/issues/issue-49824.rs
rename to tests/ui/closures/nested-closure-escape-borrow.rs
diff --git a/tests/ui/issues/issue-49824.stderr b/tests/ui/closures/nested-closure-escape-borrow.stderr
similarity index 100%
rename from tests/ui/issues/issue-49824.stderr
rename to tests/ui/closures/nested-closure-escape-borrow.stderr
diff --git a/tests/ui/issues/issue-17651.rs b/tests/ui/closures/unsized_value_move.rs
similarity index 100%
rename from tests/ui/issues/issue-17651.rs
rename to tests/ui/closures/unsized_value_move.rs
diff --git a/tests/ui/issues/issue-17651.stderr b/tests/ui/closures/unsized_value_move.stderr
similarity index 100%
rename from tests/ui/issues/issue-17651.stderr
rename to tests/ui/closures/unsized_value_move.stderr
diff --git a/tests/ui/issues/issue-18767.rs b/tests/ui/deref/deref-in-for-loop.rs
similarity index 100%
rename from tests/ui/issues/issue-18767.rs
rename to tests/ui/deref/deref-in-for-loop.rs
diff --git a/tests/ui/issues/issue-34569.rs b/tests/ui/match/closure-in-match-guard.rs
similarity index 100%
rename from tests/ui/issues/issue-34569.rs
rename to tests/ui/match/closure-in-match-guard.rs
diff --git a/tests/ui/issues/issue-29740.rs b/tests/ui/match/large-match-mir-gen.rs
similarity index 100%
rename from tests/ui/issues/issue-29740.rs
rename to tests/ui/match/large-match-mir-gen.rs
diff --git a/tests/ui/issues/issue-32004.rs b/tests/ui/pattern/constructor-type-mismatch.rs
similarity index 100%
rename from tests/ui/issues/issue-32004.rs
rename to tests/ui/pattern/constructor-type-mismatch.rs
diff --git a/tests/ui/issues/issue-32004.stderr b/tests/ui/pattern/constructor-type-mismatch.stderr
similarity index 100%
rename from tests/ui/issues/issue-32004.stderr
rename to tests/ui/pattern/constructor-type-mismatch.stderr
diff --git a/tests/ui/issues/issue-3038.rs b/tests/ui/pattern/multiple-bindings-on-var.rs
similarity index 100%
rename from tests/ui/issues/issue-3038.rs
rename to tests/ui/pattern/multiple-bindings-on-var.rs
diff --git a/tests/ui/issues/issue-3038.stderr b/tests/ui/pattern/multiple-bindings-on-var.stderr
similarity index 100%
rename from tests/ui/issues/issue-3038.stderr
rename to tests/ui/pattern/multiple-bindings-on-var.stderr
diff --git a/tests/ui/issues/issue-2849.rs b/tests/ui/pattern/or-pattern-binding-mismatch.rs
similarity index 100%
rename from tests/ui/issues/issue-2849.rs
rename to tests/ui/pattern/or-pattern-binding-mismatch.rs
diff --git a/tests/ui/issues/issue-2849.stderr b/tests/ui/pattern/or-pattern-binding-mismatch.stderr
similarity index 100%
rename from tests/ui/issues/issue-2849.stderr
rename to tests/ui/pattern/or-pattern-binding-mismatch.stderr
diff --git a/tests/ui/issues/issue-2848.rs b/tests/ui/pattern/or-pattern-mismatched-variable-and-variant.rs
similarity index 100%
rename from tests/ui/issues/issue-2848.rs
rename to tests/ui/pattern/or-pattern-mismatched-variable-and-variant.rs
diff --git a/tests/ui/issues/issue-2848.stderr b/tests/ui/pattern/or-pattern-mismatched-variable-and-variant.stderr
similarity index 100%
rename from tests/ui/issues/issue-2848.stderr
rename to tests/ui/pattern/or-pattern-mismatched-variable-and-variant.stderr