diff --git a/test/v1/args_cmd.cpp b/test/v1/args_cmd.cpp
index 68d649573..70f531578 100644
--- a/test/v1/args_cmd.cpp
+++ b/test/v1/args_cmd.cpp
@@ -21,9 +21,7 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 
-namespace bp = boost::process;
-
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(args, *boost::unit_test::timeout(2))
 {
diff --git a/test/v1/args_handling.cpp b/test/v1/args_handling.cpp
index fefa7d525..459e7dff2 100644
--- a/test/v1/args_handling.cpp
+++ b/test/v1/args_handling.cpp
@@ -19,7 +19,7 @@
 #include <boost/process/v1/error.hpp>
 #include <boost/process/v1/child.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 BOOST_AUTO_TEST_CASE(implicit_args_fs_path)
diff --git a/test/v1/asio_no_deprecated.cpp b/test/v1/asio_no_deprecated.cpp
index eb48233dd..f991cf359 100644
--- a/test/v1/asio_no_deprecated.cpp
+++ b/test/v1/asio_no_deprecated.cpp
@@ -3,11 +3,34 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ASIO_NO_DEPRECATED 1
-#include <boost/process.hpp>
+#include <boost/process/v1/args.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/async_pipe.hpp>
+#include <boost/process/v1/async_system.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/cmd.hpp>
+#include <boost/process/v1/env.hpp>
+#include <boost/process/v1/environment.hpp>
+#include <boost/process/v1/error.hpp>
+#include <boost/process/v1/exception.hpp>
+#include <boost/process/v1/exe.hpp>
+#include <boost/process/v1/extend.hpp>
+#include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/group.hpp>
+#include <boost/process/v1/handles.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/locale.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/search_path.hpp>
+#include <boost/process/v1/shell.hpp>
+#include <boost/process/v1/spawn.hpp>
+#include <boost/process/v1/start_dir.hpp>
+#include <boost/process/v1/system.hpp>
+
 int main() {}
 
 #if defined(BOOST_POSIX_API)
 #include <boost/process/v1/posix.hpp>
 #else
 #include <boost/process/v1/windows.hpp>
-#endif
\ No newline at end of file
+#endif
diff --git a/test/v1/async.cpp b/test/v1/async.cpp
index 0adac13a8..31197aed6 100644
--- a/test/v1/async.cpp
+++ b/test/v1/async.cpp
@@ -25,7 +25,7 @@
 
 using namespace std;
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 #if __APPLE__
 auto abort_sig = signal(SIGALRM, +[](int){std::terminate();});
diff --git a/test/v1/async_fut.cpp b/test/v1/async_fut.cpp
index 74275abaa..356f4087f 100644
--- a/test/v1/async_fut.cpp
+++ b/test/v1/async_fut.cpp
@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_SUITE( async );
 
 using namespace std;
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(async_out_future, *boost::unit_test::timeout(2))
 {
@@ -103,4 +103,4 @@ BOOST_AUTO_TEST_CASE(emtpy_out, *boost::unit_test::timeout(2))
     BOOST_CHECK_EQUAL(fut.get(), "");
 }
 
-BOOST_AUTO_TEST_SUITE_END();
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END();
diff --git a/test/v1/async_pipe.cpp b/test/v1/async_pipe.cpp
index 17e2a9f24..7ae3735ea 100644
--- a/test/v1/async_pipe.cpp
+++ b/test/v1/async_pipe.cpp
@@ -20,7 +20,7 @@
 #include <boost/asio/streambuf.hpp>
 
 using namespace std;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 namespace asio = boost::asio;
 
 BOOST_AUTO_TEST_SUITE( async );
diff --git a/test/v1/async_system_fail.cpp b/test/v1/async_system_fail.cpp
index 28699f301..866d80dd9 100644
--- a/test/v1/async_system_fail.cpp
+++ b/test/v1/async_system_fail.cpp
@@ -18,7 +18,7 @@
 #include <boost/process/v1/async_system.hpp>
 #include <system_error>
 
-namespace bp = boost::process;;
+namespace bp = boost::process::v1;
 
 void fail_func()
 {
diff --git a/test/v1/async_system_future.cpp b/test/v1/async_system_future.cpp
index 009fe4953..48b8999f2 100644
--- a/test/v1/async_system_future.cpp
+++ b/test/v1/async_system_future.cpp
@@ -23,7 +23,7 @@
 #include <vector>
 #include <array>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_SUITE( async );
 
 BOOST_AUTO_TEST_CASE(future, *boost::unit_test::timeout(15))
diff --git a/test/v1/async_system_stackful.cpp b/test/v1/async_system_stackful.cpp
index bc6fc424e..68d966d7d 100644
--- a/test/v1/async_system_stackful.cpp
+++ b/test/v1/async_system_stackful.cpp
@@ -27,7 +27,7 @@
 #include <array>
 BOOST_AUTO_TEST_SUITE( async );
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_CASE(stackful, *boost::unit_test::timeout(15))
 {
     using boost::unit_test::framework::master_test_suite;
diff --git a/test/v1/async_system_stackful_error.cpp b/test/v1/async_system_stackful_error.cpp
index be0ce8a91..35cf6f4d7 100644
--- a/test/v1/async_system_stackful_error.cpp
+++ b/test/v1/async_system_stackful_error.cpp
@@ -26,7 +26,7 @@
 #include <array>
 BOOST_AUTO_TEST_SUITE( async );
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_CASE(stackful, *boost::unit_test::timeout(15))
 {
     using boost::unit_test::framework::master_test_suite;
diff --git a/test/v1/async_system_stackful_except.cpp b/test/v1/async_system_stackful_except.cpp
index 0efb34fde..d4d3051e4 100644
--- a/test/v1/async_system_stackful_except.cpp
+++ b/test/v1/async_system_stackful_except.cpp
@@ -26,7 +26,7 @@
 #include <array>
 BOOST_AUTO_TEST_SUITE( async );
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_CASE(stackful_except, *boost::unit_test::timeout(15))
 {
     using boost::unit_test::framework::master_test_suite;
diff --git a/test/v1/async_system_stackless.cpp b/test/v1/async_system_stackless.cpp
index f5ba6c07a..9dccf6993 100644
--- a/test/v1/async_system_stackless.cpp
+++ b/test/v1/async_system_stackless.cpp
@@ -25,7 +25,7 @@
 #include <array>
 BOOST_AUTO_TEST_SUITE( async );
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_CASE(stackless, *boost::unit_test::timeout(15))
 {
     using boost::unit_test::framework::master_test_suite;
diff --git a/test/v1/bind_stderr.cpp b/test/v1/bind_stderr.cpp
index 3750eb275..7e2e083cb 100644
--- a/test/v1/bind_stderr.cpp
+++ b/test/v1/bind_stderr.cpp
@@ -39,7 +39,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
 #endif
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_SUITE( bind_stderr );
 
 BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(2))
diff --git a/test/v1/bind_stdin.cpp b/test/v1/bind_stdin.cpp
index d539c695e..2a0bb78c8 100644
--- a/test/v1/bind_stdin.cpp
+++ b/test/v1/bind_stdin.cpp
@@ -43,7 +43,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
 
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(10))
 {
diff --git a/test/v1/bind_stdin_stdout.cpp b/test/v1/bind_stdin_stdout.cpp
index 6cf4b1b05..b43a3111b 100644
--- a/test/v1/bind_stdin_stdout.cpp
+++ b/test/v1/bind_stdin_stdout.cpp
@@ -22,7 +22,7 @@
 #include <string>
 #include <iostream>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_SUITE( bind_stdin_stdout );
 
 BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(10))
diff --git a/test/v1/bind_stdout.cpp b/test/v1/bind_stdout.cpp
index f07125f0b..3a1a1f2f4 100644
--- a/test/v1/bind_stdout.cpp
+++ b/test/v1/bind_stdout.cpp
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_SUITE( bind_stdout );
 
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(5))
 {
diff --git a/test/v1/bind_stdout_stderr.cpp b/test/v1/bind_stdout_stderr.cpp
index 228cb9c68..c3d9dad40 100644
--- a/test/v1/bind_stdout_stderr.cpp
+++ b/test/v1/bind_stdout_stderr.cpp
@@ -34,7 +34,7 @@ typedef boost::asio::windows::stream_handle pipe_end;
 typedef boost::asio::posix::stream_descriptor pipe_end;
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_SUITE( bind_stdout_stderr );
 
diff --git a/test/v1/close_stderr.cpp b/test/v1/close_stderr.cpp
index b0811ffb8..bd08169d1 100644
--- a/test/v1/close_stderr.cpp
+++ b/test/v1/close_stderr.cpp
@@ -22,7 +22,7 @@
 #   include <sys/wait.h>
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 BOOST_AUTO_TEST_CASE(close_stderr)
diff --git a/test/v1/close_stdin.cpp b/test/v1/close_stdin.cpp
index 347860d9a..46f08307e 100644
--- a/test/v1/close_stdin.cpp
+++ b/test/v1/close_stdin.cpp
@@ -22,7 +22,7 @@
 #   include <sys/wait.h>
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(close_stdin)
 {
diff --git a/test/v1/close_stdout.cpp b/test/v1/close_stdout.cpp
index 3b31e77d7..70d6c611a 100644
--- a/test/v1/close_stdout.cpp
+++ b/test/v1/close_stdout.cpp
@@ -22,7 +22,7 @@
 #   include <sys/wait.h>
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(close_stdout)
 {
diff --git a/test/v1/cmd_test.cpp b/test/v1/cmd_test.cpp
index 4d5078a95..4e9013f98 100644
--- a/test/v1/cmd_test.cpp
+++ b/test/v1/cmd_test.cpp
@@ -26,7 +26,7 @@
 #include <boost/system/error_code.hpp>
 #include <cstdlib>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 namespace fs = boost::process::v1::filesystem;
 
 
diff --git a/test/v1/env.cpp b/test/v1/env.cpp
index 31132bbf5..f236e4214 100644
--- a/test/v1/env.cpp
+++ b/test/v1/env.cpp
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <list>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(inherit_env, *boost::unit_test::timeout(2))
 {
diff --git a/test/v1/environment.cpp b/test/v1/environment.cpp
index 74952c2eb..8e747cf18 100644
--- a/test/v1/environment.cpp
+++ b/test/v1/environment.cpp
@@ -12,7 +12,7 @@
 #include <boost/test/included/unit_test.hpp>
 #include <boost/process/v1/environment.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 namespace std
diff --git a/test/v1/error.cpp b/test/v1/error.cpp
index 83cb9a383..d2652c745 100644
--- a/test/v1/error.cpp
+++ b/test/v1/error.cpp
@@ -19,7 +19,7 @@
 
 
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 struct err_set
 {
diff --git a/test/v1/exit_code.cpp b/test/v1/exit_code.cpp
index 8335033d0..cac8e263c 100644
--- a/test/v1/exit_code.cpp
+++ b/test/v1/exit_code.cpp
@@ -26,7 +26,7 @@ typedef boost::asio::windows::stream_handle pipe_end;
 typedef boost::asio::posix::stream_descriptor pipe_end;
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(sync_wait, *boost::unit_test::timeout(10))
 {
diff --git a/test/v1/extensions.cpp b/test/v1/extensions.cpp
index 46de3e39f..b079d6ee6 100644
--- a/test/v1/extensions.cpp
+++ b/test/v1/extensions.cpp
@@ -17,7 +17,7 @@
 #include <boost/process/v1/extend.hpp>
 
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 struct run_exe
diff --git a/test/v1/group.cpp b/test/v1/group.cpp
index ae70dfd7f..41173835d 100644
--- a/test/v1/group.cpp
+++ b/test/v1/group.cpp
@@ -29,7 +29,7 @@
 #include <iostream>
 #include <cstdlib>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(group_test, *boost::unit_test::timeout(5))
 {
diff --git a/test/v1/group_wait.cpp b/test/v1/group_wait.cpp
index 93eb15e9e..ccc512ac8 100644
--- a/test/v1/group_wait.cpp
+++ b/test/v1/group_wait.cpp
@@ -30,7 +30,7 @@
 #include <iostream>
 #include <cstdlib>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 
diff --git a/test/v1/limit_fd.cpp b/test/v1/limit_fd.cpp
index 2c2cb8716..df76b9759 100644
--- a/test/v1/limit_fd.cpp
+++ b/test/v1/limit_fd.cpp
@@ -7,9 +7,7 @@
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
 
-#include <iostream>
-
-#include <boost/process.hpp>
+#include <boost/process/v1/system.hpp>
 #include <boost/process/v1/handles.hpp>
 #include <boost/process/v1/pipe.hpp>
 #include <boost/process/v1/io.hpp>
@@ -32,8 +30,7 @@
 #include <dirent.h>
 #endif
 
-namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 namespace bt = boost::this_process;
 
 BOOST_AUTO_TEST_CASE(leak_test, *boost::unit_test::timeout(5))
diff --git a/test/v1/multi_ref1.cpp b/test/v1/multi_ref1.cpp
index 9ba9027d7..2301f5cc8 100644
--- a/test/v1/multi_ref1.cpp
+++ b/test/v1/multi_ref1.cpp
@@ -4,4 +4,32 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <boost/process.hpp>
+#include <boost/process/v1/args.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/async_pipe.hpp>
+#include <boost/process/v1/async_system.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/cmd.hpp>
+#include <boost/process/v1/env.hpp>
+#include <boost/process/v1/environment.hpp>
+#include <boost/process/v1/error.hpp>
+#include <boost/process/v1/exception.hpp>
+#include <boost/process/v1/exe.hpp>
+#include <boost/process/v1/extend.hpp>
+#include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/group.hpp>
+#include <boost/process/v1/handles.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/locale.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/search_path.hpp>
+#include <boost/process/v1/shell.hpp>
+#include <boost/process/v1/spawn.hpp>
+#include <boost/process/v1/start_dir.hpp>
+#include <boost/process/v1/system.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/posix.hpp>
+#else
+#include <boost/process/v1/windows.hpp>
+#endif
diff --git a/test/v1/multi_ref2.cpp b/test/v1/multi_ref2.cpp
index 450ed5b5e..1896ba252 100644
--- a/test/v1/multi_ref2.cpp
+++ b/test/v1/multi_ref2.cpp
@@ -3,4 +3,32 @@
 // 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)
 
-#include <boost/process.hpp>
+#include <boost/process/v1/args.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/async_pipe.hpp>
+#include <boost/process/v1/async_system.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/cmd.hpp>
+#include <boost/process/v1/env.hpp>
+#include <boost/process/v1/environment.hpp>
+#include <boost/process/v1/error.hpp>
+#include <boost/process/v1/exception.hpp>
+#include <boost/process/v1/exe.hpp>
+#include <boost/process/v1/extend.hpp>
+#include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/group.hpp>
+#include <boost/process/v1/handles.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/locale.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/search_path.hpp>
+#include <boost/process/v1/shell.hpp>
+#include <boost/process/v1/spawn.hpp>
+#include <boost/process/v1/start_dir.hpp>
+#include <boost/process/v1/system.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/posix.hpp>
+#else
+#include <boost/process/v1/windows.hpp>
+#endif
diff --git a/test/v1/no_ansi_apps.cpp b/test/v1/no_ansi_apps.cpp
index fcd09dd8c..561025c17 100644
--- a/test/v1/no_ansi_apps.cpp
+++ b/test/v1/no_ansi_apps.cpp
@@ -6,5 +6,30 @@
 #include <boost/system/api_config.hpp>
 #if defined(BOOST_WINDOWS_API)
 #define BOOST_NO_ANSI_APIS 1
+#include <boost/process/v1/args.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/async_pipe.hpp>
+#include <boost/process/v1/async_system.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/cmd.hpp>
+#include <boost/process/v1/env.hpp>
+#include <boost/process/v1/environment.hpp>
+#include <boost/process/v1/error.hpp>
+#include <boost/process/v1/exception.hpp>
+#include <boost/process/v1/exe.hpp>
+#include <boost/process/v1/extend.hpp>
+#include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/group.hpp>
+#include <boost/process/v1/handles.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/locale.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/search_path.hpp>
+#include <boost/process/v1/shell.hpp>
+#include <boost/process/v1/spawn.hpp>
+#include <boost/process/v1/start_dir.hpp>
+#include <boost/process/v1/system.hpp>
+#include <boost/process/v1/windows.hpp>
 #endif
-#include <boost/process.hpp>
\ No newline at end of file
+
+int main() {}
diff --git a/test/v1/on_exit.cpp b/test/v1/on_exit.cpp
index e46e2ea84..c1f96fb2b 100644
--- a/test/v1/on_exit.cpp
+++ b/test/v1/on_exit.cpp
@@ -10,7 +10,8 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
-#include <boost/process.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/child.hpp>
 #include <boost/asio.hpp>
 #include <chrono>
 #include <thread>
@@ -26,7 +27,7 @@ BOOST_AUTO_TEST_CASE(single_ios, *boost::unit_test::timeout(6))
         return;
     }
 
-    namespace bp = boost::process;
+    namespace bp = boost::process::v1;
     boost::asio::io_context ios;
     std::chrono::steady_clock::time_point p1, p2;
 
diff --git a/test/v1/on_exit2.cpp b/test/v1/on_exit2.cpp
index 20d401bb5..e6c219254 100644
--- a/test/v1/on_exit2.cpp
+++ b/test/v1/on_exit2.cpp
@@ -10,7 +10,8 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
-#include <boost/process.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/child.hpp>
 #include <boost/asio.hpp>
 #include <chrono>
 #include <thread>
@@ -26,7 +27,7 @@ BOOST_AUTO_TEST_CASE(double_ios, *boost::unit_test::timeout(6))
         return;
     }
 
-    namespace bp = boost::process;
+    namespace bp = boost::process::v1;
     boost::asio::io_context ios;
     std::chrono::steady_clock::time_point p1, p2;
 
diff --git a/test/v1/on_exit3.cpp b/test/v1/on_exit3.cpp
index 84fe6845c..b69a63e1f 100644
--- a/test/v1/on_exit3.cpp
+++ b/test/v1/on_exit3.cpp
@@ -10,7 +10,8 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
-#include <boost/process.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/child.hpp>
 #include <boost/asio.hpp>
 #include <chrono>
 #include <thread>
@@ -26,7 +27,7 @@ BOOST_AUTO_TEST_CASE(double_ios_threaded, *boost::unit_test::timeout(6))
         return;
     }
 
-    namespace bp = boost::process;
+    namespace bp = boost::process::v1;
     boost::asio::io_context ios;
     std::chrono::steady_clock::time_point p1, p2;
 
diff --git a/test/v1/pipe.cpp b/test/v1/pipe.cpp
index e32bbe066..f90054c26 100644
--- a/test/v1/pipe.cpp
+++ b/test/v1/pipe.cpp
@@ -14,7 +14,7 @@
 #include <boost/process/v1/environment.hpp>
 
 using namespace std;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_SUITE( pipe_tests );
 
diff --git a/test/v1/pipe_fwd.cpp b/test/v1/pipe_fwd.cpp
index 575a8e764..d346e93bd 100644
--- a/test/v1/pipe_fwd.cpp
+++ b/test/v1/pipe_fwd.cpp
@@ -29,7 +29,7 @@
 
 BOOST_AUTO_TEST_SUITE( pipe_tests );
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(5))
 {
diff --git a/test/v1/posix_specific.cpp b/test/v1/posix_specific.cpp
index e46e73414..480522ad7 100644
--- a/test/v1/posix_specific.cpp
+++ b/test/v1/posix_specific.cpp
@@ -11,10 +11,14 @@
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
 
-#include <boost/process.hpp>
-#include <boost/process/v1/posix.hpp>
-
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/environment.hpp>
 #include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/posix.hpp>
+#include <boost/process/v1/spawn.hpp>
+#include <boost/process/v1/system.hpp>
 
 #if !defined(BOOST_PROCESS_USE_STD_FS)
 #include <boost/filesystem/directory.hpp>
@@ -29,7 +33,7 @@
 #include <errno.h>
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(bind_fd, *boost::unit_test::timeout(2))
 {
diff --git a/test/v1/run_exe.cpp b/test/v1/run_exe.cpp
index 3e3b86005..b49440f74 100644
--- a/test/v1/run_exe.cpp
+++ b/test/v1/run_exe.cpp
@@ -15,7 +15,7 @@
 #include <boost/process/v1/error.hpp>
 #include <boost/process/v1/child.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 int main(int argc, char* argv[])
 {
diff --git a/test/v1/run_exe_path.cpp b/test/v1/run_exe_path.cpp
index d40f71afc..a5e1f8d87 100644
--- a/test/v1/run_exe_path.cpp
+++ b/test/v1/run_exe_path.cpp
@@ -18,7 +18,7 @@
 #include <boost/process/v1/error.hpp>
 #include <boost/process/v1/child.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 BOOST_AUTO_TEST_CASE(run_exe_success)
diff --git a/test/v1/search_path.cpp b/test/v1/search_path.cpp
index 9f149e8ea..4a090af1e 100644
--- a/test/v1/search_path.cpp
+++ b/test/v1/search_path.cpp
@@ -13,7 +13,7 @@
 #include <boost/process/v1/filesystem.hpp>
 #include <string>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 namespace fs = boost::process::v1::filesystem;
 
 BOOST_AUTO_TEST_CASE(search_path)
diff --git a/test/v1/shell.cpp b/test/v1/shell.cpp
index 8c5e9c3a9..9349506db 100644
--- a/test/v1/shell.cpp
+++ b/test/v1/shell.cpp
@@ -22,7 +22,7 @@
 #include <boost/process/v1/child.hpp>
 #include <boost/process/v1/shell.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 BOOST_AUTO_TEST_CASE(shell_simple, *boost::unit_test::timeout(5))
diff --git a/test/v1/shell_path.cpp b/test/v1/shell_path.cpp
index 0b5d560a7..5c53b66c5 100644
--- a/test/v1/shell_path.cpp
+++ b/test/v1/shell_path.cpp
@@ -13,7 +13,7 @@
 #include <boost/process/v1/filesystem.hpp>
 #include <system_error>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(shell_set_on_error)
 {
diff --git a/test/v1/spawn.cpp b/test/v1/spawn.cpp
index e952ff4b9..76207ec60 100644
--- a/test/v1/spawn.cpp
+++ b/test/v1/spawn.cpp
@@ -39,7 +39,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
 #endif
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(sync_spawn, *boost::unit_test::timeout(5))
 {
diff --git a/test/v1/spawn_fail.cpp b/test/v1/spawn_fail.cpp
index c6b5c9490..c79d32d60 100644
--- a/test/v1/spawn_fail.cpp
+++ b/test/v1/spawn_fail.cpp
@@ -35,7 +35,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
 #endif
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 int main()
 {
diff --git a/test/v1/start_dir.cpp b/test/v1/start_dir.cpp
index 14cc7fc45..d77780e9a 100644
--- a/test/v1/start_dir.cpp
+++ b/test/v1/start_dir.cpp
@@ -10,14 +10,19 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
-#include <boost/process.hpp>
 #include <boost/system/error_code.hpp>
+#include <boost/process/v1/args.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/exe.hpp>
 #include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/start_dir.hpp>
 #include <boost/algorithm/string/compare.hpp>
+
 #include <string>
-#include <iostream>
 
-namespace bp  = boost::process;
+namespace bp = boost::process::v1;
 
 
 struct test_dir
diff --git a/test/v1/sub_launcher.cpp b/test/v1/sub_launcher.cpp
index 3579b3bf0..35c752d31 100644
--- a/test/v1/sub_launcher.cpp
+++ b/test/v1/sub_launcher.cpp
@@ -2,7 +2,9 @@
 // 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)
 
-#include <boost/process.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/group.hpp>
 #include <boost/program_options.hpp>
 
 #include <vector>
@@ -20,7 +22,7 @@ int main(int argc, char *argv[])
 {
     using namespace std;
     using namespace boost::program_options;
-    using namespace boost::process;
+    using namespace boost::process::v1;
 
     bool launch_detached = false;
     bool launch_attached = false;
diff --git a/test/v1/system_test1.cpp b/test/v1/system_test1.cpp
index 612af9aef..23c218505 100644
--- a/test/v1/system_test1.cpp
+++ b/test/v1/system_test1.cpp
@@ -44,7 +44,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
 #endif
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(system_exit_code, *boost::unit_test::timeout(5))
 {
diff --git a/test/v1/system_test2.cpp b/test/v1/system_test2.cpp
index c4bb7ab56..0ab809af5 100644
--- a/test/v1/system_test2.cpp
+++ b/test/v1/system_test2.cpp
@@ -38,7 +38,7 @@
 #include <cstdlib>
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(explicit_async_io, *boost::unit_test::timeout(2))
 {
diff --git a/test/v1/terminate.cpp b/test/v1/terminate.cpp
index 2a19598bc..b625ea8fe 100644
--- a/test/v1/terminate.cpp
+++ b/test/v1/terminate.cpp
@@ -20,7 +20,7 @@
 #include <system_error>
 #include <thread>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(terminate_set_on_error, *boost::unit_test::timeout(5))
 {
diff --git a/test/v1/throw_on_error.cpp b/test/v1/throw_on_error.cpp
index 56fb54e17..8f0962b2c 100644
--- a/test/v1/throw_on_error.cpp
+++ b/test/v1/throw_on_error.cpp
@@ -9,11 +9,11 @@
 
 #include <boost/core/lightweight_test.hpp>
 
-#include <boost/process.hpp>
+#include <boost/process/v1/child.hpp>
 #include <boost/process/v1/cmd.hpp>
 #include <system_error>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 int main(int argc, char* argv[])
 {
diff --git a/test/v1/vfork.cpp b/test/v1/vfork.cpp
index 2bfc3fa7f..ddaef41df 100644
--- a/test/v1/vfork.cpp
+++ b/test/v1/vfork.cpp
@@ -11,7 +11,7 @@
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
 
-#include <boost/process.hpp>
+#include <boost/process/v1.hpp>
 #include <boost/process/v1/posix.hpp>
 
 #include <system_error>
@@ -21,7 +21,7 @@
 #include <sys/wait.h>
 #include <errno.h>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 #if defined(BOOST_POSIX_HAS_VFORK)
 
diff --git a/test/v1/wait.cpp b/test/v1/wait.cpp
index b703f2e1d..73a093f98 100644
--- a/test/v1/wait.cpp
+++ b/test/v1/wait.cpp
@@ -22,7 +22,7 @@
 #   include <signal.h>
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_SUITE( wait_test );
 
diff --git a/test/v1/wait_for.cpp b/test/v1/wait_for.cpp
index 4dd5c3166..04f17dc96 100644
--- a/test/v1/wait_for.cpp
+++ b/test/v1/wait_for.cpp
@@ -21,7 +21,7 @@
 #   include <signal.h>
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_SUITE( wait_test);
 
 BOOST_AUTO_TEST_CASE(wait_for)
diff --git a/test/v1/wargs_cmd.cpp b/test/v1/wargs_cmd.cpp
index 53756c065..e2beec803 100644
--- a/test/v1/wargs_cmd.cpp
+++ b/test/v1/wargs_cmd.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 BOOST_AUTO_TEST_CASE(wargs, *boost::unit_test::timeout(2))
diff --git a/test/v1/windows_specific.cpp b/test/v1/windows_specific.cpp
index 59b6c2214..fd999a969 100644
--- a/test/v1/windows_specific.cpp
+++ b/test/v1/windows_specific.cpp
@@ -10,14 +10,14 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
-#include <boost/process.hpp>
+#include <boost/process/v1.hpp>
 #include <boost/process/v1/windows.hpp>
 #include <boost/process/v1/extend.hpp>
 #include <boost/system/error_code.hpp>
 
 #include <string>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(show_window)
 {