diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2dca1ecb..b0f0edf2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -299,6 +299,13 @@ jobs:
           ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
           path: capy-root
 
+      - name: Clone Corosio
+        uses: actions/checkout@v4
+        with:
+          repository: cppalliance/corosio
+          ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
+          path: corosio-root
+
       - name: Clone Boost
         uses: alandefreitas/cpp-actions/boost-clone@v1.9.0
         id: boost-clone
@@ -307,7 +314,7 @@ jobs:
           boost-dir: boost-source
           modules-exclude-paths: ''
           scan-modules-dir: http-root
-          scan-modules-ignore: http,capy
+          scan-modules-ignore: http,capy,corosio
 
       - name: ASLR Fix
         if: ${{ startsWith(matrix.runs-on, 'ubuntu' )}}
@@ -334,6 +341,7 @@ jobs:
           # Remove module from boost-source
           rm -r "boost-source/libs/$module" || true
           rm -r "boost-source/libs/capy" || true
+          rm -r "boost-source/libs/corosio" || true
 
           # Copy cached boost-source to an isolated boost-root
           cp -r boost-source boost-root
@@ -350,6 +358,9 @@ jobs:
           # Patch boost-root with capy dependency
           cp -r "$workspace_root"/capy-root "libs/capy"
 
+          # Patch boost-root with corosio dependency
+          cp -r "$workspace_root"/corosio-root "libs/corosio"
+
       - name: Boost B2 Workflow
         uses: alandefreitas/cpp-actions/b2-workflow@v1.9.0
         if: ${{ !matrix.coverage }}
@@ -541,7 +552,7 @@ jobs:
         with:
           apt-get: git cmake
 
-      - name: Clone Boost.Corosio
+      - name: Clone Boost.Http
         uses: actions/checkout@v4
         with:
           path: http-root
@@ -553,6 +564,13 @@ jobs:
           ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
           path: capy-root
 
+      - name: Clone Corosio
+        uses: actions/checkout@v4
+        with:
+          repository: cppalliance/corosio
+          ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
+          path: corosio-root
+
       - name: Clone Boost
         uses: alandefreitas/cpp-actions/boost-clone@v1.9.0
         id: boost-clone
@@ -561,7 +579,7 @@ jobs:
           boost-dir: boost-source
           modules-exclude-paths: ''
           scan-modules-dir: http-root
-          scan-modules-ignore: http,capy
+          scan-modules-ignore: http,capy,corosio
 
       - name: Patch Boost
         id: patch
@@ -583,6 +601,7 @@ jobs:
           # Remove module from boost-source
           rm -r "boost-source/libs/$module" || true
           rm -r "boost-source/libs/capy" || true
+          rm -r "boost-source/libs/corosio" || true
 
           # Copy cached boost-source to an isolated boost-root
           cp -r boost-source boost-root
@@ -599,6 +618,9 @@ jobs:
           # Patch boost-root with capy dependency
           cp -r "$workspace_root"/capy-root "libs/capy"
 
+          # Patch boost-root with corosio dependency
+          cp -r "$workspace_root"/corosio-root "libs/corosio"
+
       - uses: actions/setup-node@v4
         with:
           node-version: 18
diff --git a/.gitignore b/.gitignore
index a9ff6e47..9938664c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,11 @@
 /.vscode/
+/.cache/
+/.clangd
 /build/*
 !/build/Jamfile
 /out/
-CMakeUserPresets.json
+/CMakeUserPresets.json
+/tmpclaude-*-cwd
 
 # CMake artifacts (if accidentally run from source dir)
 #CMakeCache.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3aad8701..41d051dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,7 @@ endforeach ()
 # Conditional dependencies
 if (NOT BOOST_URL_MRDOCS_BUILD)
     if (BOOST_HTTP_BUILD_TESTS)
-        set(BOOST_HTTP_UNIT_TEST_LIBRARIES filesystem)
+        set(BOOST_HTTP_UNIT_TEST_LIBRARIES asio filesystem)
     endif ()
     if (BOOST_HTTP_BUILD_EXAMPLES)
         # set(BOOST_HTTP_EXAMPLE_LIBRARIES json)
diff --git a/test/unit/bcrypt/error.cpp b/test/unit/bcrypt/bcrypt_error.cpp
similarity index 100%
rename from test/unit/bcrypt/error.cpp
rename to test/unit/bcrypt/bcrypt_error.cpp
diff --git a/test/unit/bcrypt/hash.cpp b/test/unit/bcrypt/bcrypt_hash.cpp
similarity index 100%
rename from test/unit/bcrypt/hash.cpp
rename to test/unit/bcrypt/bcrypt_hash.cpp
diff --git a/test/unit/bcrypt/result.cpp b/test/unit/bcrypt/bcrypt_result.cpp
similarity index 100%
rename from test/unit/bcrypt/result.cpp
rename to test/unit/bcrypt/bcrypt_result.cpp
diff --git a/test/unit/bcrypt/version.cpp b/test/unit/bcrypt/bcrypt_version.cpp
similarity index 100%
rename from test/unit/bcrypt/version.cpp
rename to test/unit/bcrypt/bcrypt_version.cpp