diff --git a/scripts/build-unit-test-docker b/scripts/build-unit-test-docker
index 2b391fd..398fb3c 100755
--- a/scripts/build-unit-test-docker
+++ b/scripts/build-unit-test-docker
@@ -92,7 +92,7 @@
                 f" --prefix={prefix} --with-libraries=context,coroutine,url"
             ),
             "./b2",
-            f"./b2 install --prefix={prefix}",
+            f"./b2 install --prefix={prefix} valgrind=on",
         ],
     ),
     "USCiLab/cereal": PackageDef(
diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index 8186e6f..d669309 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -759,11 +759,17 @@
             check_call_cmd(
                 "cmake",
                 "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
+                "-DCMAKE_CXX_FLAGS='-DBOOST_USE_VALGRIND'",
                 "-DITESTS=ON",
                 ".",
             )
         else:
-            check_call_cmd("cmake", "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON", ".")
+            check_call_cmd(
+                "cmake",
+                "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
+                "-DCMAKE_CXX_FLAGS='-DBOOST_USE_VALGRIND'",
+                ".",
+            )
 
     def build(self):
         check_call_cmd(
@@ -915,6 +921,7 @@
             "-Db_colorout=never",
             "-Dwerror=true",
             "-Dwarning_level=3",
+            "-Dcpp_args='-DBOOST_USE_VALGRIND'",
         ]
         if build_for_testing:
             # -Ddebug=true -Doptimization=g is helpful for abi-dumper but isn't a combination that