diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh
index 3a19838624f..11701ceb16e 100755
--- a/ci/test/03_test_script.sh
+++ b/ci/test/03_test_script.sh
@@ -243,9 +243,12 @@ if [[ "${RUN_IWYU}" == true ]]; then
   run_iwyu() {
     mv "${BASE_BUILD_DIR}/$1" "${BASE_BUILD_DIR}/compile_commands.json"
     {
-      python3 "/include-what-you-use/iwyu_tool.py" \
-             -p "${BASE_BUILD_DIR}" "${MAKEJOBS}" \
-             -- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_ROOT_DIR}/contrib/devtools/iwyu/bitcoin.core.imp" \
+      python3 /include-what-you-use/mapgen/iwyu-mapgen-clang-intrin.py --lang imp "$("clang-${IWYU_LLVM_V}" -print-resource-dir)/include" > "${BASE_BUILD_DIR}/clang.intrinsics.imp"
+      python3 /include-what-you-use/iwyu_tool.py \
+             -p "${BASE_BUILD_DIR}" "${MAKEJOBS}" -- \
+             -Xiwyu --cxx17ns \
+             -Xiwyu --mapping_file="${BASE_ROOT_DIR}/contrib/devtools/iwyu/bitcoin.core.imp" \
+             -Xiwyu --mapping_file="${BASE_BUILD_DIR}/clang.intrinsics.imp" \
              -Xiwyu --max_line_length=160 \
              -Xiwyu --check_also='*/common/types\.h' \
              -Xiwyu --check_also='*/consensus/*\.h' \
diff --git a/contrib/devtools/iwyu/bitcoin.core.imp b/contrib/devtools/iwyu/bitcoin.core.imp
index 9b471cb82f2..c4c4ba4cebd 100644
--- a/contrib/devtools/iwyu/bitcoin.core.imp
+++ b/contrib/devtools/iwyu/bitcoin.core.imp
@@ -1,8 +1,3 @@
+# Nothing for now.
 [
-  # Compiler intrinsics.
-  # See: https://github.com/include-what-you-use/include-what-you-use/issues/1764.
-  { "include": [ "<emmintrin.h>", "private", "<immintrin.h>", "public" ] },
-  { "include": [ "<mmintrin.h>", "private", "<immintrin.h>", "public" ] },
-  { "include": [ "<smmintrin.h>", "private", "<immintrin.h>", "public" ] },
-  { "include": [ "<tmmintrin.h>", "private", "<immintrin.h>", "public" ] },
 ]