diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index 51af8898470..dd45d00f935 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -3797,9 +3797,9 @@
 "ui/rust-2018/uniform-paths/issue-56596-2.rs",
 "ui/rust-2018/uniform-paths/issue-56596.rs",
 "ui/rust-2018/uniform-paths/issue-87932.rs",
-"ui/sanitize/issue-111184-coroutine-witness.rs",
-"ui/sanitize/issue-114275-cfi-const-expr-in-arry-len.rs",
-"ui/sanitize/issue-72154-lifetime-markers.rs",
+"ui/sanitizer/issue-111184-cfi-coroutine-witness.rs",
+"ui/sanitizer/issue-114275-cfi-const-expr-in-arry-len.rs",
+"ui/sanitizer/issue-72154-address-lifetime-markers.rs",
 "ui/self/issue-61882-2.rs",
 "ui/self/issue-61882.rs",
 "ui/simd/intrinsic/issue-85855.rs",
diff --git a/tests/ui/sanitize/address.rs b/tests/ui/sanitizer/address.rs
similarity index 100%
rename from tests/ui/sanitize/address.rs
rename to tests/ui/sanitizer/address.rs
diff --git a/tests/ui/sanitize/badfree.rs b/tests/ui/sanitizer/badfree.rs
similarity index 100%
rename from tests/ui/sanitize/badfree.rs
rename to tests/ui/sanitizer/badfree.rs
diff --git a/tests/ui/sanitize/cfg-kasan.rs b/tests/ui/sanitizer/cfg-kasan.rs
similarity index 100%
rename from tests/ui/sanitize/cfg-kasan.rs
rename to tests/ui/sanitizer/cfg-kasan.rs
diff --git a/tests/ui/sanitize/cfg.rs b/tests/ui/sanitizer/cfg.rs
similarity index 100%
rename from tests/ui/sanitize/cfg.rs
rename to tests/ui/sanitizer/cfg.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.rs b/tests/ui/sanitizer/cfi-canonical-jump-tables-requires-cfi.rs
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.rs
rename to tests/ui/sanitizer/cfi-canonical-jump-tables-requires-cfi.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.stderr b/tests/ui/sanitizer/cfi-canonical-jump-tables-requires-cfi.stderr
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.stderr
rename to tests/ui/sanitizer/cfi-canonical-jump-tables-requires-cfi.stderr
diff --git a/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-attr-cfg.rs b/tests/ui/sanitizer/cfi-generalize-pointers-attr-cfg.rs
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-generalize-pointers-attr-cfg.rs
rename to tests/ui/sanitizer/cfi-generalize-pointers-attr-cfg.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.rs b/tests/ui/sanitizer/cfi-generalize-pointers-requires-cfi.rs
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.rs
rename to tests/ui/sanitizer/cfi-generalize-pointers-requires-cfi.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.stderr b/tests/ui/sanitizer/cfi-generalize-pointers-requires-cfi.stderr
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.stderr
rename to tests/ui/sanitizer/cfi-generalize-pointers-requires-cfi.stderr
diff --git a/tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.rs b/tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.rs
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.rs
rename to tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.stderr b/tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.stderr
similarity index 76%
rename from tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.stderr
rename to tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.stderr
index b9e9722da23..93ec134241e 100644
--- a/tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.stderr
+++ b/tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.stderr
@@ -1,5 +1,5 @@
 error: malformed `cfi_encoding` attribute input
-  --> $DIR/sanitizer-cfi-invalid-attr-cfi-encoding.rs:10:1
+  --> $DIR/cfi-invalid-attr-cfi-encoding.rs:10:1
    |
 LL | #[cfi_encoding]
    | ^^^^^^^^^^^^^^^ help: must be of the form: `#[cfi_encoding = "encoding"]`
