diff --git a/shim_et/xplat/executorch/build/runtime_wrapper.bzl b/shim_et/xplat/executorch/build/runtime_wrapper.bzl
index 5bfba568423..79bc6c7e699 100644
--- a/shim_et/xplat/executorch/build/runtime_wrapper.bzl
+++ b/shim_et/xplat/executorch/build/runtime_wrapper.bzl
@@ -268,6 +268,7 @@ def _cxx_test(*args, **kwargs):
     kwargs["deps"].append("//executorch/test/utils:utils")
 
     _patch_kwargs_cxx(kwargs)
+    env.patch_headers(kwargs)
     _patch_build_mode_flags(kwargs)
     _patch_test_compiler_flags(kwargs)