diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3930e69a..fec2ad4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Version 190:
 
 * Add missing includes to convenience headers
+* Unit test framework is experimental
 
 --------------------------------------------------------------------------------
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4137229..ca211aac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,6 +180,11 @@ file (GLOB_RECURSE BOOST_BEAST_FILES
     ${PROJECT_SOURCE_DIR}/include/boost/beast/*.ipp
 )
 
+file (GLOB_RECURSE BOOST_BEAST_EXPERIMENTAL_FILES
+    ${PROJECT_SOURCE_DIR}/include/boost/beast/experimental/*.hpp
+    ${PROJECT_SOURCE_DIR}/include/boost/beast/experimental/*.ipp
+)
+
 file (GLOB_RECURSE COMMON_FILES
     ${PROJECT_SOURCE_DIR}/example/common/*.hpp
   )
diff --git a/Jamfile b/Jamfile
index a96279a8..45489963 100644
--- a/Jamfile
+++ b/Jamfile
@@ -67,14 +67,13 @@ variant ubasan
     <define>BOOST_USE_ASAN=1
   ;
 
-path-constant TEST_MAIN : subtree/unit_test/include/boost/beast/unit_test/main.cpp ;
+path-constant TEST_MAIN : include/boost/beast/experimental/unit_test/main.cpp ;
 
 project /boost/beast
   : requirements
     <implicit-dependency>/boost//headers
     <include>.
     <include>./test/extras/include
-    <include>./subtree/unit_test/include
     <library>/boost/system//boost_system
     <library>/boost/coroutine//boost_coroutine
     <library>/boost/filesystem//boost_filesystem
diff --git a/subtree/unit_test/include/boost/beast/unit_test/amount.hpp b/include/boost/beast/experimental/unit_test/amount.hpp
similarity index 100%
rename from subtree/unit_test/include/boost/beast/unit_test/amount.hpp
rename to include/boost/beast/experimental/unit_test/amount.hpp
diff --git a/subtree/unit_test/include/boost/beast/unit_test/detail/const_container.hpp b/include/boost/beast/experimental/unit_test/detail/const_container.hpp
similarity index 100%
rename from subtree/unit_test/include/boost/beast/unit_test/detail/const_container.hpp
rename to include/boost/beast/experimental/unit_test/detail/const_container.hpp
diff --git a/subtree/unit_test/include/boost/beast/unit_test/dstream.hpp b/include/boost/beast/experimental/unit_test/dstream.hpp
similarity index 100%
rename from subtree/unit_test/include/boost/beast/unit_test/dstream.hpp
rename to include/boost/beast/experimental/unit_test/dstream.hpp
diff --git a/subtree/unit_test/include/boost/beast/unit_test/global_suites.hpp b/include/boost/beast/experimental/unit_test/global_suites.hpp
similarity index 94%
rename from subtree/unit_test/include/boost/beast/unit_test/global_suites.hpp
rename to include/boost/beast/experimental/unit_test/global_suites.hpp
index 56e49a44..195ec923 100644
--- a/subtree/unit_test/include/boost/beast/unit_test/global_suites.hpp
+++ b/include/boost/beast/experimental/unit_test/global_suites.hpp
@@ -10,7 +10,7 @@
 #ifndef BOOST_BEAST_UNIT_TEST_GLOBAL_SUITES_HPP
 #define BOOST_BEAST_UNIT_TEST_GLOBAL_SUITES_HPP
 
-#include <boost/beast/unit_test/suite_list.hpp>
+#include <boost/beast/experimental/unit_test/suite_list.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/subtree/unit_test/include/boost/beast/unit_test/main.cpp b/include/boost/beast/experimental/unit_test/main.cpp
similarity index 84%
rename from subtree/unit_test/include/boost/beast/unit_test/main.cpp
rename to include/boost/beast/experimental/unit_test/main.cpp
index 04b6aed9..cdda0d7f 100644
--- a/subtree/unit_test/include/boost/beast/unit_test/main.cpp
+++ b/include/boost/beast/experimental/unit_test/main.cpp
@@ -7,12 +7,12 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
-#include <boost/beast/unit_test/amount.hpp>
-#include <boost/beast/unit_test/dstream.hpp>
-#include <boost/beast/unit_test/global_suites.hpp>
-#include <boost/beast/unit_test/match.hpp>
-#include <boost/beast/unit_test/reporter.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/amount.hpp>
+#include <boost/beast/experimental/unit_test/dstream.hpp>
+#include <boost/beast/experimental/unit_test/global_suites.hpp>
+#include <boost/beast/experimental/unit_test/match.hpp>
+#include <boost/beast/experimental/unit_test/reporter.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/config.hpp>
 #include <cstdlib>
 #include <iostream>
diff --git a/subtree/unit_test/include/boost/beast/unit_test/match.hpp b/include/boost/beast/experimental/unit_test/match.hpp
similarity index 98%
rename from subtree/unit_test/include/boost/beast/unit_test/match.hpp
rename to include/boost/beast/experimental/unit_test/match.hpp
index 39c3c787..2318afbd 100644
--- a/subtree/unit_test/include/boost/beast/unit_test/match.hpp
+++ b/include/boost/beast/experimental/unit_test/match.hpp
@@ -10,7 +10,7 @@
 #ifndef BOOST_BEAST_UNIT_TEST_MATCH_HPP
 #define BOOST_BEAST_UNIT_TEST_MATCH_HPP
 
-#include <boost/beast/unit_test/suite_info.hpp>
+#include <boost/beast/experimental/unit_test/suite_info.hpp>
 #include <string>
 
 namespace boost {
diff --git a/subtree/unit_test/include/boost/beast/unit_test/recorder.hpp b/include/boost/beast/experimental/unit_test/recorder.hpp
similarity index 93%
rename from subtree/unit_test/include/boost/beast/unit_test/recorder.hpp
rename to include/boost/beast/experimental/unit_test/recorder.hpp
index a3fbfd6c..05f424b4 100644
--- a/subtree/unit_test/include/boost/beast/unit_test/recorder.hpp
+++ b/include/boost/beast/experimental/unit_test/recorder.hpp
@@ -10,8 +10,8 @@
 #ifndef BOOST_BEAST_UNIT_TEST_RECORDER_HPP
 #define BOOST_BEAST_UNIT_TEST_RECORDER_HPP
 
-#include <boost/beast/unit_test/results.hpp>
-#include <boost/beast/unit_test/runner.hpp>
+#include <boost/beast/experimental/unit_test/results.hpp>
+#include <boost/beast/experimental/unit_test/runner.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/subtree/unit_test/include/boost/beast/unit_test/reporter.hpp b/include/boost/beast/experimental/unit_test/reporter.hpp
similarity index 98%
rename from subtree/unit_test/include/boost/beast/unit_test/reporter.hpp
rename to include/boost/beast/experimental/unit_test/reporter.hpp
index 489744e1..78906966 100644
--- a/subtree/unit_test/include/boost/beast/unit_test/reporter.hpp
+++ b/include/boost/beast/experimental/unit_test/reporter.hpp
@@ -10,8 +10,8 @@
 #ifndef BOOST_BEAST_UNIT_TEST_REPORTER_HPP
 #define BOOST_BEAST_UNIT_TEST_REPORTER_HPP
 
-#include <boost/beast/unit_test/amount.hpp>
-#include <boost/beast/unit_test/recorder.hpp>
+#include <boost/beast/experimental/unit_test/amount.hpp>
+#include <boost/beast/experimental/unit_test/recorder.hpp>
 #include <algorithm>
 #include <chrono>
 #include <functional>
diff --git a/subtree/unit_test/include/boost/beast/unit_test/results.hpp b/include/boost/beast/experimental/unit_test/results.hpp
similarity index 98%
rename from subtree/unit_test/include/boost/beast/unit_test/results.hpp
rename to include/boost/beast/experimental/unit_test/results.hpp
index 5fe3b7ba..be30ed99 100644
--- a/subtree/unit_test/include/boost/beast/unit_test/results.hpp
+++ b/include/boost/beast/experimental/unit_test/results.hpp
@@ -10,7 +10,7 @@
 #ifndef BOOST_BEAST_UNIT_TEST_RESULTS_HPP
 #define BOOST_BEAST_UNIT_TEST_RESULTS_HPP
 
-#include <boost/beast/unit_test/detail/const_container.hpp>
+#include <boost/beast/experimental/unit_test/detail/const_container.hpp>
 
 #include <string>
 #include <vector>
diff --git a/subtree/unit_test/include/boost/beast/unit_test/runner.hpp b/include/boost/beast/experimental/unit_test/runner.hpp
similarity index 98%
rename from subtree/unit_test/include/boost/beast/unit_test/runner.hpp
rename to include/boost/beast/experimental/unit_test/runner.hpp
index 580b0dbc..8ccf0636 100644
--- a/subtree/unit_test/include/boost/beast/unit_test/runner.hpp
+++ b/include/boost/beast/experimental/unit_test/runner.hpp
@@ -10,7 +10,7 @@
 #ifndef BOOST_BEAST_UNIT_TEST_RUNNER_H_INCLUDED
 #define BOOST_BEAST_UNIT_TEST_RUNNER_H_INCLUDED
 
-#include <boost/beast/unit_test/suite_info.hpp>
+#include <boost/beast/experimental/unit_test/suite_info.hpp>
 #include <boost/assert.hpp>
 #include <mutex>
 #include <ostream>
diff --git a/subtree/unit_test/include/boost/beast/unit_test/suite.hpp b/include/boost/beast/experimental/unit_test/suite.hpp
similarity index 99%
rename from subtree/unit_test/include/boost/beast/unit_test/suite.hpp
rename to include/boost/beast/experimental/unit_test/suite.hpp
index b8350a0f..a4ec0a0c 100644
--- a/subtree/unit_test/include/boost/beast/unit_test/suite.hpp
+++ b/include/boost/beast/experimental/unit_test/suite.hpp
@@ -10,7 +10,7 @@
 #ifndef BOOST_BEAST_UNIT_TEST_SUITE_HPP
 #define BOOST_BEAST_UNIT_TEST_SUITE_HPP
 
-#include <boost/beast/unit_test/runner.hpp>
+#include <boost/beast/experimental/unit_test/runner.hpp>
 #include <boost/throw_exception.hpp>
 #include <ostream>
 #include <sstream>
@@ -684,7 +684,7 @@ run(runner& r)
 #define BEAST_DEFINE_TESTSUITE(Class,Module,Library)
 
 #else
-#include <boost/beast/unit_test/global_suites.hpp>
+#include <boost/beast/experimental/unit_test/global_suites.hpp>
 #define BEAST_DEFINE_TESTSUITE(Library,Module,Class) \
         BEAST_DEFINE_TESTSUITE_INSERT(Library,Module,Class,false)
 #define BEAST_DEFINE_TESTSUITE_MANUAL(Library,Module,Class) \
diff --git a/subtree/unit_test/include/boost/beast/unit_test/suite_info.hpp b/include/boost/beast/experimental/unit_test/suite_info.hpp
similarity index 100%
rename from subtree/unit_test/include/boost/beast/unit_test/suite_info.hpp
rename to include/boost/beast/experimental/unit_test/suite_info.hpp
diff --git a/subtree/unit_test/include/boost/beast/unit_test/suite_list.hpp b/include/boost/beast/experimental/unit_test/suite_list.hpp
similarity index 92%
rename from subtree/unit_test/include/boost/beast/unit_test/suite_list.hpp
rename to include/boost/beast/experimental/unit_test/suite_list.hpp
index ee399e2f..002bdb2a 100644
--- a/subtree/unit_test/include/boost/beast/unit_test/suite_list.hpp
+++ b/include/boost/beast/experimental/unit_test/suite_list.hpp
@@ -10,8 +10,8 @@
 #ifndef BOOST_BEAST_UNIT_TEST_SUITE_LIST_HPP
 #define BOOST_BEAST_UNIT_TEST_SUITE_LIST_HPP
 
-#include <boost/beast/unit_test/suite_info.hpp>
-#include <boost/beast/unit_test/detail/const_container.hpp>
+#include <boost/beast/experimental/unit_test/suite_info.hpp>
+#include <boost/beast/experimental/unit_test/detail/const_container.hpp>
 #include <boost/assert.hpp>
 #include <typeindex>
 #include <set>
diff --git a/subtree/unit_test/include/boost/beast/unit_test/thread.hpp b/include/boost/beast/experimental/unit_test/thread.hpp
similarity index 97%
rename from subtree/unit_test/include/boost/beast/unit_test/thread.hpp
rename to include/boost/beast/experimental/unit_test/thread.hpp
index 2967f2be..74b4847a 100644
--- a/subtree/unit_test/include/boost/beast/unit_test/thread.hpp
+++ b/include/boost/beast/experimental/unit_test/thread.hpp
@@ -10,7 +10,7 @@
 #ifndef BOOST_BEAST_UNIT_TEST_THREAD_HPP
 #define BOOST_BEAST_UNIT_TEST_THREAD_HPP
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <functional>
 #include <thread>
 #include <utility>
diff --git a/subtree/unit_test/README.md b/subtree/unit_test/README.md
deleted file mode 100644
index d3afed09..00000000
--- a/subtree/unit_test/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# unit_test
-
-A simple class-based unit test framework copied from Boost.Beast
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 16cef92a..243d7fa9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,16 +9,13 @@
 
 include_directories (./extern)
 include_directories (./extras/include)
-include_directories (../subtree/unit_test/include)
 
 file (GLOB_RECURSE EXTRAS_FILES
     ${PROJECT_SOURCE_DIR}/test/extras/include/*.hpp
     ${PROJECT_SOURCE_DIR}/test/extras/include/*.ipp
-    ${PROJECT_SOURCE_DIR}/subtree/unit_test/include/*.hpp
-    ${PROJECT_SOURCE_DIR}/subtree/unit_test/include/*.ipp
     )
 
-set (TEST_MAIN ${PROJECT_SOURCE_DIR}/subtree/unit_test/include/boost/beast/unit_test/main.cpp)
+set (TEST_MAIN ${PROJECT_SOURCE_DIR}/include/boost/beast/experimental/unit_test/main.cpp)
 
 if (OPENSSL_FOUND)
     link_libraries (${OPENSSL_LIBRARIES})
diff --git a/test/beast/CMakeLists.txt b/test/beast/CMakeLists.txt
index ab0de803..bcc6d851 100644
--- a/test/beast/CMakeLists.txt
+++ b/test/beast/CMakeLists.txt
@@ -9,10 +9,17 @@
 
 add_definitions (-DBOOST_BEAST_ALLOW_DEPRECATED)
 
-GroupSources(include/boost/beast beast)
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(test/beast "/")
+add_subdirectory (core)
+add_subdirectory (experimental)
+add_subdirectory (http)
+add_subdirectory (websocket)
+add_subdirectory (zlib)
+
+#-------------------------------------------------------------------------------
+
+GroupSources (include/boost/beast beast)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/beast "/")
 
 add_executable (tests-beast
     ${BOOST_BEAST_FILES}
@@ -26,10 +33,4 @@ add_executable (tests-beast
     zlib.cpp
 )
 
-add_subdirectory (core)
-add_subdirectory (experimental)
-add_subdirectory (http)
-add_subdirectory (websocket)
-add_subdirectory (zlib)
-
 set_property(TARGET tests-beast PROPERTY FOLDER "tests")
diff --git a/test/beast/core/CMakeLists.txt b/test/beast/core/CMakeLists.txt
index abb40c53..ce14546b 100644
--- a/test/beast/core/CMakeLists.txt
+++ b/test/beast/core/CMakeLists.txt
@@ -7,10 +7,9 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(include/boost/beast beast)
-GroupSources(test/beast/core "/")
+GroupSources (include/boost/beast beast)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/beast/core "/")
 
 add_executable (tests-beast-core
     ${BOOST_BEAST_FILES}
diff --git a/test/beast/core/bind_handler.cpp b/test/beast/core/bind_handler.cpp
index 1d93195b..90f0c886 100644
--- a/test/beast/core/bind_handler.cpp
+++ b/test/beast/core/bind_handler.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/beast/experimental/test/stream.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/strand.hpp>
 #include <string>
diff --git a/test/beast/core/buffer.cpp b/test/beast/core/buffer.cpp
index 6618e138..6ad24398 100644
--- a/test/beast/core/buffer.cpp
+++ b/test/beast/core/buffer.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/beast/core/detail/buffer.hpp>
 #include <boost/beast/core/flat_buffer.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <string>
 
 #include <boost/asio/error.hpp>
diff --git a/test/beast/core/buffered_read_stream.cpp b/test/beast/core/buffered_read_stream.cpp
index d8f7337c..99d5558d 100644
--- a/test/beast/core/buffered_read_stream.cpp
+++ b/test/beast/core/buffered_read_stream.cpp
@@ -13,7 +13,7 @@
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/experimental/test/stream.hpp>
 #include <boost/beast/test/yield_to.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/read.hpp>
diff --git a/test/beast/core/buffers_adapter.cpp b/test/beast/core/buffers_adapter.cpp
index 26562418..2b6d3a8b 100644
--- a/test/beast/core/buffers_adapter.cpp
+++ b/test/beast/core/buffers_adapter.cpp
@@ -13,7 +13,7 @@
 #include "buffer_test.hpp"
 #include <boost/beast/core/ostream.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/streambuf.hpp>
 #include <iterator>
diff --git a/test/beast/core/buffers_cat.cpp b/test/beast/core/buffers_cat.cpp
index e5148d9b..66232f05 100644
--- a/test/beast/core/buffers_cat.cpp
+++ b/test/beast/core/buffers_cat.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/core/buffers_cat.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/beast/core/buffers_prefix.hpp>
 #include <boost/beast/core/buffers_suffix.hpp>
 #include <boost/asio/buffer.hpp>
diff --git a/test/beast/core/buffers_prefix.cpp b/test/beast/core/buffers_prefix.cpp
index 11bb2638..1881de40 100644
--- a/test/beast/core/buffers_prefix.cpp
+++ b/test/beast/core/buffers_prefix.cpp
@@ -13,7 +13,7 @@
 #include <boost/beast/core/buffers_suffix.hpp>
 #include <boost/beast/core/buffers_to_string.hpp>
 #include <boost/beast/core/type_traits.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/asio/buffer.hpp>
 #include <string>
 
diff --git a/test/beast/core/buffers_suffix.cpp b/test/beast/core/buffers_suffix.cpp
index fbb340f0..59da9e3c 100644
--- a/test/beast/core/buffers_suffix.cpp
+++ b/test/beast/core/buffers_suffix.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/beast/core/buffers_cat.hpp>
 #include <boost/beast/core/ostream.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/asio/buffer.hpp>
 #include <string>
 
diff --git a/test/beast/core/buffers_to_string.cpp b/test/beast/core/buffers_to_string.cpp
index e6848bf6..95f9eae5 100644
--- a/test/beast/core/buffers_to_string.cpp
+++ b/test/beast/core/buffers_to_string.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/core/ostream.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/core/detail/base64.cpp b/test/beast/core/detail/base64.cpp
index 56549937..686ee2ba 100644
--- a/test/beast/core/detail/base64.cpp
+++ b/test/beast/core/detail/base64.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/core/detail/base64.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/core/detail/clamp.cpp b/test/beast/core/detail/clamp.cpp
index 9427d13a..9fff0706 100644
--- a/test/beast/core/detail/clamp.cpp
+++ b/test/beast/core/detail/clamp.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/core/detail/clamp.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <climits>
 
 namespace boost {
diff --git a/test/beast/core/detail/sha1.cpp b/test/beast/core/detail/sha1.cpp
index aebe7d2f..780ea2c3 100644
--- a/test/beast/core/detail/sha1.cpp
+++ b/test/beast/core/detail/sha1.cpp
@@ -8,7 +8,7 @@
 //
 
 #include <boost/beast/core/detail/sha1.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <array>
 
 namespace boost {
diff --git a/test/beast/core/detail/variant.cpp b/test/beast/core/detail/variant.cpp
index 850c16e2..06849cb4 100644
--- a/test/beast/core/detail/variant.cpp
+++ b/test/beast/core/detail/variant.cpp
@@ -8,7 +8,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/core/detail/variant.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <exception>
 #include <string>
 
diff --git a/test/beast/core/detail/varint.cpp b/test/beast/core/detail/varint.cpp
index 6466c998..cc762b0b 100644
--- a/test/beast/core/detail/varint.cpp
+++ b/test/beast/core/detail/varint.cpp
@@ -8,7 +8,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/core/detail/varint.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/core/file_posix.cpp b/test/beast/core/file_posix.cpp
index e8320cb4..9626b150 100644
--- a/test/beast/core/file_posix.cpp
+++ b/test/beast/core/file_posix.cpp
@@ -15,7 +15,7 @@
 #include "file_test.hpp"
 
 #include <boost/beast/core/type_traits.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/core/file_stdio.cpp b/test/beast/core/file_stdio.cpp
index d44a1946..6cd64556 100644
--- a/test/beast/core/file_stdio.cpp
+++ b/test/beast/core/file_stdio.cpp
@@ -13,7 +13,7 @@
 #include "file_test.hpp"
 
 #include <boost/beast/core/type_traits.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/core/file_test.hpp b/test/beast/core/file_test.hpp
index 510d6f1f..5276f625 100644
--- a/test/beast/core/file_test.hpp
+++ b/test/beast/core/file_test.hpp
@@ -11,7 +11,7 @@
 #define BOOST_BEAST_TEST_CORE_FILE_TEST_HPP
 
 #include <boost/beast/core/type_traits.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/config.hpp>
 #include <boost/filesystem.hpp>
 #include <string>
diff --git a/test/beast/core/file_win32.cpp b/test/beast/core/file_win32.cpp
index 8fa68b41..0cf6f4b9 100644
--- a/test/beast/core/file_win32.cpp
+++ b/test/beast/core/file_win32.cpp
@@ -15,7 +15,7 @@
 #include "file_test.hpp"
 
 #include <boost/beast/core/type_traits.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/core/flat_buffer.cpp b/test/beast/core/flat_buffer.cpp
index 85e88539..efdc01bc 100644
--- a/test/beast/core/flat_buffer.cpp
+++ b/test/beast/core/flat_buffer.cpp
@@ -16,7 +16,7 @@
 #include <boost/beast/core/read_size.hpp>
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/test/test_allocator.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <algorithm>
 
 namespace boost {
diff --git a/test/beast/core/flat_static_buffer.cpp b/test/beast/core/flat_static_buffer.cpp
index 725b7e27..14bd56bd 100644
--- a/test/beast/core/flat_static_buffer.cpp
+++ b/test/beast/core/flat_static_buffer.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/beast/core/ostream.hpp>
 #include <boost/beast/core/string.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <string>
 
 namespace boost {
diff --git a/test/beast/core/handler_ptr.cpp b/test/beast/core/handler_ptr.cpp
index 4830c8bf..275ab5b9 100644
--- a/test/beast/core/handler_ptr.cpp
+++ b/test/beast/core/handler_ptr.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/core/handler_ptr.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <exception>
 #include <memory>
 #include <utility>
diff --git a/test/beast/core/multi_buffer.cpp b/test/beast/core/multi_buffer.cpp
index c43ad337..cedc873a 100644
--- a/test/beast/core/multi_buffer.cpp
+++ b/test/beast/core/multi_buffer.cpp
@@ -16,7 +16,7 @@
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/core/type_traits.hpp>
 #include <boost/beast/test/test_allocator.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/asio/buffer.hpp>
 #include <algorithm>
 #include <atomic>
diff --git a/test/beast/core/ostream.cpp b/test/beast/core/ostream.cpp
index 6f59ce28..8589da15 100644
--- a/test/beast/core/ostream.cpp
+++ b/test/beast/core/ostream.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/beast/core/buffers_to_string.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <ostream>
 
 namespace boost {
diff --git a/test/beast/core/read_size.cpp b/test/beast/core/read_size.cpp
index 69cbd262..ab8a4d35 100644
--- a/test/beast/core/read_size.cpp
+++ b/test/beast/core/read_size.cpp
@@ -14,7 +14,7 @@
 #include <boost/beast/core/flat_static_buffer.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/core/static_buffer.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 #include <boost/asio/streambuf.hpp>
 
diff --git a/test/beast/core/span.cpp b/test/beast/core/span.cpp
index 1ee75085..dcaf6d62 100644
--- a/test/beast/core/span.cpp
+++ b/test/beast/core/span.cpp
@@ -11,7 +11,7 @@
 #include <boost/beast/core/span.hpp>
 
 #include <boost/beast/core/string.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/core/static_buffer.cpp b/test/beast/core/static_buffer.cpp
index 775bb3e2..6e948079 100644
--- a/test/beast/core/static_buffer.cpp
+++ b/test/beast/core/static_buffer.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/beast/core/ostream.hpp>
 #include <boost/beast/core/string.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <string>
 
 namespace boost {
diff --git a/test/beast/core/static_string.cpp b/test/beast/core/static_string.cpp
index 8fb474a6..ed931d77 100644
--- a/test/beast/core/static_string.cpp
+++ b/test/beast/core/static_string.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/core/static_string.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/core/string_param.cpp b/test/beast/core/string_param.cpp
index f6703fac..0fb0b424 100644
--- a/test/beast/core/string_param.cpp
+++ b/test/beast/core/string_param.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/core/string_param.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/beast/core/detail/type_traits.hpp>
 
 namespace boost {
diff --git a/test/beast/experimental/CMakeLists.txt b/test/beast/experimental/CMakeLists.txt
index 45d36c74..14595e19 100644
--- a/test/beast/experimental/CMakeLists.txt
+++ b/test/beast/experimental/CMakeLists.txt
@@ -7,10 +7,9 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(include/boost/beast beast)
-GroupSources(test/beast/experimental "/")
+GroupSources (include/boost/beast beast)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/beast/experimental "/")
 
 add_executable (tests-beast-experimental
     ${BOOST_BEAST_FILES}
diff --git a/test/beast/experimental/flat_stream.cpp b/test/beast/experimental/flat_stream.cpp
index ba02f835..f18fab64 100644
--- a/test/beast/experimental/flat_stream.cpp
+++ b/test/beast/experimental/flat_stream.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/beast/test/websocket.hpp>
 #include <boost/beast/test/yield_to.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <initializer_list>
 #include <vector>
 
diff --git a/test/beast/experimental/icy_stream.cpp b/test/beast/experimental/icy_stream.cpp
index dc7a31dd..849f82a3 100644
--- a/test/beast/experimental/icy_stream.cpp
+++ b/test/beast/experimental/icy_stream.cpp
@@ -14,7 +14,7 @@
 #include <boost/beast/core/buffers_to_string.hpp>
 #include <boost/beast/core/read_size.hpp>
 #include <boost/beast/experimental/test/stream.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <array>
 #include <memory>
 #include <string>
diff --git a/test/beast/experimental/timeout_service.cpp b/test/beast/experimental/timeout_service.cpp
index a95edd17..4b3de741 100644
--- a/test/beast/experimental/timeout_service.cpp
+++ b/test/beast/experimental/timeout_service.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/experimental/core/timeout_service.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/experimental/timeout_socket.cpp b/test/beast/experimental/timeout_socket.cpp
index 5ac931b8..22b15b7d 100644
--- a/test/beast/experimental/timeout_socket.cpp
+++ b/test/beast/experimental/timeout_socket.cpp
@@ -13,7 +13,7 @@
 #include <boost/beast/experimental/core/timeout_service.hpp>
 
 #include <boost/beast/test/yield_to.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <thread>
 
diff --git a/test/beast/http/CMakeLists.txt b/test/beast/http/CMakeLists.txt
index 8837355d..b1a70d4e 100644
--- a/test/beast/http/CMakeLists.txt
+++ b/test/beast/http/CMakeLists.txt
@@ -7,10 +7,9 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(include/boost/beast beast)
-GroupSources(test/beast/http "/")
+GroupSources (include/boost/beast beast)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/beast/http "/")
 
 add_executable (tests-beast-http
     ${BOOST_BEAST_FILES}
diff --git a/test/beast/http/basic_parser.cpp b/test/beast/http/basic_parser.cpp
index c98c36ed..70b82826 100644
--- a/test/beast/http/basic_parser.cpp
+++ b/test/beast/http/basic_parser.cpp
@@ -21,7 +21,7 @@
 #include <boost/beast/http/parser.hpp>
 #include <boost/beast/http/string_body.hpp>
 #include <boost/beast/test/fuzz.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/http/chunk_encode.cpp b/test/beast/http/chunk_encode.cpp
index 95455cdd..478e8594 100644
--- a/test/beast/http/chunk_encode.cpp
+++ b/test/beast/http/chunk_encode.cpp
@@ -16,7 +16,7 @@
 #include <boost/beast/core/static_string.hpp>
 #include <boost/beast/http/fields.hpp>
 #include <boost/beast/test/fuzz.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/optional.hpp>
 #include <random>
 
diff --git a/test/beast/http/dynamic_body.cpp b/test/beast/http/dynamic_body.cpp
index 720cb9c8..837d68b3 100644
--- a/test/beast/http/dynamic_body.cpp
+++ b/test/beast/http/dynamic_body.cpp
@@ -17,7 +17,7 @@
 #include <boost/beast/http/read.hpp>
 #include <boost/beast/http/write.hpp>
 #include <boost/beast/experimental/test/stream.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/http/error.cpp b/test/beast/http/error.cpp
index 18abbf68..06ab121c 100644
--- a/test/beast/http/error.cpp
+++ b/test/beast/http/error.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/http/error.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <memory>
 
 namespace boost {
diff --git a/test/beast/http/field.cpp b/test/beast/http/field.cpp
index 7fbf541a..6f75101f 100644
--- a/test/beast/http/field.cpp
+++ b/test/beast/http/field.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/http/field.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/http/fields.cpp b/test/beast/http/fields.cpp
index f4c8694d..fe80b6d3 100644
--- a/test/beast/http/fields.cpp
+++ b/test/beast/http/fields.cpp
@@ -14,7 +14,7 @@
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/http/type_traits.hpp>
 #include <boost/beast/test/test_allocator.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <string>
 
 namespace boost {
diff --git a/test/beast/http/file_body.cpp b/test/beast/http/file_body.cpp
index c950fa22..c8da3bd2 100644
--- a/test/beast/http/file_body.cpp
+++ b/test/beast/http/file_body.cpp
@@ -15,7 +15,7 @@
 #include <boost/beast/core/flat_buffer.hpp>
 #include <boost/beast/http/parser.hpp>
 #include <boost/beast/http/serializer.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/filesystem.hpp>
 
 namespace boost {
diff --git a/test/beast/http/message.cpp b/test/beast/http/message.cpp
index 292024c8..14b3edfa 100644
--- a/test/beast/http/message.cpp
+++ b/test/beast/http/message.cpp
@@ -14,7 +14,7 @@
 #include <boost/beast/http/string_body.hpp>
 #include <boost/beast/http/fields.hpp>
 #include <boost/beast/http/string_body.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <type_traits>
 
 namespace boost {
diff --git a/test/beast/http/parser.cpp b/test/beast/http/parser.cpp
index 75bf9b9e..fc3d093d 100644
--- a/test/beast/http/parser.cpp
+++ b/test/beast/http/parser.cpp
@@ -12,7 +12,7 @@
 
 #include "test_parser.hpp"
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/beast/test/yield_to.hpp>
 #include <boost/beast/core/buffers_suffix.hpp>
 #include <boost/beast/core/flat_buffer.hpp>
diff --git a/test/beast/http/read.cpp b/test/beast/http/read.cpp
index afb619aa..4d60c7e9 100644
--- a/test/beast/http/read.cpp
+++ b/test/beast/http/read.cpp
@@ -20,7 +20,7 @@
 #include <boost/beast/http/string_body.hpp>
 #include <boost/beast/experimental/test/stream.hpp>
 #include <boost/beast/test/yield_to.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/strand.hpp>
 #include <atomic>
diff --git a/test/beast/http/rfc7230.cpp b/test/beast/http/rfc7230.cpp
index 4abf5ad4..b9c7bab6 100644
--- a/test/beast/http/rfc7230.cpp
+++ b/test/beast/http/rfc7230.cpp
@@ -11,7 +11,7 @@
 #include <boost/beast/http/rfc7230.hpp>
 
 #include <boost/beast/http/detail/rfc7230.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <string>
 #include <vector>
 
diff --git a/test/beast/http/serializer.cpp b/test/beast/http/serializer.cpp
index 763f5865..998de1ca 100644
--- a/test/beast/http/serializer.cpp
+++ b/test/beast/http/serializer.cpp
@@ -11,7 +11,7 @@
 #include <boost/beast/http/serializer.hpp>
 
 #include <boost/beast/http/string_body.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/http/span_body.cpp b/test/beast/http/span_body.cpp
index 24e5da3a..135d5128 100644
--- a/test/beast/http/span_body.cpp
+++ b/test/beast/http/span_body.cpp
@@ -11,7 +11,7 @@
 #include <boost/beast/http/span_body.hpp>
 
 #include <boost/beast/http/message.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/http/status.cpp b/test/beast/http/status.cpp
index 3c26efc5..fe8a9513 100644
--- a/test/beast/http/status.cpp
+++ b/test/beast/http/status.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/http/status.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/http/verb.cpp b/test/beast/http/verb.cpp
index 90c609c8..b70bf222 100644
--- a/test/beast/http/verb.cpp
+++ b/test/beast/http/verb.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/http/verb.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/http/write.cpp b/test/beast/http/write.cpp
index c8bd6b5c..55c25fb3 100644
--- a/test/beast/http/write.cpp
+++ b/test/beast/http/write.cpp
@@ -21,7 +21,7 @@
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/experimental/test/stream.hpp>
 #include <boost/beast/test/yield_to.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/asio/error.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/strand.hpp>
diff --git a/test/beast/websocket/CMakeLists.txt b/test/beast/websocket/CMakeLists.txt
index 4a269893..91cbc904 100644
--- a/test/beast/websocket/CMakeLists.txt
+++ b/test/beast/websocket/CMakeLists.txt
@@ -7,10 +7,9 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(include/boost/beast beast)
-GroupSources(test/beast/websocket "/")
+GroupSources (include/boost/beast beast)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/beast/websocket "/")
 
 add_executable (tests-beast-websocket
     ${BOOST_BEAST_FILES}
diff --git a/test/beast/websocket/error.cpp b/test/beast/websocket/error.cpp
index 61632c20..bdef0472 100644
--- a/test/beast/websocket/error.cpp
+++ b/test/beast/websocket/error.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/websocket/error.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <memory>
 
 namespace boost {
diff --git a/test/beast/websocket/frame.cpp b/test/beast/websocket/frame.cpp
index 505d84ed..eb9b88bf 100644
--- a/test/beast/websocket/frame.cpp
+++ b/test/beast/websocket/frame.cpp
@@ -8,7 +8,7 @@
 //
 
 #include <boost/beast/websocket/detail/frame.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/websocket/rfc6455.cpp b/test/beast/websocket/rfc6455.cpp
index 76f8da57..40c5dac8 100644
--- a/test/beast/websocket/rfc6455.cpp
+++ b/test/beast/websocket/rfc6455.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/websocket/rfc6455.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/beast/websocket/test.hpp b/test/beast/websocket/test.hpp
index 8fe69b17..4629f934 100644
--- a/test/beast/websocket/test.hpp
+++ b/test/beast/websocket/test.hpp
@@ -17,7 +17,7 @@
 #include <boost/beast/websocket/stream.hpp>
 #include <boost/beast/experimental/test/stream.hpp>
 #include <boost/beast/test/yield_to.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/asio/executor_work_guard.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/spawn.hpp>
diff --git a/test/beast/websocket/utf8_checker.cpp b/test/beast/websocket/utf8_checker.cpp
index 924c5202..dced53c7 100644
--- a/test/beast/websocket/utf8_checker.cpp
+++ b/test/beast/websocket/utf8_checker.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/beast/core/buffers_suffix.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <array>
 
 namespace boost {
diff --git a/test/beast/zlib/CMakeLists.txt b/test/beast/zlib/CMakeLists.txt
index 31da3e59..c061a43c 100644
--- a/test/beast/zlib/CMakeLists.txt
+++ b/test/beast/zlib/CMakeLists.txt
@@ -7,11 +7,10 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(include/boost/beast beast)
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(test/extern/zlib-1.2.11 zlib)
-GroupSources(test/beast/zlib "/")
+GroupSources (include/boost/beast beast)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/extern/zlib-1.2.11 zlib)
+GroupSources (test/beast/zlib "/")
 
 if (MSVC)
     set_source_files_properties (${ZLIB_SOURCES} PROPERTIES COMPILE_FLAGS "/wd4127 /wd4131 /wd4244")
diff --git a/test/beast/zlib/deflate_stream.cpp b/test/beast/zlib/deflate_stream.cpp
index c3ef1bf3..1318c7fe 100644
--- a/test/beast/zlib/deflate_stream.cpp
+++ b/test/beast/zlib/deflate_stream.cpp
@@ -11,7 +11,7 @@
 #include <boost/beast/zlib/deflate_stream.hpp>
 
 #include <boost/beast/core/string.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <cstdint>
 #include <random>
 
diff --git a/test/beast/zlib/error.cpp b/test/beast/zlib/error.cpp
index 522027d6..849dfc4c 100644
--- a/test/beast/zlib/error.cpp
+++ b/test/beast/zlib/error.cpp
@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/beast/zlib/error.hpp>
 
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <memory>
 
 namespace boost {
diff --git a/test/beast/zlib/inflate_stream.cpp b/test/beast/zlib/inflate_stream.cpp
index c76df144..2b8a747b 100644
--- a/test/beast/zlib/inflate_stream.cpp
+++ b/test/beast/zlib/inflate_stream.cpp
@@ -11,7 +11,7 @@
 #include <boost/beast/zlib/inflate_stream.hpp>
 
 #include <boost/beast/core/string.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <chrono>
 #include <random>
 
diff --git a/test/bench/buffers/CMakeLists.txt b/test/bench/buffers/CMakeLists.txt
index 7609b6ef..a4991aef 100644
--- a/test/bench/buffers/CMakeLists.txt
+++ b/test/bench/buffers/CMakeLists.txt
@@ -7,10 +7,9 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(include/boost/beast beast)
-GroupSources(test/bench/buffers "/")
+GroupSources (include/boost/beast beast)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/bench/buffers "/")
 
 add_executable (bench-buffers
     ${BOOST_BEAST_FILES}
diff --git a/test/bench/buffers/bench_buffers.cpp b/test/bench/buffers/bench_buffers.cpp
index f4d67e35..11a18f37 100644
--- a/test/bench/buffers/bench_buffers.cpp
+++ b/test/bench/buffers/bench_buffers.cpp
@@ -11,7 +11,7 @@
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/core/read_size.hpp>
 #include <boost/beast/core/string.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <boost/asio/streambuf.hpp>
 #include <algorithm>
 #include <chrono>
diff --git a/test/bench/parser/CMakeLists.txt b/test/bench/parser/CMakeLists.txt
index 7141000a..49574964 100644
--- a/test/bench/parser/CMakeLists.txt
+++ b/test/bench/parser/CMakeLists.txt
@@ -7,11 +7,10 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(include/boost/beast beast)
-GroupSources(test/beast/http "/")
-GroupSources(test/bench/parser "/")
+GroupSources (include/boost/beast beast)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/beast/http "/")
+GroupSources (test/bench/parser "/")
 
 add_executable (bench-parser
     ${BOOST_BEAST_FILES}
diff --git a/test/bench/parser/bench_parser.cpp b/test/bench/parser/bench_parser.cpp
index c6d8e4ad..98abfd8f 100644
--- a/test/bench/parser/bench_parser.cpp
+++ b/test/bench/parser/bench_parser.cpp
@@ -17,7 +17,7 @@
 #include <boost/beast/core/ostream.hpp>
 #include <boost/beast/core/flat_buffer.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <chrono>
 #include <iostream>
 #include <vector>
diff --git a/test/bench/utf8_checker/CMakeLists.txt b/test/bench/utf8_checker/CMakeLists.txt
index 6b0f27d3..0139b6b8 100644
--- a/test/bench/utf8_checker/CMakeLists.txt
+++ b/test/bench/utf8_checker/CMakeLists.txt
@@ -7,10 +7,9 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(include/boost/beast beast)
-GroupSources(test/bench/utf8_checker "/")
+GroupSources (include/boost/beast beast)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/bench/utf8_checker "/")
 
 add_executable (bench-utf8-checker
     ${BOOST_BEAST_FILES}
diff --git a/test/bench/utf8_checker/bench_utf8_checker.cpp b/test/bench/utf8_checker/bench_utf8_checker.cpp
index 85e64695..6cd740d9 100644
--- a/test/bench/utf8_checker/bench_utf8_checker.cpp
+++ b/test/bench/utf8_checker/bench_utf8_checker.cpp
@@ -8,7 +8,7 @@
 //
 
 #include <boost/beast/websocket/detail/utf8_checker.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <chrono>
 #include <random>
 
diff --git a/test/bench/wsload/CMakeLists.txt b/test/bench/wsload/CMakeLists.txt
index 4976c2e2..b937df0f 100644
--- a/test/bench/wsload/CMakeLists.txt
+++ b/test/bench/wsload/CMakeLists.txt
@@ -7,11 +7,10 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(include/boost/beast beast)
-GroupSources(example/common common)
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(test/bench/wsload "/")
+GroupSources (include/boost/beast beast)
+GroupSources (example/common common)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/bench/wsload "/")
 
 add_executable (bench-wsload
     ${BOOST_BEAST_FILES}
diff --git a/test/bench/wsload/wsload.cpp b/test/bench/wsload/wsload.cpp
index 9cd0a1ec..7de607dc 100644
--- a/test/bench/wsload/wsload.cpp
+++ b/test/bench/wsload/wsload.cpp
@@ -19,7 +19,7 @@
 
 #include <boost/beast/core.hpp>
 #include <boost/beast/websocket.hpp>
-#include <boost/beast/unit_test/dstream.hpp>
+#include <boost/beast/experimental/unit_test/dstream.hpp>
 #include <boost/asio.hpp>
 #include <atomic>
 #include <chrono>
diff --git a/test/bench/zlib/CMakeLists.txt b/test/bench/zlib/CMakeLists.txt
index 802b0627..7dcc94be 100644
--- a/test/bench/zlib/CMakeLists.txt
+++ b/test/bench/zlib/CMakeLists.txt
@@ -7,11 +7,10 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(include/boost/beast beast)
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(test/extern/zlib-1.2.11 zlib)
-GroupSources(test/bench/zlib "/")
+GroupSources (include/boost/beast beast)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/extern/zlib-1.2.11 zlib)
+GroupSources (test/bench/zlib "/")
 
 if (MSVC)
     set_source_files_properties (${ZLIB_SOURCES} PROPERTIES COMPILE_FLAGS "/wd4127 /wd4131 /wd4244")
diff --git a/test/bench/zlib/deflate_stream.cpp b/test/bench/zlib/deflate_stream.cpp
index 6db1efea..d3d488c9 100644
--- a/test/bench/zlib/deflate_stream.cpp
+++ b/test/bench/zlib/deflate_stream.cpp
@@ -10,8 +10,8 @@
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/zlib/deflate_stream.hpp>
 #include <boost/beast/test/throughput.hpp>
-#include <boost/beast/unit_test/dstream.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/dstream.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <iomanip>
 #include <random>
 #include <string>
diff --git a/test/bench/zlib/inflate_stream.cpp b/test/bench/zlib/inflate_stream.cpp
index a081ede3..d576709e 100644
--- a/test/bench/zlib/inflate_stream.cpp
+++ b/test/bench/zlib/inflate_stream.cpp
@@ -10,8 +10,8 @@
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/zlib/inflate_stream.hpp>
 #include <boost/beast/test/throughput.hpp>
-#include <boost/beast/unit_test/dstream.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/dstream.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <iomanip>
 #include <random>
 #include <string>
diff --git a/test/doc/CMakeLists.txt b/test/doc/CMakeLists.txt
index e700b106..d5283cbe 100644
--- a/test/doc/CMakeLists.txt
+++ b/test/doc/CMakeLists.txt
@@ -7,11 +7,10 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(example example)
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(include/boost/beast beast)
-GroupSources(test/doc "/")
+GroupSources (include/boost/beast beast)
+GroupSources (example example)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/doc "/")
 
 add_executable (tests-doc
     ${BOOST_BEAST_FILES}
diff --git a/test/doc/core_examples.cpp b/test/doc/core_examples.cpp
index 115c47e4..d02d469d 100644
--- a/test/doc/core_examples.cpp
+++ b/test/doc/core_examples.cpp
@@ -13,7 +13,7 @@
 #include <boost/beast/core/ostream.hpp>
 #include <boost/beast/experimental/test/stream.hpp>
 #include <boost/beast/test/yield_to.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 
 namespace boost {
 namespace beast {
diff --git a/test/doc/http_examples.cpp b/test/doc/http_examples.cpp
index 8527d9d8..f8d10d1d 100644
--- a/test/doc/http_examples.cpp
+++ b/test/doc/http_examples.cpp
@@ -20,7 +20,7 @@
 #include <boost/beast/http/write.hpp>
 #include <boost/beast/experimental/test/stream.hpp>
 #include <boost/beast/test/yield_to.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/experimental/unit_test/suite.hpp>
 #include <sstream>
 #include <array>
 #include <limits>
diff --git a/test/example/common/CMakeLists.txt b/test/example/common/CMakeLists.txt
index 7b320f08..5ee13696 100644
--- a/test/example/common/CMakeLists.txt
+++ b/test/example/common/CMakeLists.txt
@@ -7,11 +7,10 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(example/common common)
-GroupSources(test/extras/include/boost/beast extras)
-GroupSources(subtree/unit_test/include/boost/beast extras)
-GroupSources(include/boost/beast beast)
-GroupSources(test/example/common "/")
+GroupSources (include/boost/beast beast)
+GroupSources (example/common common)
+GroupSources (test/extras/include/boost/beast extras)
+GroupSources (test/example/common "/")
 
 add_executable (tests-example-common
     ${BOOST_BEAST_FILES}