diff --git a/tests/ui/sanitizer/cfi-assoc-ty-lifetime-issue-123053.rs b/tests/ui/sanitizer/cfi/assoc-ty-lifetime-issue-123053.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-assoc-ty-lifetime-issue-123053.rs
rename to tests/ui/sanitizer/cfi/assoc-ty-lifetime-issue-123053.rs
diff --git a/tests/ui/sanitizer/cfi-async-closures.rs b/tests/ui/sanitizer/cfi/async-closures.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-async-closures.rs
rename to tests/ui/sanitizer/cfi/async-closures.rs
diff --git a/tests/ui/sanitizer/cfi-can-reveal-opaques.rs b/tests/ui/sanitizer/cfi/can-reveal-opaques.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-can-reveal-opaques.rs
rename to tests/ui/sanitizer/cfi/can-reveal-opaques.rs
diff --git a/tests/ui/sanitizer/cfi-canonical-jump-tables-requires-cfi.rs b/tests/ui/sanitizer/cfi/canonical-jump-tables-requires-cfi.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-canonical-jump-tables-requires-cfi.rs
rename to tests/ui/sanitizer/cfi/canonical-jump-tables-requires-cfi.rs
diff --git a/tests/ui/sanitizer/cfi-canonical-jump-tables-requires-cfi.stderr b/tests/ui/sanitizer/cfi/canonical-jump-tables-requires-cfi.stderr
similarity index 100%
rename from tests/ui/sanitizer/cfi-canonical-jump-tables-requires-cfi.stderr
rename to tests/ui/sanitizer/cfi/canonical-jump-tables-requires-cfi.stderr
diff --git a/tests/ui/sanitizer/cfi-closures.rs b/tests/ui/sanitizer/cfi/closures.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-closures.rs
rename to tests/ui/sanitizer/cfi/closures.rs
diff --git a/tests/ui/sanitizer/cfi-complex-receiver.rs b/tests/ui/sanitizer/cfi/complex-receiver.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-complex-receiver.rs
rename to tests/ui/sanitizer/cfi/complex-receiver.rs
diff --git a/tests/ui/sanitizer/cfi-coroutine.rs b/tests/ui/sanitizer/cfi/coroutine.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-coroutine.rs
rename to tests/ui/sanitizer/cfi/coroutine.rs
diff --git a/tests/ui/sanitizer/cfi-drop-in-place.rs b/tests/ui/sanitizer/cfi/drop-in-place.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-drop-in-place.rs
rename to tests/ui/sanitizer/cfi/drop-in-place.rs
diff --git a/tests/ui/sanitizer/cfi-drop-no-principal.rs b/tests/ui/sanitizer/cfi/drop-no-principal.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-drop-no-principal.rs
rename to tests/ui/sanitizer/cfi/drop-no-principal.rs
diff --git a/tests/ui/sanitizer/cfi-fn-ptr.rs b/tests/ui/sanitizer/cfi/fn-ptr.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-fn-ptr.rs
rename to tests/ui/sanitizer/cfi/fn-ptr.rs
diff --git a/tests/ui/sanitizer/cfi-generalize-pointers-attr-cfg.rs b/tests/ui/sanitizer/cfi/generalize-pointers-attr-cfg.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-generalize-pointers-attr-cfg.rs
rename to tests/ui/sanitizer/cfi/generalize-pointers-attr-cfg.rs
diff --git a/tests/ui/sanitizer/cfi-generalize-pointers-requires-cfi.rs b/tests/ui/sanitizer/cfi/generalize-pointers-requires-cfi.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-generalize-pointers-requires-cfi.rs
rename to tests/ui/sanitizer/cfi/generalize-pointers-requires-cfi.rs
diff --git a/tests/ui/sanitizer/cfi-generalize-pointers-requires-cfi.stderr b/tests/ui/sanitizer/cfi/generalize-pointers-requires-cfi.stderr
similarity index 100%
rename from tests/ui/sanitizer/cfi-generalize-pointers-requires-cfi.stderr
rename to tests/ui/sanitizer/cfi/generalize-pointers-requires-cfi.stderr
diff --git a/tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.rs b/tests/ui/sanitizer/cfi/invalid-attr-encoding.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.rs
rename to tests/ui/sanitizer/cfi/invalid-attr-encoding.rs
diff --git a/tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.stderr b/tests/ui/sanitizer/cfi/invalid-attr-encoding.stderr
similarity index 79%
rename from tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.stderr
rename to tests/ui/sanitizer/cfi/invalid-attr-encoding.stderr
index 93ec134241e..1aa6bef17b1 100644
--- a/tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.stderr
+++ b/tests/ui/sanitizer/cfi/invalid-attr-encoding.stderr
@@ -1,5 +1,5 @@
 error: malformed `cfi_encoding` attribute input
