diff --git a/tests/ui/issues/issue-10396.rs b/tests/ui/array-slice-vec/array-pattern-matching.rs
similarity index 100%
rename from tests/ui/issues/issue-10396.rs
rename to tests/ui/array-slice-vec/array-pattern-matching.rs
diff --git a/tests/ui/issues/issue-11205.rs b/tests/ui/array-slice-vec/trait-object-arrays.rs
similarity index 100%
rename from tests/ui/issues/issue-11205.rs
rename to tests/ui/array-slice-vec/trait-object-arrays.rs
diff --git a/tests/ui/issues/issue-11192.rs b/tests/ui/borrowck/closure-borrow-conflict.rs
similarity index 100%
rename from tests/ui/issues/issue-11192.rs
rename to tests/ui/borrowck/closure-borrow-conflict.rs
diff --git a/tests/ui/issues/issue-11085.rs b/tests/ui/cfg/conditional-compilation-struct.rs
similarity index 100%
rename from tests/ui/issues/issue-11085.rs
rename to tests/ui/cfg/conditional-compilation-struct.rs
diff --git a/tests/ui/issues/issue-10718.rs b/tests/ui/closures/fnonce-closure-call.rs
similarity index 100%
rename from tests/ui/issues/issue-10718.rs
rename to tests/ui/closures/fnonce-closure-call.rs
diff --git a/tests/ui/issues/issue-10734.rs b/tests/ui/drop/conditional-drop-behavior.rs
similarity index 100%
rename from tests/ui/issues/issue-10734.rs
rename to tests/ui/drop/conditional-drop-behavior.rs
diff --git a/tests/ui/issues/issue-10802.rs b/tests/ui/drop/trait-object-drop-behavior.rs
similarity index 100%
rename from tests/ui/issues/issue-10802.rs
rename to tests/ui/drop/trait-object-drop-behavior.rs
diff --git a/tests/ui/issues/issue-10764.rs b/tests/ui/extern/extern-rust-fn-type-error.rs
similarity index 100%
rename from tests/ui/issues/issue-10764.rs
rename to tests/ui/extern/extern-rust-fn-type-error.rs
diff --git a/tests/ui/issues/issue-10877.rs b/tests/ui/extern/foreign-fn-pattern-error.rs
similarity index 100%
rename from tests/ui/issues/issue-10877.rs
rename to tests/ui/extern/foreign-fn-pattern-error.rs
diff --git a/tests/ui/issues/issue-10767.rs b/tests/ui/fn/boxed-fn-pointer.rs
similarity index 100%
rename from tests/ui/issues/issue-10767.rs
rename to tests/ui/fn/boxed-fn-pointer.rs
diff --git a/tests/ui/issues/issue-10436.rs b/tests/ui/generics/generic-type-inference.rs
similarity index 100%
rename from tests/ui/issues/issue-10436.rs
rename to tests/ui/generics/generic-type-inference.rs
diff --git a/tests/ui/issues/issue-10806.rs b/tests/ui/imports/empty-use-statements.rs
similarity index 100%
rename from tests/ui/issues/issue-10806.rs
rename to tests/ui/imports/empty-use-statements.rs
diff --git a/tests/ui/issues/issue-10291.rs b/tests/ui/lifetimes/closure-lifetime-bounds-error.rs
similarity index 100%
rename from tests/ui/issues/issue-10291.rs
rename to tests/ui/lifetimes/closure-lifetime-bounds-error.rs
diff --git a/tests/ui/issues/issue-11374.rs b/tests/ui/lifetimes/container-lifetime-error.rs
similarity index 100%
rename from tests/ui/issues/issue-11374.rs
rename to tests/ui/lifetimes/container-lifetime-error.rs
diff --git a/tests/ui/issues/issue-10228.rs b/tests/ui/lifetimes/enum-lifetime-container.rs
similarity index 100%
rename from tests/ui/issues/issue-10228.rs
rename to tests/ui/lifetimes/enum-lifetime-container.rs
diff --git a/tests/ui/issues/issue-10412.rs b/tests/ui/lifetimes/keyword-self-lifetime-error.rs
similarity index 100%
rename from tests/ui/issues/issue-10412.rs
rename to tests/ui/lifetimes/keyword-self-lifetime-error.rs
diff --git a/tests/ui/issues/issue-10902.rs b/tests/ui/lifetimes/trait-lifetime-bounds.rs
similarity index 100%
rename from tests/ui/issues/issue-10902.rs
rename to tests/ui/lifetimes/trait-lifetime-bounds.rs
diff --git a/tests/ui/issues/issue-10853.rs b/tests/ui/lint/inner-doc-attributes.rs
similarity index 100%
rename from tests/ui/issues/issue-10853.rs
rename to tests/ui/lint/inner-doc-attributes.rs
diff --git a/tests/ui/issues/issue-10638.rs b/tests/ui/parser/comment-parsing.rs
similarity index 100%
rename from tests/ui/issues/issue-10638.rs
rename to tests/ui/parser/comment-parsing.rs
diff --git a/tests/ui/issues/issue-10683.rs b/tests/ui/pattern/ascii-lowercase-match.rs
similarity index 100%
rename from tests/ui/issues/issue-10683.rs
rename to tests/ui/pattern/ascii-lowercase-match.rs
diff --git a/tests/ui/issues/issue-10545.rs b/tests/ui/privacy/private-struct-access-error.rs
similarity index 100%
rename from tests/ui/issues/issue-10545.rs
rename to tests/ui/privacy/private-struct-access-error.rs
diff --git a/tests/ui/issues/issue-11267.rs b/tests/ui/structs/mutable-unit-struct-borrow.rs
similarity index 100%
rename from tests/ui/issues/issue-11267.rs
rename to tests/ui/structs/mutable-unit-struct-borrow.rs
diff --git a/tests/ui/issues/issue-10456.rs b/tests/ui/traits/blanket-impl-trait-object.rs
similarity index 100%
rename from tests/ui/issues/issue-10456.rs
rename to tests/ui/traits/blanket-impl-trait-object.rs
diff --git a/tests/ui/issues/issue-10465.rs b/tests/ui/traits/missing-trait-method-error.rs
similarity index 100%
rename from tests/ui/issues/issue-10465.rs
rename to tests/ui/traits/missing-trait-method-error.rs
diff --git a/tests/ui/issues/issue-106755.rs b/tests/ui/traits/negative-positive-impl-conflict.rs
similarity index 100%
rename from tests/ui/issues/issue-106755.rs
rename to tests/ui/traits/negative-positive-impl-conflict.rs
diff --git a/tests/ui/issues/issue-102964.rs b/tests/ui/type-alias/mismatched-rc-foo-types.rs
similarity index 100%
rename from tests/ui/issues/issue-102964.rs
rename to tests/ui/type-alias/mismatched-rc-foo-types.rs
diff --git a/tests/ui/issues/issue-11047.rs b/tests/ui/type-alias/static-method-type-alias.rs
similarity index 100%
rename from tests/ui/issues/issue-11047.rs
rename to tests/ui/type-alias/static-method-type-alias.rs
diff --git a/tests/ui/issues/issue-11004.rs b/tests/ui/unsafe/raw-pointer-field-access-error.rs
similarity index 100%
rename from tests/ui/issues/issue-11004.rs
rename to tests/ui/unsafe/raw-pointer-field-access-error.rs