diff --git a/tests/ui/unsafe/access_union_field.rs b/tests/ui/union/access_union_field.rs
similarity index 100%
rename from tests/ui/unsafe/access_union_field.rs
rename to tests/ui/union/access_union_field.rs
diff --git a/tests/ui/unsafe/access_union_field.stderr b/tests/ui/union/access_union_field.stderr
similarity index 100%
rename from tests/ui/unsafe/access_union_field.stderr
rename to tests/ui/union/access_union_field.stderr
diff --git a/tests/ui/unsafe/union-assignop.rs b/tests/ui/union/union-assignop.rs
similarity index 100%
rename from tests/ui/unsafe/union-assignop.rs
rename to tests/ui/union/union-assignop.rs
diff --git a/tests/ui/unsafe/union-assignop.stderr b/tests/ui/union/union-assignop.stderr
similarity index 100%
rename from tests/ui/unsafe/union-assignop.stderr
rename to tests/ui/union/union-assignop.stderr
diff --git a/tests/ui/unsafe/union-modification.rs b/tests/ui/union/union-modification.rs
similarity index 100%
rename from tests/ui/unsafe/union-modification.rs
rename to tests/ui/union/union-modification.rs
diff --git a/tests/ui/unsafe/union-pat-in-param.rs b/tests/ui/union/union-pat-in-param.rs
similarity index 100%
rename from tests/ui/unsafe/union-pat-in-param.rs
rename to tests/ui/union/union-pat-in-param.rs
diff --git a/tests/ui/unsafe/union-pat-in-param.stderr b/tests/ui/union/union-pat-in-param.stderr
similarity index 100%
rename from tests/ui/unsafe/union-pat-in-param.stderr
rename to tests/ui/union/union-pat-in-param.stderr
diff --git a/tests/ui/unsafe/union.rs b/tests/ui/union/union.rs
similarity index 100%
rename from tests/ui/unsafe/union.rs
rename to tests/ui/union/union.rs
diff --git a/tests/ui/unsafe/union.stderr b/tests/ui/union/union.stderr
similarity index 100%
rename from tests/ui/unsafe/union.stderr
rename to tests/ui/union/union.stderr
diff --git a/tests/ui/unsafe/union_access_through_block.rs b/tests/ui/union/union_access_through_block.rs
similarity index 100%
rename from tests/ui/unsafe/union_access_through_block.rs
rename to tests/ui/union/union_access_through_block.rs
diff --git a/tests/ui/unsafe/union_destructure.rs b/tests/ui/union/union_destructure.rs
similarity index 100%
rename from tests/ui/unsafe/union_destructure.rs
rename to tests/ui/union/union_destructure.rs
diff --git a/tests/ui/unsafe/union_wild_or_wild.rs b/tests/ui/union/union_wild_or_wild.rs
similarity index 100%
rename from tests/ui/unsafe/union_wild_or_wild.rs
rename to tests/ui/union/union_wild_or_wild.rs
diff --git a/tests/ui/unsafe/move-out-of-non-copy.rs b/tests/ui/unsafe-binders/move-out-of-non-copy.rs
similarity index 100%
rename from tests/ui/unsafe/move-out-of-non-copy.rs
rename to tests/ui/unsafe-binders/move-out-of-non-copy.rs
diff --git a/tests/ui/unsafe/move-out-of-non-copy.stderr b/tests/ui/unsafe-binders/move-out-of-non-copy.stderr
similarity index 100%
rename from tests/ui/unsafe/move-out-of-non-copy.stderr
rename to tests/ui/unsafe-binders/move-out-of-non-copy.stderr
diff --git a/tests/ui/unsafe/initializing-ranged-via-ctor.rs b/tests/ui/unsafe/rustc_layout_scalar_valid_range/initializing-ranged-via-ctor.rs
similarity index 100%
rename from tests/ui/unsafe/initializing-ranged-via-ctor.rs
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/initializing-ranged-via-ctor.rs
diff --git a/tests/ui/unsafe/initializing-ranged-via-ctor.stderr b/tests/ui/unsafe/rustc_layout_scalar_valid_range/initializing-ranged-via-ctor.stderr
similarity index 100%
rename from tests/ui/unsafe/initializing-ranged-via-ctor.stderr
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/initializing-ranged-via-ctor.stderr
diff --git a/tests/ui/unsafe/ranged-ctor-as-fn-ptr.rs b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged-ctor-as-fn-ptr.rs
similarity index 100%
rename from tests/ui/unsafe/ranged-ctor-as-fn-ptr.rs
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged-ctor-as-fn-ptr.rs
diff --git a/tests/ui/unsafe/ranged-ctor-as-fn-ptr.stderr b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged-ctor-as-fn-ptr.stderr
similarity index 100%
rename from tests/ui/unsafe/ranged-ctor-as-fn-ptr.stderr
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged-ctor-as-fn-ptr.stderr
diff --git a/tests/ui/unsafe/ranged_ints.rs b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints.rs
similarity index 100%
rename from tests/ui/unsafe/ranged_ints.rs
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints.rs
diff --git a/tests/ui/unsafe/ranged_ints.stderr b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints.stderr
similarity index 100%
rename from tests/ui/unsafe/ranged_ints.stderr
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints.stderr
diff --git a/tests/ui/unsafe/ranged_ints2.rs b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints2.rs
similarity index 100%
rename from tests/ui/unsafe/ranged_ints2.rs
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints2.rs
diff --git a/tests/ui/unsafe/ranged_ints2.stderr b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints2.stderr
similarity index 100%
rename from tests/ui/unsafe/ranged_ints2.stderr
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints2.stderr
diff --git a/tests/ui/unsafe/ranged_ints2_const.rs b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints2_const.rs
similarity index 100%
rename from tests/ui/unsafe/ranged_ints2_const.rs
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints2_const.rs
diff --git a/tests/ui/unsafe/ranged_ints2_const.stderr b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints2_const.stderr
similarity index 100%
rename from tests/ui/unsafe/ranged_ints2_const.stderr
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints2_const.stderr
diff --git a/tests/ui/unsafe/ranged_ints3.rs b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints3.rs
similarity index 100%
rename from tests/ui/unsafe/ranged_ints3.rs
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints3.rs
diff --git a/tests/ui/unsafe/ranged_ints3.stderr b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints3.stderr
similarity index 100%
rename from tests/ui/unsafe/ranged_ints3.stderr
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints3.stderr
diff --git a/tests/ui/unsafe/ranged_ints3_const.rs b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints3_const.rs
similarity index 100%
rename from tests/ui/unsafe/ranged_ints3_const.rs
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints3_const.rs
diff --git a/tests/ui/unsafe/ranged_ints3_const.stderr b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints3_const.stderr
similarity index 100%
rename from tests/ui/unsafe/ranged_ints3_const.stderr
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints3_const.stderr
diff --git a/tests/ui/unsafe/ranged_ints3_match.rs b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints3_match.rs
similarity index 100%
rename from tests/ui/unsafe/ranged_ints3_match.rs
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints3_match.rs
diff --git a/tests/ui/unsafe/ranged_ints3_match.stderr b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints3_match.stderr
similarity index 100%
rename from tests/ui/unsafe/ranged_ints3_match.stderr
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints3_match.stderr
diff --git a/tests/ui/unsafe/ranged_ints4.rs b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints4.rs
similarity index 100%
rename from tests/ui/unsafe/ranged_ints4.rs
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints4.rs
diff --git a/tests/ui/unsafe/ranged_ints4.stderr b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints4.stderr
similarity index 100%
rename from tests/ui/unsafe/ranged_ints4.stderr
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints4.stderr
diff --git a/tests/ui/unsafe/ranged_ints4_const.rs b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints4_const.rs
similarity index 100%
rename from tests/ui/unsafe/ranged_ints4_const.rs
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints4_const.rs
diff --git a/tests/ui/unsafe/ranged_ints4_const.stderr b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints4_const.stderr
similarity index 100%
rename from tests/ui/unsafe/ranged_ints4_const.stderr
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints4_const.stderr
diff --git a/tests/ui/unsafe/ranged_ints_const.rs b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints_const.rs
similarity index 100%
rename from tests/ui/unsafe/ranged_ints_const.rs
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints_const.rs
diff --git a/tests/ui/unsafe/ranged_ints_const.stderr b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints_const.stderr
similarity index 100%
rename from tests/ui/unsafe/ranged_ints_const.stderr
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints_const.stderr
diff --git a/tests/ui/unsafe/ranged_ints_macro.rs b/tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints_macro.rs
similarity index 100%
rename from tests/ui/unsafe/ranged_ints_macro.rs
rename to tests/ui/unsafe/rustc_layout_scalar_valid_range/ranged_ints_macro.rs