diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6bd9d914d..a54ebc221 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -251,7 +251,7 @@ jobs:
       - name: Run tests
         run: |
           cd ../boost-root
-          ./b2 -j1 libs/$LIBRARY/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} variant=debug,release
+          ./b2 libs/$LIBRARY/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} variant=debug,release
 
   windows:
     strategy:
@@ -311,7 +311,7 @@ jobs:
         shell: cmd
         run: |
           cd ../boost-root
-          b2 -j1 --abbreviate-paths libs/%LIBRARY%/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} ${{matrix.cxxflags}} variant=debug,release embed-manifest-via=linker
+          b2 --abbreviate-paths libs/%LIBRARY%/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} ${{matrix.cxxflags}} variant=debug,release embed-manifest-via=linker
 
   posix-cmake-subdir:
     strategy:
diff --git a/build.jam b/build.jam
index 7a542302f..ea2f0a076 100644
--- a/build.jam
+++ b/build.jam
@@ -26,7 +26,7 @@ project /boost/property_tree
 
 explicit
     [ alias boost_property_tree : : :
-        : <include>include <library>$(boost_dependencies) ]
+        : <include>include <library>$(boost_dependencies)/<warnings-as-errors>off ]
     [ alias all : examples test ]
     ;
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 69f39cb10..049b6fe81 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,6 +8,4 @@ if(HAVE_BOOST_TEST)
 
 boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::property_tree Boost::format Boost::foreach)
 
-boost_test(TYPE run SOURCES test_property_tree.cpp LINK_LIBRARIES Boost::property_tree Boost::serialization)
-
 endif()
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index f7f91c338..8daa565ce 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -13,19 +13,17 @@ import testing ;
 
 project
     : requirements
-
       <library>/boost/property_tree//boost_property_tree
-
       <link>static
-      <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
-
       <warnings>extra
-      <toolset>msvc:<warnings-as-errors>on
-      <toolset>clang:<warnings-as-errors>on
-      <toolset>gcc:<warnings-as-errors>on
+      <warnings-as-errors>on
+      <target-os>windows:<define>_SCL_SECURE_NO_WARNINGS
+      <target-os>windows:<define>_SCL_SECURE_NO_DEPRECATE
+      <target-os>windows:<define>_CRT_SECURE_NO_WARNINGS
+      <target-os>windows:<define>_CRT_SECURE_NO_DEPRECATE
     ;
 
-run test_property_tree.cpp /boost/serialization//boost_serialization/<warnings>off ;
+run test_property_tree.cpp ;
 run test_rapidxml.cpp ;
 run test_info_parser.cpp ;
 run test_json_parser.cpp ;
@@ -33,14 +31,14 @@ run test_json_parser2.cpp ;
 compile test_json_parser3.cpp ;
 run test_ini_parser.cpp ;
 run test_xml_parser_rapidxml.cpp ;
-
 run test_multi_module1.cpp test_multi_module2.cpp ;
 
 # Ensure that all headers are self-contained.
 for local file in [ glob-tree-ex ../include : *.hpp ]
 {
-    local rel_name = [ path.relative-to ../include $(file) ] ;
-    compile self_contained_header.cpp : <define>HEADER_PATH=$(rel_name) : [ regex.replace $(rel_name) "/" "_" ] ;
+    local rel_path = [ path.relative-to ../include $(file) ] ;
+    local rel_name = [ path.relative-to ../include/boost/property_tree $(file) ] ;
+    compile self_contained_header.cpp : <define>HEADER_PATH=$(rel_path) : [ regex.replace $(rel_name) "/" "_" ] ;
 }
 
 compile ../examples/custom_data_type.cpp ;