diff --git a/tests/codegen/sanitizer-cfi-add-canonical-jump-tables-flag.rs b/tests/codegen/sanitizer/cfi-add-canonical-jump-tables-flag.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-add-canonical-jump-tables-flag.rs
rename to tests/codegen/sanitizer/cfi-add-canonical-jump-tables-flag.rs
diff --git a/tests/codegen/sanitizer-cfi-add-enable-split-lto-unit-flag.rs b/tests/codegen/sanitizer/cfi-add-enable-split-lto-unit-flag.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-add-enable-split-lto-unit-flag.rs
rename to tests/codegen/sanitizer/cfi-add-enable-split-lto-unit-flag.rs
diff --git a/tests/codegen/sanitizer-cfi-emit-type-checks-attr-no-sanitize.rs b/tests/codegen/sanitizer/cfi-emit-type-checks-attr-no-sanitize.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-emit-type-checks-attr-no-sanitize.rs
rename to tests/codegen/sanitizer/cfi-emit-type-checks-attr-no-sanitize.rs
diff --git a/tests/codegen/sanitizer-cfi-emit-type-checks.rs b/tests/codegen/sanitizer/cfi-emit-type-checks.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-emit-type-checks.rs
rename to tests/codegen/sanitizer/cfi-emit-type-checks.rs
diff --git a/tests/codegen/sanitizer-cfi-emit-type-metadata-attr-cfi-encoding.rs b/tests/codegen/sanitizer/cfi-emit-type-metadata-attr-cfi-encoding.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-emit-type-metadata-attr-cfi-encoding.rs
rename to tests/codegen/sanitizer/cfi-emit-type-metadata-attr-cfi-encoding.rs
diff --git a/tests/codegen/sanitizer-cfi-emit-type-metadata-id-itanium-cxx-abi.rs b/tests/codegen/sanitizer/cfi-emit-type-metadata-id-itanium-cxx-abi.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-emit-type-metadata-id-itanium-cxx-abi.rs
rename to tests/codegen/sanitizer/cfi-emit-type-metadata-id-itanium-cxx-abi.rs
diff --git a/tests/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi-generalized.rs b/tests/codegen/sanitizer/cfi-emit-type-metadata-itanium-cxx-abi-generalized.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi-generalized.rs
rename to tests/codegen/sanitizer/cfi-emit-type-metadata-itanium-cxx-abi-generalized.rs
diff --git a/tests/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi-normalized-generalized.rs b/tests/codegen/sanitizer/cfi-emit-type-metadata-itanium-cxx-abi-normalized-generalized.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi-normalized-generalized.rs
rename to tests/codegen/sanitizer/cfi-emit-type-metadata-itanium-cxx-abi-normalized-generalized.rs
diff --git a/tests/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi-normalized.rs b/tests/codegen/sanitizer/cfi-emit-type-metadata-itanium-cxx-abi-normalized.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi-normalized.rs
rename to tests/codegen/sanitizer/cfi-emit-type-metadata-itanium-cxx-abi-normalized.rs
diff --git a/tests/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi.rs b/tests/codegen/sanitizer/cfi-emit-type-metadata-itanium-cxx-abi.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi.rs
rename to tests/codegen/sanitizer/cfi-emit-type-metadata-itanium-cxx-abi.rs
diff --git a/tests/codegen/sanitizer-cfi-emit-type-metadata-trait-objects.rs b/tests/codegen/sanitizer/cfi-emit-type-metadata-trait-objects.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-emit-type-metadata-trait-objects.rs
rename to tests/codegen/sanitizer/cfi-emit-type-metadata-trait-objects.rs
diff --git a/tests/codegen/sanitizer-cfi-generalize-pointers.rs b/tests/codegen/sanitizer/cfi-generalize-pointers.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-generalize-pointers.rs
rename to tests/codegen/sanitizer/cfi-generalize-pointers.rs
diff --git a/tests/codegen/sanitizer-cfi-normalize-integers.rs b/tests/codegen/sanitizer/cfi-normalize-integers.rs
similarity index 100%
rename from tests/codegen/sanitizer-cfi-normalize-integers.rs
rename to tests/codegen/sanitizer/cfi-normalize-integers.rs
diff --git a/tests/codegen/sanitizer-kasan-emits-instrumentation.rs b/tests/codegen/sanitizer/kasan-emits-instrumentation.rs
similarity index 100%
rename from tests/codegen/sanitizer-kasan-emits-instrumentation.rs
rename to tests/codegen/sanitizer/kasan-emits-instrumentation.rs
diff --git a/tests/codegen/sanitizer-kcfi-add-kcfi-flag.rs b/tests/codegen/sanitizer/kcfi-add-kcfi-flag.rs
similarity index 100%
rename from tests/codegen/sanitizer-kcfi-add-kcfi-flag.rs
rename to tests/codegen/sanitizer/kcfi-add-kcfi-flag.rs
diff --git a/tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-attr-no-sanitize.rs b/tests/codegen/sanitizer/kcfi-emit-kcfi-operand-bundle-attr-no-sanitize.rs
similarity index 100%
rename from tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-attr-no-sanitize.rs
rename to tests/codegen/sanitizer/kcfi-emit-kcfi-operand-bundle-attr-no-sanitize.rs
diff --git a/tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi-generalized.rs b/tests/codegen/sanitizer/kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi-generalized.rs
similarity index 100%
rename from tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi-generalized.rs
rename to tests/codegen/sanitizer/kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi-generalized.rs
diff --git a/tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi-normalized-generalized.rs b/tests/codegen/sanitizer/kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi-normalized-generalized.rs
similarity index 100%
rename from tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi-normalized-generalized.rs
rename to tests/codegen/sanitizer/kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi-normalized-generalized.rs
diff --git a/tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi-normalized.rs b/tests/codegen/sanitizer/kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi-normalized.rs
similarity index 100%
rename from tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi-normalized.rs
rename to tests/codegen/sanitizer/kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi-normalized.rs
diff --git a/tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi.rs b/tests/codegen/sanitizer/kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi.rs
similarity index 100%
rename from tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi.rs
rename to tests/codegen/sanitizer/kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi.rs
diff --git a/tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle.rs b/tests/codegen/sanitizer/kcfi-emit-kcfi-operand-bundle.rs
similarity index 100%
rename from tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle.rs
rename to tests/codegen/sanitizer/kcfi-emit-kcfi-operand-bundle.rs
diff --git a/tests/codegen/sanitizer-kcfi-emit-type-metadata-trait-objects.rs b/tests/codegen/sanitizer/kcfi-emit-type-metadata-trait-objects.rs
similarity index 100%
rename from tests/codegen/sanitizer-kcfi-emit-type-metadata-trait-objects.rs
rename to tests/codegen/sanitizer/kcfi-emit-type-metadata-trait-objects.rs
diff --git a/tests/codegen/sanitizer-memory-track-orgins.rs b/tests/codegen/sanitizer/memory-track-origins.rs
similarity index 100%
rename from tests/codegen/sanitizer-memory-track-orgins.rs
rename to tests/codegen/sanitizer/memory-track-origins.rs
diff --git a/tests/codegen/sanitizer_memtag_attr_check.rs b/tests/codegen/sanitizer/memtag-attr-check.rs
similarity index 100%
rename from tests/codegen/sanitizer_memtag_attr_check.rs
rename to tests/codegen/sanitizer/memtag-attr-check.rs
diff --git a/tests/codegen/sanitizer-no-sanitize-inlining.rs b/tests/codegen/sanitizer/no-sanitize-inlining.rs
similarity index 100%
rename from tests/codegen/sanitizer-no-sanitize-inlining.rs
rename to tests/codegen/sanitizer/no-sanitize-inlining.rs
diff --git a/tests/codegen/sanitizer-no-sanitize.rs b/tests/codegen/sanitizer/no-sanitize.rs
similarity index 100%
rename from tests/codegen/sanitizer-no-sanitize.rs
rename to tests/codegen/sanitizer/no-sanitize.rs
diff --git a/tests/codegen/sanitizer-safestack-attr-check.rs b/tests/codegen/sanitizer/safestack-attr-check.rs
similarity index 100%
rename from tests/codegen/sanitizer-safestack-attr-check.rs
rename to tests/codegen/sanitizer/safestack-attr-check.rs
diff --git a/tests/codegen/sanitizer-recover.rs b/tests/codegen/sanitizer/sanitizer-recover.rs
similarity index 100%
rename from tests/codegen/sanitizer-recover.rs
rename to tests/codegen/sanitizer/sanitizer-recover.rs
diff --git a/tests/codegen/sanitizer_scs_attr_check.rs b/tests/codegen/sanitizer/scs-attr-check.rs
similarity index 100%
rename from tests/codegen/sanitizer_scs_attr_check.rs
rename to tests/codegen/sanitizer/scs-attr-check.rs