diff --git a/example/Jamfile b/example/Jamfile
index 0e27f6bb..c03c99a2 100644
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -80,8 +80,8 @@ for local example in $(order_examples)
 # Other examples that need a Python script
 run_python_example patch_updates : run_patch_updates.py : patch_updates.cpp ;
 run_python_example dynamic_filters : run_dynamic_filters.py : dynamic_filters.cpp /boost/mysql/test//boost_context_lib ;
-run_python_example batch_inserts : run_batch_inserts.py : batch_inserts.cpp /boost/json//boost_json ;
-run_python_example batch_inserts_generic : run_batch_inserts.py : batch_inserts_generic.cpp /boost/json//boost_json ;
+run_python_example batch_inserts : run_batch_inserts.py : batch_inserts.cpp /boost/mysql/test//boost_json_lib ;
+run_python_example batch_inserts_generic : run_batch_inserts.py : batch_inserts_generic.cpp /boost/mysql/test//boost_json_lib ;
 
 # UNIX. Don't run under Windows systems
 run
@@ -110,9 +110,9 @@ run
         connection_pool/server.cpp
         /boost/mysql/test//boost_mysql_compiled
         /boost/mysql/test//boost_context_lib
-        /boost/json//boost_json
+        /boost/mysql/test//boost_json_lib
         /boost/url//boost_url
-        /boost/beast//boost_beast
+        /boost/mysql/test//boost_beast_lib
     : requirements
             <testing.launcher>"python $(this_dir)/private/run_connection_pool.py"
             <testing.arg>$(hostname)
diff --git a/test/Jamfile b/test/Jamfile
index 513e889c..d7a3006d 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -26,6 +26,10 @@ feature.feature boost.mysql.use-ts-executor : off on : propagated composite ;
 # Support builds forcing !BOOST_ASIO_HAS_LOCAL_SOCKETS
 feature.feature boost.mysql.disable-local-sockets : off on : propagated composite ;
 
+# Support valgrind
+feature.feature boost.mysql.valgrind : off on : propagated composite ;
+feature.compose <boost.mysql.valgrind>on : <define>BOOST_USE_VALGRIND ;
+
 # Configure openssl if it hasn't been done yet
 using openssl ;
 
@@ -136,6 +140,10 @@ alias boost_context_lib
         <toolset>gcc-14:<cxxflags>-fcf-protection=none
     ;
 
+# Beast and JSON depend on Container, which causes trouble with <warnings-as-errors>on
+alias boost_beast_lib : /boost/beast//boost_beast/<warnings-as-errors>off ;
+alias boost_json_lib : /boost/json//boost_json/<warnings-as-errors>off ;
+
 alias boost_mysql_test
     :
         boost_mysql_compiled
@@ -152,7 +160,7 @@ alias boost_mysql_test
 # an intermediate Python runner, so just setting testing.launcher globally is incorrect
 alias launch_with_valgrind
     : usage-requirements
-        <valgrind>on:<testing.launcher>"valgrind --leak-check=full --error-limit=yes --error-exitcode=1 --gen-suppressions=all"
+        <boost.mysql.valgrind>on:<testing.launcher>"valgrind --leak-check=full --error-limit=yes --error-exitcode=1 --gen-suppressions=all"
     ;
 
 build-project unit ;
diff --git a/tools/ci/ci_util/b2.py b/tools/ci/ci_util/b2.py
index f581354a..bbc5e0e4 100644
--- a/tools/ci/ci_util/b2.py
+++ b/tools/ci/ci_util/b2.py
@@ -82,7 +82,7 @@ def b2_build(
         _conditional('address-sanitizer=norecover', address_sanitizer),
         _conditional('undefined-sanitizer=norecover', undefined_sanitizer),
         _conditional('coverage=on', coverage),
-        _conditional('valgrind=on', valgrind),
+        _conditional('boost.mysql.valgrind=on', valgrind),
         'warnings=extra',
         'warnings-as-errors=on',
         '-j4',