diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index 6961da7b1d..9f83d4d6b3 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -58,6 +58,7 @@ jobs:
       - name: Run fuzzer
         run: |
           cd ../boost-root/libs/beast
+          mkdir build
           cd build
           cmake \
             -DCMAKE_CXX_COMPILER=clang++ \
diff --git a/build.jam b/build.jam
index f81936c4c3..0a7f93a153 100644
--- a/build.jam
+++ b/build.jam
@@ -36,39 +36,13 @@ project /boost/beast
     ;
 
 explicit
-    [ alias boost_beast : build//boost_beast ]
-    [ alias boost_beast_asio : build//boost_beast_asio ]
-    [ alias boost_beast_asio_ssl : build//boost_beast_asio_ssl ]
-    [ alias all : boost_beast boost_beast_asio boost_beast_asio_ssl example test ]
-    # Old-style targets. Remove once the rest of Beast changes.
-    [ alias lib-beast : boost_beast ]
-    [ alias lib-asio : boost_beast_asio ]
-    [ alias lib-asio-ssl : boost_beast_asio_ssl ]
+    [ alias boost_beast : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_beast example test ]
     ;
 
 call-if : boost-library beast
-    : install boost_beast boost_beast_asio boost_beast_asio_ssl
     ;
 
 feature.feature boost.beast.allow-deprecated : on off : propagated ;
 feature.feature boost.beast.separate-compilation : on off : propagated ;
 feature.feature boost.beast.valgrind : on off : optional propagated ;
-
-variant beast_coverage
-    : debug
-    : <cxxflags>"-msse4.2 --coverage"
-        <linkflags>"--coverage"
-    ;
-
-variant beast_valgrind
-    : release
-    : <boost.beast.valgrind>on
-    ;
-
-variant beast_ubasan
-    : release
-    : <cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize-recover=address,undefined -fsanitize-blacklist=libs/beast/tools/blacklist.supp"
-        <linkflags>"-fsanitize=address,undefined"
-        <define>BOOST_USE_ASAN=1
-    ;
-
diff --git a/build/Jamfile b/build/Jamfile
deleted file mode 100644
index b27ba56a48..0000000000
--- a/build/Jamfile
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright René Ferdinand Rivera Morell 2023-2024
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-import ac ;
-import-search /boost/config/checks ;
-import config : requires ;
-import os ;
-import path ;
-
-local openssl-root ;
-if [ os.on-windows ]
-{
-    openssl-root ?= [ os.environ OPENSSL_ROOT ] ;
-    if ! $(openssl-root) && [ path.glob "C:/OpenSSL" : lib include ]
-    {
-        openssl-root = "C:/OpenSSL" ;
-    }
-}
-using openssl : : <search>$(openssl-root)/lib <include>$(openssl-root)/include ;
-
-project
-    : source-location ../test
-    : common-requirements
-        <library>$(boost_dependencies)
-        [ requires
-        cxx11_constexpr
-        cxx11_decltype
-        cxx11_hdr_tuple
-        cxx11_template_aliases
-        cxx11_variadic_templates
-        ]
-        <define>BOOST_ALL_NO_LIB=1
-        <define>BOOST_ASIO_SEPARATE_COMPILATION
-        <define>BOOST_ASIO_NO_DEPRECATED=1
-        <define>BOOST_ASIO_DISABLE_BOOST_ARRAY=1
-        <define>BOOST_ASIO_DISABLE_BOOST_BIND=1
-        <define>BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1
-        <define>BOOST_ASIO_DISABLE_BOOST_REGEX=1
-        <define>BOOST_COROUTINES_NO_DEPRECATION_WARNING=1
-        <toolset>msvc:<cxxflags>"/bigobj"
-        <toolset>msvc-14.1:<cxxflags>"/permissive-"
-        <toolset>msvc-14.2:<cxxflags>"/permissive-"
-        <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
-        <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
-        <toolset>msvc:<define>_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING
-        <toolset>msvc:<define>_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING
-        <toolset>msvc,<variant>release:<cxxflags>"/Ob2 /Oi /Ot"
-        <target-os>linux:<define>_XOPEN_SOURCE=600
-        <target-os>linux:<define>_GNU_SOURCE=1
-        <target-os>solaris:<define>_XOPEN_SOURCE=500
-        <target-os>solaris:<define>__EXTENSIONS__
-        <target-os>solaris:<library>socket
-        <target-os>solaris:<library>nsl
-        <target-os>windows:<define>_WIN32_WINNT=0x0601
-        <target-os>windows,<toolset>gcc:<library>ws2_32
-        <target-os>windows,<toolset>gcc:<library>mswsock
-        <target-os>windows,<toolset>gcc-cygwin:<define>__USE_W32_SOCKETS
-        <target-os>hpux,<toolset>gcc:<define>_XOPEN_SOURCE_EXTENDED
-        <target-os>hpux:<library>ipv6
-        <target-os>qnxnto:<library>socket
-        <target-os>haiku:<library>network
-        <boost.beast.valgrind>on:<define>BOOST_USE_VALGRIND
-        <boost.beast.allow-deprecated>on:<define>BOOST_BEAST_ALLOW_DEPRECATED
-        <boost.beast.separate-compilation>on:<define>BOOST_BEAST_SEPARATE_COMPILATION
-    ;
-
-explicit
-    [ searched-lib socket ] # SOLARIS, QNXNTO
-    [ searched-lib nsl ] # SOLARIS
-    [ searched-lib ws2_32 : : <target-os>windows ] # NT
-    [ searched-lib mswsock : : <target-os>windows ] # NT
-    [ searched-lib ipv6 ] # HPUX
-    [ searched-lib network ] # HAIKU
-    ;
-
-lib boost_beast_asio
-    : lib_asio.cpp
-    : requirements
-        <link>static
-    ;
-
-lib boost_beast_asio_ssl
-    : lib_asio_ssl.cpp
-    : requirements
-        <link>static
-        [ ac.check-library /openssl//ssl : <library>/openssl//ssl/<link>shared : <build>no ]
-        [ ac.check-library /openssl//crypto : <library>/openssl//crypto/<link>shared : <build>no ]
-    : usage-requirements
-        [ ac.check-library /openssl//ssl : <library>/openssl//ssl/<link>shared : <build>no ]
-        [ ac.check-library /openssl//crypto : <library>/openssl//crypto/<link>shared : <build>no ]
-    ;
-
-lib boost_beast
-    : lib_beast.cpp
-    : requirements
-    <link>static
-    ;
diff --git a/example/Jamfile b/example/Jamfile
index 001c382426..1fe2d72792 100644
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -21,8 +21,8 @@ project /boost/beast/example
         cxx11_template_aliases
         cxx11_variadic_templates
     ]
-    <library>/boost/beast//lib-asio/<link>static
-    <boost.beast.separate-compilation>on:<library>/boost/beast//lib-beast/<link>static
+    <library>/boost/beast/test//lib-asio/<link>static
+    <boost.beast.separate-compilation>on:<library>/boost/beast/test//lib-beast/<link>static
     <include>..
     ;
 
diff --git a/example/advanced/server-flex-awaitable/Jamfile b/example/advanced/server-flex-awaitable/Jamfile
index d10c6498b8..8b090c54cb 100644
--- a/example/advanced/server-flex-awaitable/Jamfile
+++ b/example/advanced/server-flex-awaitable/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
         <library>/boost/scope//boost_scope
     ;
 
diff --git a/example/advanced/server-flex/Jamfile b/example/advanced/server-flex/Jamfile
index e7bd844aa5..163a489a85 100644
--- a/example/advanced/server-flex/Jamfile
+++ b/example/advanced/server-flex/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe advanced-server-flex :
diff --git a/example/http/client/async-ssl-system-executor/Jamfile b/example/http/client/async-ssl-system-executor/Jamfile
index 732da86319..e85767d799 100644
--- a/example/http/client/async-ssl-system-executor/Jamfile
+++ b/example/http/client/async-ssl-system-executor/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-client-async-ssl-system-executor :
diff --git a/example/http/client/async-ssl/Jamfile b/example/http/client/async-ssl/Jamfile
index c11bcb072d..96e85a19df 100644
--- a/example/http/client/async-ssl/Jamfile
+++ b/example/http/client/async-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-client-async-ssl :
diff --git a/example/http/client/awaitable-ssl/Jamfile b/example/http/client/awaitable-ssl/Jamfile
index 7a3b82669e..d1d9ced7fc 100644
--- a/example/http/client/awaitable-ssl/Jamfile
+++ b/example/http/client/awaitable-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-client-awaitable-ssl :
diff --git a/example/http/client/coro-ssl/Jamfile b/example/http/client/coro-ssl/Jamfile
index f135420326..134808520c 100644
--- a/example/http/client/coro-ssl/Jamfile
+++ b/example/http/client/coro-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-client-coro-ssl :
diff --git a/example/http/client/sync-ssl/Jamfile b/example/http/client/sync-ssl/Jamfile
index c1fabf4797..8f14c52f39 100644
--- a/example/http/client/sync-ssl/Jamfile
+++ b/example/http/client/sync-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-client-sync-ssl :
diff --git a/example/http/server/async-ssl/Jamfile b/example/http/server/async-ssl/Jamfile
index f4cf0204e3..aac0ffa4e3 100644
--- a/example/http/server/async-ssl/Jamfile
+++ b/example/http/server/async-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-server-async-ssl :
diff --git a/example/http/server/coro-ssl/Jamfile b/example/http/server/coro-ssl/Jamfile
index 4f6c7a6a1c..18d5cceba6 100644
--- a/example/http/server/coro-ssl/Jamfile
+++ b/example/http/server/coro-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-server-coro-ssl :
diff --git a/example/http/server/flex/Jamfile b/example/http/server/flex/Jamfile
index f094caa27f..185f1e105b 100644
--- a/example/http/server/flex/Jamfile
+++ b/example/http/server/flex/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-server-flex :
diff --git a/example/http/server/stackless-ssl/Jamfile b/example/http/server/stackless-ssl/Jamfile
index b475246465..3f29861bdf 100644
--- a/example/http/server/stackless-ssl/Jamfile
+++ b/example/http/server/stackless-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-server-stackless-ssl :
diff --git a/example/http/server/sync-ssl/Jamfile b/example/http/server/sync-ssl/Jamfile
index 0ad5e57f5c..79455f07f4 100644
--- a/example/http/server/sync-ssl/Jamfile
+++ b/example/http/server/sync-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-server-sync-ssl :
diff --git a/example/websocket/client/async-ssl-system-executor/Jamfile b/example/websocket/client/async-ssl-system-executor/Jamfile
index 770a93c7d9..e0e20d13be 100644
--- a/example/websocket/client/async-ssl-system-executor/Jamfile
+++ b/example/websocket/client/async-ssl-system-executor/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-client-async-ssl-system-executor :
diff --git a/example/websocket/client/async-ssl/Jamfile b/example/websocket/client/async-ssl/Jamfile
index 1f46a94d9a..3f34af9d31 100644
--- a/example/websocket/client/async-ssl/Jamfile
+++ b/example/websocket/client/async-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-client-async-ssl :
diff --git a/example/websocket/client/coro-ssl/Jamfile b/example/websocket/client/coro-ssl/Jamfile
index 578e623e31..ad2d756c6e 100644
--- a/example/websocket/client/coro-ssl/Jamfile
+++ b/example/websocket/client/coro-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-client-coro-ssl :
diff --git a/example/websocket/client/sync-ssl/Jamfile b/example/websocket/client/sync-ssl/Jamfile
index 0cfec0f688..8ac7bb45ae 100644
--- a/example/websocket/client/sync-ssl/Jamfile
+++ b/example/websocket/client/sync-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-client-sync-ssl :
diff --git a/example/websocket/server/async-ssl/Jamfile b/example/websocket/server/async-ssl/Jamfile
index f9b253a0c6..b66da67882 100644
--- a/example/websocket/server/async-ssl/Jamfile
+++ b/example/websocket/server/async-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-server-async-ssl :
diff --git a/example/websocket/server/coro-ssl/Jamfile b/example/websocket/server/coro-ssl/Jamfile
index 46a6bb3111..c5e0966621 100644
--- a/example/websocket/server/coro-ssl/Jamfile
+++ b/example/websocket/server/coro-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-server-coro-ssl :
diff --git a/example/websocket/server/stackless-ssl/Jamfile b/example/websocket/server/stackless-ssl/Jamfile
index b0eaa4aa2f..7133f1261b 100644
--- a/example/websocket/server/stackless-ssl/Jamfile
+++ b/example/websocket/server/stackless-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-server-stackless-ssl :
diff --git a/example/websocket/server/sync-ssl/Jamfile b/example/websocket/server/sync-ssl/Jamfile
index 55ac35b84f..a33c15db33 100644
--- a/example/websocket/server/sync-ssl/Jamfile
+++ b/example/websocket/server/sync-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-server-sync-ssl :
diff --git a/test/Jamfile b/test/Jamfile
index e5e29f0a17..77fc947ad0 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -7,9 +7,115 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-import testing ;
+import ac ;
 import-search /boost/config/checks ;
 import config : requires ;
+import os ;
+import testing ;
+
+using openssl ;
+
+explicit
+    [ searched-lib socket ] # SOLARIS, QNXNTO
+    [ searched-lib nsl ] # SOLARIS
+    [ searched-lib ws2_32 : : <target-os>windows ] # NT
+    [ searched-lib mswsock : : <target-os>windows ] # NT
+    [ searched-lib ipv6 ] # HPUX
+    [ searched-lib network ] # HAIKU
+    ;
+
+local requirements =
+    <library>$(boost_dependencies)
+    [ requires
+    cxx11_constexpr
+    cxx11_decltype
+    cxx11_hdr_tuple
+    cxx11_template_aliases
+    cxx11_variadic_templates
+    ]
+    <define>BOOST_ALL_NO_LIB=1
+    <define>BOOST_ASIO_SEPARATE_COMPILATION
+    <define>BOOST_ASIO_NO_DEPRECATED=1
+    <define>BOOST_ASIO_DISABLE_BOOST_ARRAY=1
+    <define>BOOST_ASIO_DISABLE_BOOST_BIND=1
+    <define>BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1
+    <define>BOOST_ASIO_DISABLE_BOOST_REGEX=1
+    <define>BOOST_COROUTINES_NO_DEPRECATION_WARNING=1
+    <toolset>msvc:<cxxflags>"/bigobj"
+    <toolset>msvc-14.1:<cxxflags>"/permissive-"
+    <toolset>msvc-14.2:<cxxflags>"/permissive-"
+    <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
+    <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
+    <toolset>msvc:<define>_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING
+    <toolset>msvc:<define>_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING
+    <toolset>msvc,<variant>release:<cxxflags>"/Ob2 /Oi /Ot"
+    <target-os>linux:<define>_XOPEN_SOURCE=600
+    <target-os>linux:<define>_GNU_SOURCE=1
+    <target-os>solaris:<define>_XOPEN_SOURCE=500
+    <target-os>solaris:<define>__EXTENSIONS__
+    <target-os>solaris:<library>socket
+    <target-os>solaris:<library>nsl
+    <target-os>windows:<define>_WIN32_WINNT=0x0601
+    <target-os>windows,<toolset>gcc:<library>ws2_32
+    <target-os>windows,<toolset>gcc:<library>mswsock
+    <target-os>windows,<toolset>gcc-cygwin:<define>__USE_W32_SOCKETS
+    <target-os>hpux,<toolset>gcc:<define>_XOPEN_SOURCE_EXTENDED
+    <target-os>hpux:<library>ipv6
+    <target-os>qnxnto:<library>socket
+    <target-os>haiku:<library>network
+    <boost.beast.valgrind>on:<define>BOOST_USE_VALGRIND
+    <boost.beast.allow-deprecated>on:<define>BOOST_BEAST_ALLOW_DEPRECATED
+    <boost.beast.separate-compilation>on:<define>BOOST_BEAST_SEPARATE_COMPILATION
+    ;
+
+lib lib-asio
+    : lib_asio.cpp
+    : requirements
+        $(requirements)
+        <link>static
+    : usage-requirements
+        $(requirements)
+    ;
+
+lib lib-asio-ssl
+    : lib_asio_ssl.cpp
+    : requirements
+        $(requirements)
+        <link>static
+        [ ac.check-library /openssl//ssl : <library>/openssl//ssl/<link>shared : <build>no ]
+        [ ac.check-library /openssl//crypto : <library>/openssl//crypto/<link>shared : <build>no ]
+    : usage-requirements
+        $(requirements)
+        [ ac.check-library /openssl//ssl : <library>/openssl//ssl/<link>shared : <build>no ]
+        [ ac.check-library /openssl//crypto : <library>/openssl//crypto/<link>shared : <build>no ]
+    ;
+
+lib lib-beast
+    : lib_beast.cpp
+    : requirements
+        $(requirements)
+        <link>static
+    : usage-requirements
+        $(requirements)
+    ;
+
+variant beast_coverage
+    : debug
+    : <cxxflags>"-msse4.2 --coverage"
+        <linkflags>"--coverage"
+    ;
+
+variant beast_valgrind
+    : release
+    : <boost.beast.valgrind>on
+    ;
+
+variant beast_ubasan
+    : release
+    : <cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize-recover=address,undefined -fsanitize-blacklist=libs/beast/tools/blacklist.supp"
+        <linkflags>"-fsanitize=address,undefined"
+        <define>BOOST_USE_ASAN=1
+    ;
 
 project /boost/beast/test
     : requirements
@@ -23,8 +129,8 @@ project /boost/beast/test
     ]
     <define>BOOST_BEAST_TESTS
     <target-os>darwin:<define>Z_HAVE_UNISTD_H=1
-    <library>/boost/beast//lib-asio/<link>static
-    <boost.beast.separate-compilation>on:<library>/boost/beast//lib-beast/<link>static
+    <library>/boost/beast/test//lib-asio/<link>static
+    <boost.beast.separate-compilation>on:<library>/boost/beast/test//lib-beast/<link>static
     <library>/boost/filesystem//boost_filesystem/<link>static
     <library>/boost/context//boost_context/<link>static
     <address-sanitizer>norecover:<context-impl>ucontext
diff --git a/test/beast/Jamfile b/test/beast/Jamfile
index e655a8a156..dd96e5caa8 100644
--- a/test/beast/Jamfile
+++ b/test/beast/Jamfile
@@ -10,7 +10,7 @@
 alias run-tests :
     [ compile core.cpp ]
     [ compile http.cpp ]
-    [ compile ssl.cpp /boost/beast//lib-asio-ssl ]
+    [ compile ssl.cpp /boost/beast/test//lib-asio-ssl ]
     [ compile version.cpp ]
     [ compile websocket.cpp ]
     [ compile zlib.cpp ]
diff --git a/test/beast/_experimental/Jamfile b/test/beast/_experimental/Jamfile
index a9b2d9f8a2..044eabeb17 100644
--- a/test/beast/_experimental/Jamfile
+++ b/test/beast/_experimental/Jamfile
@@ -19,7 +19,7 @@ local RUN_TESTS ;
 for local f in $(SOURCES)
 {
     RUN_TESTS += [ run $(f)
-        /boost/beast//lib-asio-ssl
+        /boost/beast/test//lib-asio-ssl
         /boost/beast/test//lib-test
     ] ;
 }
@@ -28,14 +28,14 @@ alias run-tests : $(RUN_TESTS) ;
 
 exe fat-tests :
     $(SOURCES)
-    /boost/beast//lib-asio-ssl
+    /boost/beast/test//lib-asio-ssl
     /boost/beast/test//lib-test
     ;
 
 explicit fat-tests ;
 
 run $(SOURCES)
-    /boost/beast//lib-asio-ssl
+    /boost/beast/test//lib-asio-ssl
     /boost/beast/test//lib-test
     : : : : run-fat-tests ;
 
diff --git a/test/beast/ssl/Jamfile b/test/beast/ssl/Jamfile
index afb789e688..500a7edec5 100644
--- a/test/beast/ssl/Jamfile
+++ b/test/beast/ssl/Jamfile
@@ -16,7 +16,7 @@ local RUN_TESTS ;
 for local f in $(SOURCES)
 {
     RUN_TESTS += [ run $(f)
-        /boost/beast//lib-asio-ssl
+        /boost/beast/test//lib-asio-ssl
         /boost/beast/test//lib-test
     ] ;
 }
@@ -26,14 +26,14 @@ alias run-tests : $(RUN_TESTS) ;
 exe fat-tests
     :
     $(SOURCES)
-    /boost/beast//lib-asio-ssl
+    /boost/beast/test//lib-asio-ssl
     /boost/beast/test//lib-test
     ;
 
 explicit fat-tests ;
 
 run $(SOURCES)
-    /boost/beast//lib-asio-ssl
+    /boost/beast/test//lib-asio-ssl
     /boost/beast/test//lib-test
     : : : : run-fat-tests ;
 
diff --git a/test/beast/websocket/Jamfile b/test/beast/websocket/Jamfile
index eddc9f73fe..7aeb641ea9 100644
--- a/test/beast/websocket/Jamfile
+++ b/test/beast/websocket/Jamfile
@@ -41,7 +41,7 @@ local RUN_TESTS ;
 for local f in $(SOURCES)
 {
     RUN_TESTS += [ run $(f)
-        /boost/beast//lib-asio-ssl
+        /boost/beast/test//lib-asio-ssl
         /boost/beast/test//lib-test
     ] ;
 }
@@ -51,14 +51,14 @@ alias run-tests : $(RUN_TESTS) ;
 exe fat-tests
     :
     $(SOURCES)
-    /boost/beast//lib-asio-ssl
+    /boost/beast/test//lib-asio-ssl
     /boost/beast/test//lib-test
     ;
 
 explicit fat-tests ;
 
 run $(SOURCES)
-    /boost/beast//lib-asio-ssl
+    /boost/beast/test//lib-asio-ssl
     /boost/beast/test//lib-test
     : : : : run-fat-tests ;
 
diff --git a/test/doc/Jamfile b/test/doc/Jamfile
index f288898030..5c2670963b 100644
--- a/test/doc/Jamfile
+++ b/test/doc/Jamfile
@@ -12,7 +12,7 @@ project
         <include>../.. ;
 
 local libs =
-    /boost/beast//lib-asio-ssl
+    /boost/beast/test//lib-asio-ssl
     /boost/beast/test//lib-test
     ;
 
diff --git a/test/example/common/Jamfile b/test/example/common/Jamfile
index a454afced0..b8d88afcac 100644
--- a/test/example/common/Jamfile
+++ b/test/example/common/Jamfile
@@ -19,7 +19,7 @@ local SOURCES =
 local RUN_TESTS ;
 
 local libs =
-    /boost/beast//lib-asio-ssl
+    /boost/beast/test//lib-asio-ssl
     /boost/beast/test//lib-test
     ;