diff --git a/kani-driver/src/call_single_file.rs b/kani-driver/src/call_single_file.rs
index fc41bac69d9c..4e8086e7e37b 100644
--- a/kani-driver/src/call_single_file.rs
+++ b/kani-driver/src/call_single_file.rs
@@ -123,7 +123,7 @@ impl KaniSession {
                 "-Z",
                 "panic_abort_tests=yes",
                 "-Z",
-                "sanitizer=address",
+                "mir-enable-passes=-RemoveStorageMarkers",
             ]
             .map(OsString::from),
         );
diff --git a/tools/build-kani/src/sysroot.rs b/tools/build-kani/src/sysroot.rs
index 3a6239106826..b831ed0d63a8 100644
--- a/tools/build-kani/src/sysroot.rs
+++ b/tools/build-kani/src/sysroot.rs
@@ -124,7 +124,14 @@ fn build_kani_lib(
         "--message-format",
         "json-diagnostic-rendered-ansi",
     ];
-    let mut rustc_args = vec!["--cfg=kani", "--cfg=kani_sysroot", "-Z", "always-encode-mir"];
+    let mut rustc_args = vec![
+        "--cfg=kani",
+        "--cfg=kani_sysroot",
+        "-Z",
+        "always-encode-mir",
+        "-Z",
+        "mir-enable-passes=-RemoveStorageMarkers",
+    ];
     rustc_args.extend_from_slice(extra_rustc_args);
     let mut cmd = Command::new("cargo")
         .env("CARGO_ENCODED_RUSTFLAGS", rustc_args.join("\x1f"))