diff --git a/tests/ui/issues/issue-34074.rs b/tests/ui/anon-params/anon-params-trait-method-multiple.rs
similarity index 100%
rename from tests/ui/issues/issue-34074.rs
rename to tests/ui/anon-params/anon-params-trait-method-multiple.rs
diff --git a/tests/ui/issues/issue-21306.rs b/tests/ui/autoref-autoderef/autoderef-arc-boxed-closure-call.rs
similarity index 100%
rename from tests/ui/issues/issue-21306.rs
rename to tests/ui/autoref-autoderef/autoderef-arc-boxed-closure-call.rs
diff --git a/tests/ui/issues/issue-27268.rs b/tests/ui/consts/const-closure-fn-trait-object.rs
similarity index 100%
rename from tests/ui/issues/issue-27268.rs
rename to tests/ui/consts/const-closure-fn-trait-object.rs
diff --git a/tests/ui/issues/issue-24161.rs b/tests/ui/extern/extern-fn-pointer-clone-copy.rs
similarity index 100%
rename from tests/ui/issues/issue-24161.rs
rename to tests/ui/extern/extern-fn-pointer-clone-copy.rs
diff --git a/tests/ui/issues/issue-23036.rs b/tests/ui/hashmap/hashmap-path-key.rs
similarity index 100%
rename from tests/ui/issues/issue-23036.rs
rename to tests/ui/hashmap/hashmap-path-key.rs
diff --git a/tests/ui/issues/issue-20454.rs b/tests/ui/inference/inference-thread-loop-closure.rs
similarity index 100%
rename from tests/ui/issues/issue-20454.rs
rename to tests/ui/inference/inference-thread-loop-closure.rs
diff --git a/tests/ui/issues/issue-19097.rs b/tests/ui/inherent-impls-overlap-check/disjoint-ref-mut-method.rs
similarity index 100%
rename from tests/ui/issues/issue-19097.rs
rename to tests/ui/inherent-impls-overlap-check/disjoint-ref-mut-method.rs
diff --git a/tests/ui/issues/issue-29540.rs b/tests/ui/limits/limit-huge-struct-derive-debug.rs
similarity index 100%
rename from tests/ui/issues/issue-29540.rs
rename to tests/ui/limits/limit-huge-struct-derive-debug.rs
diff --git a/tests/ui/issues/issue-26646.rs b/tests/ui/lint/unused/unused-attr-repr-packed-c-order.rs
similarity index 100%
rename from tests/ui/issues/issue-26646.rs
rename to tests/ui/lint/unused/unused-attr-repr-packed-c-order.rs
diff --git a/tests/ui/issues/issue-37686.rs b/tests/ui/match/match-usize-min-max-pattern.rs
similarity index 100%
rename from tests/ui/issues/issue-37686.rs
rename to tests/ui/match/match-usize-min-max-pattern.rs
diff --git a/tests/ui/issues/issue-38987.rs b/tests/ui/numbers-arithmetic/i128-min-literal-parses.rs
similarity index 100%
rename from tests/ui/issues/issue-38987.rs
rename to tests/ui/numbers-arithmetic/i128-min-literal-parses.rs
diff --git a/tests/ui/issues/issue-18352.rs b/tests/ui/pattern/const-pattern-str-match-lifetime.rs
similarity index 100%
rename from tests/ui/issues/issue-18352.rs
rename to tests/ui/pattern/const-pattern-str-match-lifetime.rs
diff --git a/tests/ui/issues/issue-21891.rs b/tests/ui/static/static-array-shared-slice-references.rs
similarity index 100%
rename from tests/ui/issues/issue-21891.rs
rename to tests/ui/static/static-array-shared-slice-references.rs
diff --git a/tests/ui/issues/issue-50471.rs b/tests/ui/str/raw-string-literal-unescaped-unicode.rs
similarity index 100%
rename from tests/ui/issues/issue-50471.rs
rename to tests/ui/str/raw-string-literal-unescaped-unicode.rs