diff --git a/CMakePresets.json b/CMakePresets.json
new file mode 100644
index 00000000..5aa94bfe
--- /dev/null
+++ b/CMakePresets.json
@@ -0,0 +1,10 @@
+{
+    "version": 6,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 25,
+        "patch": 0
+    },
+    "configurePresets": [],
+    "buildPresets": []
+}
diff --git a/src/server/route_handler.cpp b/src/server/route_handler.cpp
index f8b60159..f03f3010 100644
--- a/src/server/route_handler.cpp
+++ b/src/server/route_handler.cpp
@@ -9,7 +9,6 @@
 
 #include <boost/http/server/route_handler.hpp>
 #include <boost/http/string_body.hpp>
-#include <boost/capy/ex/run_sync.hpp>
 
 namespace boost {
 namespace http {
diff --git a/test/unit/server/flat_router.cpp b/test/unit/server/flat_router.cpp
index 6505b0af..97d07236 100644
--- a/test/unit/server/flat_router.cpp
+++ b/test/unit/server/flat_router.cpp
@@ -13,8 +13,8 @@
 // Full functional tests are in beast2/test/unit/server/router.cpp
 
 #include <boost/http/server/router.hpp>
-#include <boost/capy/ex/run_sync.hpp>
 
+#include <boost/capy/test/run_blocking.hpp>
 #include "test_suite.hpp"
 
 namespace boost {
@@ -39,11 +39,11 @@ struct flat_router_test
         flat_router fr2(fr1);
 
         params req;
-        capy::run_sync()(fr1.dispatch(
+        capy::test::run_blocking()(fr1.dispatch(
             http::method::get, urls::url_view("/"), req));
         BOOST_TEST_EQ(*counter, 1);
 
-        capy::run_sync()(fr2.dispatch(
+        capy::test::run_blocking()(fr2.dispatch(
             http::method::get, urls::url_view("/"), req));
         BOOST_TEST_EQ(*counter, 2);
     }
@@ -70,11 +70,11 @@ struct flat_router_test
         fr2 = fr1;
 
         params req;
-        capy::run_sync()(fr1.dispatch(
+        capy::test::run_blocking()(fr1.dispatch(
             http::method::get, urls::url_view("/"), req));
         BOOST_TEST_EQ(*counter, 1);
 
-        capy::run_sync()(fr2.dispatch(
+        capy::test::run_blocking()(fr2.dispatch(
             http::method::get, urls::url_view("/"), req));
         BOOST_TEST_EQ(*counter, 2);
     }
diff --git a/test/unit/server/route_handler.cpp b/test/unit/server/route_handler.cpp
index 1048327c..5c49e7b2 100644
--- a/test/unit/server/route_handler.cpp
+++ b/test/unit/server/route_handler.cpp
@@ -13,14 +13,21 @@
 #include <boost/http/server/router.hpp>
 #include <boost/http/server/flat_router.hpp>
 #include <boost/http/request.hpp>
-#include <boost/capy/ex/run_sync.hpp>
 
+#include <boost/capy/test/run_blocking.hpp>
 #include "test_route_handler.hpp"
 #include "test_suite.hpp"
 
+#include <array>
+
 namespace boost {
 namespace http {
 
+struct any_write_buffers
+{
+    std::array<capy::const_buffer, 16> v_;
+};
+
 struct route_handler_test
 {
     using test_router = router<route_params>;
@@ -33,8 +40,9 @@ struct route_handler_test
     {
         flat_router fr(std::move(r));
         test_route_params p;
-        auto rv = capy::run_sync()(fr.dispatch(
-            verb, urls::url_view(url), p));
+        route_result rv;
+        capy::test::run_blocking([&](route_result r) { rv = r; })(
+            fr.dispatch(verb, urls::url_view(url), p));
         if(BOOST_TEST_EQ(rv.message(), rv0.message()))
             BOOST_TEST(rv == rv0);
     }
diff --git a/test/unit/server/router.cpp b/test/unit/server/router.cpp
index d027f22b..89fc8de3 100644
--- a/test/unit/server/router.cpp
+++ b/test/unit/server/router.cpp
@@ -12,8 +12,7 @@
 #include <boost/http/server/flat_router.hpp>
 #include <boost/http/server/detail/router_base.hpp>
 
-#include <boost/capy/ex/run_sync.hpp>
-
+#include <boost/capy/test/run_blocking.hpp>
 #include "test_suite.hpp"
 
 namespace boost {
@@ -108,8 +107,9 @@ struct router_test
     {
         flat_router fr(std::move(r));
         params req;
-        auto rv = capy::run_sync()(fr.dispatch(
-            http::method::get, urls::url_view(url), req));
+        route_result rv;
+        capy::test::run_blocking([&](route_result res) { rv = res; })(
+            fr.dispatch(http::method::get, urls::url_view(url), req));
         BOOST_TEST_EQ(rv.message(), rv0.message());
     }
 
@@ -121,8 +121,9 @@ struct router_test
     {
         flat_router fr(std::move(r));
         params req;
-        auto rv = capy::run_sync()(fr.dispatch(
-            verb, urls::url_view(url), req));
+        route_result rv;
+        capy::test::run_blocking([&](route_result res) { rv = res; })(
+            fr.dispatch(verb, urls::url_view(url), req));
         BOOST_TEST_EQ(rv.message(), rv0.message());
     }
 
@@ -134,8 +135,9 @@ struct router_test
     {
         flat_router fr(std::move(r));
         params req;
-        auto rv = capy::run_sync()(fr.dispatch(
-            verb, urls::url_view(url), req));
+        route_result rv;
+        capy::test::run_blocking([&](route_result res) { rv = res; })(
+            fr.dispatch(verb, urls::url_view(url), req));
         BOOST_TEST_EQ(rv.message(), rv0.message());
     }
 
@@ -411,7 +413,7 @@ struct router_test
             flat_router fr(std::move(r));
             params req;
             BOOST_TEST_THROWS(
-                capy::run_sync()(fr.dispatch(
+                capy::test::run_blocking()(fr.dispatch(
                     http::method::unknown, urls::url_view("/"), req)),
                 std::invalid_argument);
         }
@@ -423,7 +425,7 @@ struct router_test
             flat_router fr(std::move(r));
             params req;
             BOOST_TEST_THROWS(
-                capy::run_sync()(fr.dispatch(
+                capy::test::run_blocking()(fr.dispatch(
                     "", urls::url_view("/"), req)),
                 std::invalid_argument);
         }