diff --git a/tests/ui/sanitize/sanitizer-cfi-is-incompatible-with-sanitizer-kcfi.aarch64.stderr b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.aarch64.stderr
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-is-incompatible-with-sanitizer-kcfi.aarch64.stderr
rename to tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.aarch64.stderr
diff --git a/tests/ui/sanitize/sanitizer-cfi-is-incompatible-with-sanitizer-kcfi.rs b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.rs
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-is-incompatible-with-sanitizer-kcfi.rs
rename to tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-is-incompatible-with-sanitizer-kcfi.x86_64.stderr b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.x86_64.stderr
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-is-incompatible-with-sanitizer-kcfi.x86_64.stderr
rename to tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.x86_64.stderr
diff --git a/tests/ui/sanitize/sanitizer-cfi-normalize-integers-attr-cfg.rs b/tests/ui/sanitizer/cfi-normalize-integers-attr-cfg.rs
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-normalize-integers-attr-cfg.rs
rename to tests/ui/sanitizer/cfi-normalize-integers-attr-cfg.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.rs b/tests/ui/sanitizer/cfi-normalize-integers-requires-cfi.rs
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.rs
rename to tests/ui/sanitizer/cfi-normalize-integers-requires-cfi.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.stderr b/tests/ui/sanitizer/cfi-normalize-integers-requires-cfi.stderr
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.stderr
rename to tests/ui/sanitizer/cfi-normalize-integers-requires-cfi.stderr
diff --git a/tests/ui/sanitize/sanitizer-cfi-requires-lto.rs b/tests/ui/sanitizer/cfi-requires-lto.rs
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-requires-lto.rs
rename to tests/ui/sanitizer/cfi-requires-lto.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-requires-lto.stderr b/tests/ui/sanitizer/cfi-requires-lto.stderr
similarity index 100%
rename from tests/ui/sanitize/sanitizer-cfi-requires-lto.stderr
rename to tests/ui/sanitizer/cfi-requires-lto.stderr
diff --git a/tests/ui/sanitize/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/sanitize/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/sanitize/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/sanitize/sanitizer-cfi-with-rustc-lto-requires-single-codegen-unit.stderr
rename to tests/ui/sanitizer/cfi-with-rustc-lto-requires-single-codegen-unit.stderr
diff --git a/tests/ui/sanitize/crt-static.rs b/tests/ui/sanitizer/crt-static.rs
similarity index 100%
rename from tests/ui/sanitize/crt-static.rs
rename to tests/ui/sanitizer/crt-static.rs
diff --git a/tests/ui/sanitize/crt-static.stderr b/tests/ui/sanitizer/crt-static.stderr
similarity index 100%
rename from tests/ui/sanitize/crt-static.stderr
rename to tests/ui/sanitizer/crt-static.stderr
diff --git a/tests/ui/sanitize/hwaddress.rs b/tests/ui/sanitizer/hwaddress.rs
similarity index 100%
rename from tests/ui/sanitize/hwaddress.rs
rename to tests/ui/sanitizer/hwaddress.rs
diff --git a/tests/ui/sanitize/incompatible.rs b/tests/ui/sanitizer/incompatible.rs
similarity index 100%
rename from tests/ui/sanitize/incompatible.rs
rename to tests/ui/sanitizer/incompatible.rs
diff --git a/tests/ui/sanitize/incompatible.stderr b/tests/ui/sanitizer/incompatible.stderr
similarity index 100%
rename from tests/ui/sanitize/incompatible.stderr
rename to tests/ui/sanitizer/incompatible.stderr
diff --git a/tests/ui/sanitize/inline-always.rs b/tests/ui/sanitizer/inline-always.rs
similarity index 100%
rename from tests/ui/sanitize/inline-always.rs
rename to tests/ui/sanitizer/inline-always.rs
diff --git a/tests/ui/sanitize/inline-always.stderr b/tests/ui/sanitizer/inline-always.stderr
similarity index 100%
rename from tests/ui/sanitize/inline-always.stderr
rename to tests/ui/sanitizer/inline-always.stderr
diff --git a/tests/ui/sanitize/issue-111184-coroutine-witness.rs b/tests/ui/sanitizer/issue-111184-cfi-coroutine-witness.rs
similarity index 100%
rename from tests/ui/sanitize/issue-111184-coroutine-witness.rs
rename to tests/ui/sanitizer/issue-111184-cfi-coroutine-witness.rs
diff --git a/tests/ui/sanitize/issue-114275-cfi-const-expr-in-arry-len.rs b/tests/ui/sanitizer/issue-114275-cfi-const-expr-in-arry-len.rs
similarity index 100%
rename from tests/ui/sanitize/issue-114275-cfi-const-expr-in-arry-len.rs
rename to tests/ui/sanitizer/issue-114275-cfi-const-expr-in-arry-len.rs
diff --git a/tests/ui/sanitize/issue-72154-lifetime-markers.rs b/tests/ui/sanitizer/issue-72154-address-lifetime-markers.rs
similarity index 100%
rename from tests/ui/sanitize/issue-72154-lifetime-markers.rs
rename to tests/ui/sanitizer/issue-72154-address-lifetime-markers.rs
diff --git a/tests/ui/sanitize/leak.rs b/tests/ui/sanitizer/leak.rs
similarity index 100%
rename from tests/ui/sanitize/leak.rs
rename to tests/ui/sanitizer/leak.rs
diff --git a/tests/ui/sanitize/memory-eager.rs b/tests/ui/sanitizer/memory-eager.rs
similarity index 100%
rename from tests/ui/sanitize/memory-eager.rs
rename to tests/ui/sanitizer/memory-eager.rs
diff --git a/tests/ui/sanitize/memory-passing.rs b/tests/ui/sanitizer/memory-passing.rs
similarity index 100%
rename from tests/ui/sanitize/memory-passing.rs
rename to tests/ui/sanitizer/memory-passing.rs
diff --git a/tests/ui/sanitize/memory.rs b/tests/ui/sanitizer/memory.rs
similarity index 100%
rename from tests/ui/sanitize/memory.rs
rename to tests/ui/sanitizer/memory.rs
diff --git a/tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs b/tests/ui/sanitizer/new-llvm-pass-manager-thin-lto.rs
similarity index 100%
rename from tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs
rename to tests/ui/sanitizer/new-llvm-pass-manager-thin-lto.rs
diff --git a/tests/ui/sanitize/split-lto-unit-requires-lto.rs b/tests/ui/sanitizer/split-lto-unit-requires-lto.rs
similarity index 100%
rename from tests/ui/sanitize/split-lto-unit-requires-lto.rs
rename to tests/ui/sanitizer/split-lto-unit-requires-lto.rs
diff --git a/tests/ui/sanitize/split-lto-unit-requires-lto.stderr b/tests/ui/sanitizer/split-lto-unit-requires-lto.stderr
similarity index 100%
rename from tests/ui/sanitize/split-lto-unit-requires-lto.stderr
rename to tests/ui/sanitizer/split-lto-unit-requires-lto.stderr
diff --git a/tests/ui/sanitize/thread.rs b/tests/ui/sanitizer/thread.rs
similarity index 100%
rename from tests/ui/sanitize/thread.rs
rename to tests/ui/sanitizer/thread.rs
diff --git a/tests/ui/sanitize/unsupported-target.rs b/tests/ui/sanitizer/unsupported-target.rs
similarity index 100%
rename from tests/ui/sanitize/unsupported-target.rs
rename to tests/ui/sanitizer/unsupported-target.rs
diff --git a/tests/ui/sanitize/unsupported-target.stderr b/tests/ui/sanitizer/unsupported-target.stderr
similarity index 100%
rename from tests/ui/sanitize/unsupported-target.stderr
rename to tests/ui/sanitizer/unsupported-target.stderr
diff --git a/tests/ui/sanitize/use-after-scope.rs b/tests/ui/sanitizer/use-after-scope.rs
similarity index 100%
rename from tests/ui/sanitize/use-after-scope.rs
rename to tests/ui/sanitizer/use-after-scope.rs