-  --> $DIR/cfi-invalid-attr-cfi-encoding.rs:10:1
+  --> $DIR/invalid-attr-encoding.rs:10:1
    |
 LL | #[cfi_encoding]
    | ^^^^^^^^^^^^^^^ help: must be of the form: `#[cfi_encoding = "encoding"]`
diff --git a/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.aarch64.stderr b/tests/ui/sanitizer/cfi/is-incompatible-with-kcfi.aarch64.stderr
similarity index 100%
rename from tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.aarch64.stderr
rename to tests/ui/sanitizer/cfi/is-incompatible-with-kcfi.aarch64.stderr
diff --git a/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.rs b/tests/ui/sanitizer/cfi/is-incompatible-with-kcfi.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.rs
rename to tests/ui/sanitizer/cfi/is-incompatible-with-kcfi.rs
diff --git a/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.x86_64.stderr b/tests/ui/sanitizer/cfi/is-incompatible-with-kcfi.x86_64.stderr
similarity index 100%
rename from tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.x86_64.stderr
rename to tests/ui/sanitizer/cfi/is-incompatible-with-kcfi.x86_64.stderr
diff --git a/tests/ui/sanitizer/cfi-normalize-integers-attr-cfg.rs b/tests/ui/sanitizer/cfi/normalize-integers-attr-cfg.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-normalize-integers-attr-cfg.rs
rename to tests/ui/sanitizer/cfi/normalize-integers-attr-cfg.rs
diff --git a/tests/ui/sanitizer/cfi-normalize-integers-requires-cfi.rs b/tests/ui/sanitizer/cfi/normalize-integers-requires-cfi.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-normalize-integers-requires-cfi.rs
rename to tests/ui/sanitizer/cfi/normalize-integers-requires-cfi.rs
diff --git a/tests/ui/sanitizer/cfi-normalize-integers-requires-cfi.stderr b/tests/ui/sanitizer/cfi/normalize-integers-requires-cfi.stderr
similarity index 100%
rename from tests/ui/sanitizer/cfi-normalize-integers-requires-cfi.stderr
rename to tests/ui/sanitizer/cfi/normalize-integers-requires-cfi.stderr
diff --git a/tests/ui/sanitizer/cfi-requires-lto.rs b/tests/ui/sanitizer/cfi/requires-lto.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-requires-lto.rs
rename to tests/ui/sanitizer/cfi/requires-lto.rs
diff --git a/tests/ui/sanitizer/cfi-requires-lto.stderr b/tests/ui/sanitizer/cfi/requires-lto.stderr
similarity index 100%
rename from tests/ui/sanitizer/cfi-requires-lto.stderr
rename to tests/ui/sanitizer/cfi/requires-lto.stderr
diff --git a/tests/ui/sanitizer/cfi-self-ref.rs b/tests/ui/sanitizer/cfi/self-ref.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-self-ref.rs
rename to tests/ui/sanitizer/cfi/self-ref.rs
diff --git a/tests/ui/sanitizer/cfi-sized-associated-ty.rs b/tests/ui/sanitizer/cfi/sized-associated-ty.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-sized-associated-ty.rs
rename to tests/ui/sanitizer/cfi/sized-associated-ty.rs
diff --git a/tests/ui/sanitizer/cfi-supertraits.rs b/tests/ui/sanitizer/cfi/supertraits.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-supertraits.rs
rename to tests/ui/sanitizer/cfi/supertraits.rs
diff --git a/tests/ui/sanitizer/cfi-virtual-auto.rs b/tests/ui/sanitizer/cfi/virtual-auto.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-virtual-auto.rs
rename to tests/ui/sanitizer/cfi/virtual-auto.rs
diff --git a/tests/ui/sanitizer/cfi-with-rustc-lto-requires-single-codegen-unit.rs b/tests/ui/sanitizer/cfi/with-rustc-lto-requires-single-codegen-unit.rs
similarity index 100%
rename from tests/ui/sanitizer/cfi-with-rustc-lto-requires-single-codegen-unit.rs
rename to tests/ui/sanitizer/cfi/with-rustc-lto-requires-single-codegen-unit.rs
diff --git a/tests/ui/sanitizer/cfi-with-rustc-lto-requires-single-codegen-unit.stderr b/tests/ui/sanitizer/cfi/with-rustc-lto-requires-single-codegen-unit.stderr
similarity index 100%
rename from tests/ui/sanitizer/cfi-with-rustc-lto-requires-single-codegen-unit.stderr
rename to tests/ui/sanitizer/cfi/with-rustc-lto-requires-single-codegen-unit.stderr