diff --git a/tests/ui/issues/issue-14845.rs b/tests/ui/cast/array-field-ptr-cast-14845.rs
similarity index 100%
rename from tests/ui/issues/issue-14845.rs
rename to tests/ui/cast/array-field-ptr-cast-14845.rs
diff --git a/tests/ui/issues/issue-14366.rs b/tests/ui/cast/trait-object-size-error-14366.rs
similarity index 100%
rename from tests/ui/issues/issue-14366.rs
rename to tests/ui/cast/trait-object-size-error-14366.rs
diff --git a/tests/ui/issues/issue-13808.rs b/tests/ui/closures/boxed-closure-lifetime-13808.rs
similarity index 100%
rename from tests/ui/issues/issue-13808.rs
rename to tests/ui/closures/boxed-closure-lifetime-13808.rs
diff --git a/tests/ui/issues/issue-14399.rs b/tests/ui/coercion/method-return-trait-object-14399.rs
similarity index 100%
rename from tests/ui/issues/issue-14399.rs
rename to tests/ui/coercion/method-return-trait-object-14399.rs
diff --git a/tests/ui/issues/issue-13763.rs b/tests/ui/consts/module-const-array-size-13763.rs
similarity index 100%
rename from tests/ui/issues/issue-13763.rs
rename to tests/ui/consts/module-const-array-size-13763.rs
diff --git a/tests/ui/issues/issue-14875.rs b/tests/ui/drop/panic-during-drop-14875.rs
similarity index 100%
rename from tests/ui/issues/issue-14875.rs
rename to tests/ui/drop/panic-during-drop-14875.rs
diff --git a/tests/ui/issues/issue-14330.rs b/tests/ui/extern/macro-use-extern-std-14330.rs
similarity index 100%
rename from tests/ui/issues/issue-14330.rs
rename to tests/ui/extern/macro-use-extern-std-14330.rs
diff --git a/tests/ui/issues/issue-14959.rs b/tests/ui/fn_traits/closure-trait-impl-14959.rs
similarity index 100%
rename from tests/ui/issues/issue-14959.rs
rename to tests/ui/fn_traits/closure-trait-impl-14959.rs
diff --git a/tests/ui/issues/issue-14092.rs b/tests/ui/generics/box-missing-generics-14092.rs
similarity index 100%
rename from tests/ui/issues/issue-14092.rs
rename to tests/ui/generics/box-missing-generics-14092.rs
diff --git a/tests/ui/issues/issue-14285.rs b/tests/ui/lifetimes/explicit-lifetime-required-14285.rs
similarity index 100%
rename from tests/ui/issues/issue-14285.rs
rename to tests/ui/lifetimes/explicit-lifetime-required-14285.rs
diff --git a/tests/ui/issues/issue-13703.rs b/tests/ui/lifetimes/lifetime-bound-whitespace-13703.rs
similarity index 100%
rename from tests/ui/issues/issue-13703.rs
rename to tests/ui/lifetimes/lifetime-bound-whitespace-13703.rs
diff --git a/tests/ui/issues/issue-13497.rs b/tests/ui/lifetimes/missing-lifetime-specifier-13497.rs
similarity index 100%
rename from tests/ui/issues/issue-13497.rs
rename to tests/ui/lifetimes/missing-lifetime-specifier-13497.rs
diff --git a/tests/ui/issues/issue-13665.rs b/tests/ui/lifetimes/ref-pattern-lifetime-annotation-13665.rs
similarity index 100%
rename from tests/ui/issues/issue-13665.rs
rename to tests/ui/lifetimes/ref-pattern-lifetime-annotation-13665.rs
diff --git a/tests/ui/issues/issue-13497-2.rs b/tests/ui/lifetimes/return-reference-local-variable-13497-2.rs
similarity index 100%
rename from tests/ui/issues/issue-13497-2.rs
rename to tests/ui/lifetimes/return-reference-local-variable-13497-2.rs
diff --git a/tests/ui/issues/issue-14821.rs b/tests/ui/lifetimes/trait-object-constructor-14821.rs
similarity index 100%
rename from tests/ui/issues/issue-14821.rs
rename to tests/ui/lifetimes/trait-object-constructor-14821.rs
diff --git a/tests/ui/issues/issue-14091.rs b/tests/ui/macros/assert-mismatched-types-14091.rs
similarity index 100%
rename from tests/ui/issues/issue-14091.rs
rename to tests/ui/macros/assert-mismatched-types-14091.rs
diff --git a/tests/ui/issues/issue-14091-2.rs b/tests/ui/macros/assert-unary-operator-14091-2.rs
similarity index 100%
rename from tests/ui/issues/issue-14091-2.rs
rename to tests/ui/macros/assert-unary-operator-14091-2.rs
diff --git a/tests/ui/issues/issue-14865.rs b/tests/ui/match/guard-pattern-ordering-14865.rs
similarity index 100%
rename from tests/ui/issues/issue-14865.rs
rename to tests/ui/match/guard-pattern-ordering-14865.rs
diff --git a/tests/ui/issues/issue-13867.rs b/tests/ui/match/multiple-refutable-patterns-13867.rs
similarity index 100%
rename from tests/ui/issues/issue-13867.rs
rename to tests/ui/match/multiple-refutable-patterns-13867.rs
diff --git a/tests/ui/issues/issue-14393.rs b/tests/ui/match/tuple-usize-pattern-14393.rs
similarity index 100%
rename from tests/ui/issues/issue-14393.rs
rename to tests/ui/match/tuple-usize-pattern-14393.rs
diff --git a/tests/ui/issues/issue-14082.rs b/tests/ui/modules/use-shadowing-14082.rs
similarity index 100%
rename from tests/ui/issues/issue-14082.rs
rename to tests/ui/modules/use-shadowing-14082.rs
diff --git a/tests/ui/issues/issue-13847.rs b/tests/ui/never_type/field-access-never-type-13847.rs
similarity index 100%
rename from tests/ui/issues/issue-13847.rs
rename to tests/ui/never_type/field-access-never-type-13847.rs
diff --git a/tests/ui/issues/issue-14915.rs b/tests/ui/operator-recovery/box-arithmetic-14915.rs
similarity index 100%
rename from tests/ui/issues/issue-14915.rs
rename to tests/ui/operator-recovery/box-arithmetic-14915.rs
diff --git a/tests/ui/issues/issue-13482.rs b/tests/ui/pattern/array-length-mismatch-13482.rs
similarity index 100%
rename from tests/ui/issues/issue-13482.rs
rename to tests/ui/pattern/array-length-mismatch-13482.rs
diff --git a/tests/ui/issues/issue-13482-2.rs b/tests/ui/pattern/array-length-mismatch-verbose-13482-2.rs
similarity index 100%
rename from tests/ui/issues/issue-13482-2.rs
rename to tests/ui/pattern/array-length-mismatch-verbose-13482-2.rs
diff --git a/tests/ui/issues/issue-14541.rs b/tests/ui/pattern/struct-mismatch-destructure-14541.rs
similarity index 100%
rename from tests/ui/issues/issue-14541.rs
rename to tests/ui/pattern/struct-mismatch-destructure-14541.rs
diff --git a/tests/ui/issues/issue-14308.rs b/tests/ui/pattern/struct-wildcard-pattern-14308.rs
similarity index 100%
rename from tests/ui/issues/issue-14308.rs
rename to tests/ui/pattern/struct-wildcard-pattern-14308.rs
diff --git a/tests/ui/issues/issue-13775.rs b/tests/ui/trait-bounds/anonymous-parameters-13775.rs
similarity index 100%
rename from tests/ui/issues/issue-13775.rs
rename to tests/ui/trait-bounds/anonymous-parameters-13775.rs
diff --git a/tests/ui/issues/issue-14229.rs b/tests/ui/traits/impl-trait-chain-14229.rs
similarity index 100%
rename from tests/ui/issues/issue-14229.rs
rename to tests/ui/traits/impl-trait-chain-14229.rs
diff --git a/tests/ui/issues/issue-14919.rs b/tests/ui/traits/matcher-lifetime-inference-14919.rs
similarity index 100%
rename from tests/ui/issues/issue-14919.rs
rename to tests/ui/traits/matcher-lifetime-inference-14919.rs
diff --git a/tests/ui/issues/issue-14254.rs b/tests/ui/traits/pointer-type-impls-14254.rs
similarity index 100%
rename from tests/ui/issues/issue-14254.rs
rename to tests/ui/traits/pointer-type-impls-14254.rs
diff --git a/tests/ui/issues/issue-14901.rs b/tests/ui/traits/reader-wrapper-trait-14901.rs
similarity index 100%
rename from tests/ui/issues/issue-14901.rs
rename to tests/ui/traits/reader-wrapper-trait-14901.rs
diff --git a/tests/ui/issues/issue-14853.rs b/tests/ui/traits/trait-bound-mismatch-14853.rs
similarity index 100%
rename from tests/ui/issues/issue-14853.rs
rename to tests/ui/traits/trait-bound-mismatch-14853.rs
diff --git a/tests/ui/issues/issue-14721.rs b/tests/ui/typeck/str-no-field-desc-14721.rs
similarity index 100%
rename from tests/ui/issues/issue-14721.rs
rename to tests/ui/typeck/str-no-field-desc-14721.rs