diff --git a/tools/ci/amd64/clang/msan.sh b/tools/ci/amd64/clang/msan.sh
index 6f1539e..2d6bdcd 100755
--- a/tools/ci/amd64/clang/msan.sh
+++ b/tools/ci/amd64/clang/msan.sh
@@ -8,16 +8,21 @@ Xvfb :99 -screen 0 1024x768x16 &
 export CXX=$(which clang++)
 export CC=$(which clang)
 export DISPLAY=:99
+export PKG_CONFIG_PATH=/msan/lib/pkgconfig:${PKG_CONFIG_PATH}
 
 cmake . \
 -Bbuild \
 -GNinja \
+-DCMAKE_INCLUDE_PATH=/msan/include \
+-DCMAKE_LIBRARY_PATH=/msan/lib \
+-DCMAKE_PREFIX_PATH=/msan \
 -DCMAKE_LINKER_TYPE=MOLD \
 -DENABLE_UNIT_TESTS=ON \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_CXX_FLAGS=" \
 -fsanitize=memory \
 -fsanitize-memory-track-origins \
+-fsanitize-ignorelist=$(git rev-parse --show-toplevel)/tools/ci/amd64/clang/msan.blacklist \
 -g \
 -fno-omit-frame-pointer \
 -std=c++23 \
@@ -26,13 +31,14 @@ cmake . \
 -DCMAKE_EXE_LINKER_FLAGS=" \
 -fsanitize=memory \
 -fsanitize-memory-track-origins \
+-L/msan/lib -Wl,-rpath,/msan/lib \
 -L/libcxx_msan/lib -Wl,-rpath,/libcxx_msan/lib \
 -lc++ \
 -lc++abi" \
 && cmake --build ./build --target='surface_tests' -j`nproc`
 
 export MSAN_SYMBOLIZER_PATH="$(which llvm-symbolizer)"
-export MSAN_OPTIONS="suppressions=$(git rev-parse --show-toplevel)/tools/ci/amd64/clang/msan.supp:fast_unwind_on_malloc=0:verbosity=1"
+export MSAN_OPTIONS="fast_unwind_on_malloc=0:verbosity=1"
 for test in $(find ./build -type f -name '*_tests' -executable); do
   echo "Running $test"
   "$test"