diff --git a/tests/ui/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs b/tests/ui/enum/auxiliary/namespaced_enum_emulate_flat.rs
similarity index 100%
rename from tests/ui/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs
rename to tests/ui/enum/auxiliary/namespaced_enum_emulate_flat.rs
diff --git a/tests/ui/structs-enums/auxiliary/namespaced_enums.rs b/tests/ui/enum/auxiliary/namespaced_enums.rs
similarity index 100%
rename from tests/ui/structs-enums/auxiliary/namespaced_enums.rs
rename to tests/ui/enum/auxiliary/namespaced_enums.rs
diff --git a/tests/ui/structs-enums/enum-clike-ffi-as-int.rs b/tests/ui/enum/enum-clike-ffi-as-int.rs
similarity index 100%
rename from tests/ui/structs-enums/enum-clike-ffi-as-int.rs
rename to tests/ui/enum/enum-clike-ffi-as-int.rs
diff --git a/tests/ui/structs-enums/enum-discrim-manual-sizing.rs b/tests/ui/enum/enum-discrim-manual-sizing.rs
similarity index 100%
rename from tests/ui/structs-enums/enum-discrim-manual-sizing.rs
rename to tests/ui/enum/enum-discrim-manual-sizing.rs
diff --git a/tests/ui/structs-enums/enum-discrim-range-overflow.rs b/tests/ui/enum/enum-discrim-range-overflow.rs
similarity index 100%
rename from tests/ui/structs-enums/enum-discrim-range-overflow.rs
rename to tests/ui/enum/enum-discrim-range-overflow.rs
diff --git a/tests/ui/structs-enums/enum-discrim-width-stuff.rs b/tests/ui/enum/enum-discrim-width-stuff.rs
similarity index 100%
rename from tests/ui/structs-enums/enum-discrim-width-stuff.rs
rename to tests/ui/enum/enum-discrim-width-stuff.rs
diff --git a/tests/ui/structs-enums/enum-disr-val-pretty.rs b/tests/ui/enum/enum-disr-val-pretty.rs
similarity index 100%
rename from tests/ui/structs-enums/enum-disr-val-pretty.rs
rename to tests/ui/enum/enum-disr-val-pretty.rs
diff --git a/tests/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs b/tests/ui/enum/enum-nullable-simplifycfg-misopt.rs
similarity index 100%
rename from tests/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs
rename to tests/ui/enum/enum-nullable-simplifycfg-misopt.rs
diff --git a/tests/ui/structs-enums/enum-univariant-repr.rs b/tests/ui/enum/enum-univariant-repr.rs
similarity index 100%
rename from tests/ui/structs-enums/enum-univariant-repr.rs
rename to tests/ui/enum/enum-univariant-repr.rs
diff --git a/tests/ui/structs-enums/enum-variants.rs b/tests/ui/enum/enum-variants.rs
similarity index 100%
rename from tests/ui/structs-enums/enum-variants.rs
rename to tests/ui/enum/enum-variants.rs
diff --git a/tests/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs b/tests/ui/enum/namespaced-enum-emulate-flat-xc.rs
similarity index 100%
rename from tests/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs
rename to tests/ui/enum/namespaced-enum-emulate-flat-xc.rs
diff --git a/tests/ui/structs-enums/namespaced-enum-emulate-flat.rs b/tests/ui/enum/namespaced-enum-emulate-flat.rs
similarity index 100%
rename from tests/ui/structs-enums/namespaced-enum-emulate-flat.rs
rename to tests/ui/enum/namespaced-enum-emulate-flat.rs
diff --git a/tests/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs b/tests/ui/enum/namespaced-enum-glob-import-xcrate.rs
similarity index 100%
rename from tests/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs
rename to tests/ui/enum/namespaced-enum-glob-import-xcrate.rs
diff --git a/tests/ui/structs-enums/namespaced-enum-glob-import.rs b/tests/ui/enum/namespaced-enum-glob-import.rs
similarity index 100%
rename from tests/ui/structs-enums/namespaced-enum-glob-import.rs
rename to tests/ui/enum/namespaced-enum-glob-import.rs
diff --git a/tests/ui/structs-enums/namespaced-enums-xcrate.rs b/tests/ui/enum/namespaced-enums-xcrate.rs
similarity index 100%
rename from tests/ui/structs-enums/namespaced-enums-xcrate.rs
rename to tests/ui/enum/namespaced-enums-xcrate.rs
diff --git a/tests/ui/structs-enums/namespaced-enums.rs b/tests/ui/enum/namespaced-enums.rs
similarity index 100%
rename from tests/ui/structs-enums/namespaced-enums.rs
rename to tests/ui/enum/namespaced-enums.rs
diff --git a/tests/ui/structs-enums/struct-like-variant-construct.rs b/tests/ui/enum/struct-like-variant-construct.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-like-variant-construct.rs
rename to tests/ui/enum/struct-like-variant-construct.rs
diff --git a/tests/ui/structs-enums/struct-like-variant-match.rs b/tests/ui/enum/struct-like-variant-match.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-like-variant-match.rs
rename to tests/ui/enum/struct-like-variant-match.rs
diff --git a/tests/ui/structs-enums/recover-enum-with-bad-where.rs b/tests/ui/parser/recover/recover-enum-with-bad-where.rs
similarity index 100%
rename from tests/ui/structs-enums/recover-enum-with-bad-where.rs
rename to tests/ui/parser/recover/recover-enum-with-bad-where.rs
diff --git a/tests/ui/structs-enums/recover-enum-with-bad-where.stderr b/tests/ui/parser/recover/recover-enum-with-bad-where.stderr
similarity index 100%
rename from tests/ui/structs-enums/recover-enum-with-bad-where.stderr
rename to tests/ui/parser/recover/recover-enum-with-bad-where.stderr
diff --git a/tests/ui/structs-enums/auxiliary/newtype_struct_xc.rs b/tests/ui/structs/auxiliary/newtype_struct_xc.rs
similarity index 100%
rename from tests/ui/structs-enums/auxiliary/newtype_struct_xc.rs
rename to tests/ui/structs/auxiliary/newtype_struct_xc.rs
diff --git a/tests/ui/structs-enums/cross-crate-newtype-struct-pat.rs b/tests/ui/structs/cross-crate-newtype-struct-pat.rs
similarity index 100%
rename from tests/ui/structs-enums/cross-crate-newtype-struct-pat.rs
rename to tests/ui/structs/cross-crate-newtype-struct-pat.rs
diff --git a/tests/ui/structs-enums/field-destruction-order.rs b/tests/ui/structs/field-destruction-order.rs
similarity index 100%
rename from tests/ui/structs-enums/field-destruction-order.rs
rename to tests/ui/structs/field-destruction-order.rs
diff --git a/tests/ui/structs-enums/module-qualified-struct-destructure.rs b/tests/ui/structs/module-qualified-struct-destructure.rs
similarity index 100%
rename from tests/ui/structs-enums/module-qualified-struct-destructure.rs
rename to tests/ui/structs/module-qualified-struct-destructure.rs
diff --git a/tests/ui/structs-enums/newtype-struct-drop-run.rs b/tests/ui/structs/newtype-struct-drop-run.rs
similarity index 100%
rename from tests/ui/structs-enums/newtype-struct-drop-run.rs
rename to tests/ui/structs/newtype-struct-drop-run.rs
diff --git a/tests/ui/structs-enums/newtype-struct-with-dtor.rs b/tests/ui/structs/newtype-struct-with-dtor.rs
similarity index 100%
rename from tests/ui/structs-enums/newtype-struct-with-dtor.rs
rename to tests/ui/structs/newtype-struct-with-dtor.rs
diff --git a/tests/ui/structs-enums/newtype-struct-xc-2.rs b/tests/ui/structs/newtype-struct-xc-2.rs
similarity index 100%
rename from tests/ui/structs-enums/newtype-struct-xc-2.rs
rename to tests/ui/structs/newtype-struct-xc-2.rs
diff --git a/tests/ui/structs-enums/newtype-struct-xc.rs b/tests/ui/structs/newtype-struct-xc.rs
similarity index 100%
rename from tests/ui/structs-enums/newtype-struct-xc.rs
rename to tests/ui/structs/newtype-struct-xc.rs
diff --git a/tests/ui/structs-enums/rec-align-u32.rs b/tests/ui/structs/rec-align-u32.rs
similarity index 100%
rename from tests/ui/structs-enums/rec-align-u32.rs
rename to tests/ui/structs/rec-align-u32.rs
diff --git a/tests/ui/structs-enums/rec-align-u64.rs b/tests/ui/structs/rec-align-u64.rs
similarity index 100%
rename from tests/ui/structs-enums/rec-align-u64.rs
rename to tests/ui/structs/rec-align-u64.rs
diff --git a/tests/ui/structs-enums/struct-lit-functional-no-fields.rs b/tests/ui/structs/struct-lit-functional-no-fields.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-lit-functional-no-fields.rs
rename to tests/ui/structs/struct-lit-functional-no-fields.rs
diff --git a/tests/ui/structs-enums/struct-literal-dtor.rs b/tests/ui/structs/struct-literal-dtor.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-literal-dtor.rs
rename to tests/ui/structs/struct-literal-dtor.rs
diff --git a/tests/ui/structs-enums/struct-new-as-field-name.rs b/tests/ui/structs/struct-new-as-field-name.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-new-as-field-name.rs
rename to tests/ui/structs/struct-new-as-field-name.rs
diff --git a/tests/ui/structs-enums/struct-order-of-eval-1.rs b/tests/ui/structs/struct-order-of-eval-1.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-order-of-eval-1.rs
rename to tests/ui/structs/struct-order-of-eval-1.rs
diff --git a/tests/ui/structs-enums/struct-order-of-eval-2.rs b/tests/ui/structs/struct-order-of-eval-2.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-order-of-eval-2.rs
rename to tests/ui/structs/struct-order-of-eval-2.rs
diff --git a/tests/ui/structs-enums/struct-order-of-eval-3.rs b/tests/ui/structs/struct-order-of-eval-3.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-order-of-eval-3.rs
rename to tests/ui/structs/struct-order-of-eval-3.rs
diff --git a/tests/ui/structs-enums/struct-order-of-eval-4.rs b/tests/ui/structs/struct-order-of-eval-4.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-order-of-eval-4.rs
rename to tests/ui/structs/struct-order-of-eval-4.rs
diff --git a/tests/ui/structs-enums/struct-partial-move-1.rs b/tests/ui/structs/struct-partial-move-1.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-partial-move-1.rs
rename to tests/ui/structs/struct-partial-move-1.rs
diff --git a/tests/ui/structs-enums/struct-partial-move-2.rs b/tests/ui/structs/struct-partial-move-2.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-partial-move-2.rs
rename to tests/ui/structs/struct-partial-move-2.rs
diff --git a/tests/ui/structs-enums/struct-path-associated-type.rs b/tests/ui/structs/struct-path-associated-type-2.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-path-associated-type.rs
rename to tests/ui/structs/struct-path-associated-type-2.rs
diff --git a/tests/ui/structs-enums/struct-path-self.rs b/tests/ui/structs/struct-path-self-2.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-path-self.rs
rename to tests/ui/structs/struct-path-self-2.rs
diff --git a/tests/ui/structs-enums/struct-pattern-matching.rs b/tests/ui/structs/struct-pattern-matching.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-pattern-matching.rs
rename to tests/ui/structs/struct-pattern-matching.rs
diff --git a/tests/ui/structs-enums/struct-variant-field-visibility.rs b/tests/ui/structs/struct-variant-field-visibility.rs
similarity index 100%
rename from tests/ui/structs-enums/struct-variant-field-visibility.rs
rename to tests/ui/structs/struct-variant-field-visibility.rs
diff --git a/tests/ui/structs-enums/uninstantiable-struct.rs b/tests/ui/structs/uninstantiable-struct.rs
similarity index 100%
rename from tests/ui/structs-enums/uninstantiable-struct.rs
rename to tests/ui/structs/uninstantiable-struct.rs
diff --git a/tests/ui/structs-enums/unit-like-struct-drop-run.rs b/tests/ui/structs/unit-like-struct-drop-run.rs
similarity index 100%
rename from tests/ui/structs-enums/unit-like-struct-drop-run.rs
rename to tests/ui/structs/unit-like-struct-drop-run.rs
diff --git a/tests/ui/structs-enums/unit-like-struct.rs b/tests/ui/structs/unit-like-struct.rs
similarity index 100%
rename from tests/ui/structs-enums/unit-like-struct.rs
rename to tests/ui/structs/unit-like-struct.rs
diff --git a/tests/ui/structs-enums/variant-structs-trivial.rs b/tests/ui/structs/variant-structs-trivial.rs
similarity index 100%
rename from tests/ui/structs-enums/variant-structs-trivial.rs
rename to tests/ui/structs/variant-structs-trivial.rs