diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 569f614f..7aed43a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -212,10 +212,6 @@ jobs:
             os: ubuntu-24.04
             supported: true
 # macos
-          - toolset: clang
-            os: macos-12
-            cxxstd: "11,14,17,20,2b"
-            supported: true
           - toolset: clang
             os: macos-13
             cxxstd: "11,14,17,20,2b"
@@ -224,6 +220,10 @@ jobs:
             os: macos-14
             cxxstd: "11,14,17,20,2b"
             supported: true
+          - toolset: clang
+            os: macos-15
+            cxxstd: "11,14,17,20,2b"
+            supported: true
 
     needs: [runner-selection]
     runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)[matrix.os] }}
@@ -231,8 +231,8 @@ jobs:
       image: ${{ matrix.container }}
       volumes:
         - /node20217:/node20217:rw,rshared
-        - /node20217:/__e/node20:ro,rshared
-
+        - ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}
+  
     steps:
       - name: Setup container environment
         if: matrix.container != ''
@@ -251,7 +251,7 @@ jobs:
           sudo /usr/local/bin/pip install cmake
 
       - name: Install nodejs20glibc2.17
-        if: matrix.container == 'ubuntu:16.04' || matrix.container == 'ubuntu:18.04'
+        if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
         run: |
           curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
           tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
@@ -605,7 +605,7 @@ jobs:
       - name: Use the installed library
         run: |
           cd ../boost-root/libs/$LIBRARY/test/cmake_test && mkdir __build__ && cd __build__
-          cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
+          cmake -DCMAKE_INSTALL_PREFIX=~/.local -DBOOST_CI_INSTALL_TEST=ON ..
           cmake --build .
           ctest --output-on-failure --no-tests=error
 
@@ -771,7 +771,7 @@ jobs:
         shell: cmd
         run: |
           cd ../boost-root/libs/%LIBRARY%/test/cmake_test && mkdir __build__ && cd __build__
-          cmake -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix -DCMAKE_TOOLCHAIN_FILE="../../../cmake/toolchains/msvc.cmake" ..
+          cmake -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix -DBOOST_CI_INSTALL_TEST=ON -DCMAKE_TOOLCHAIN_FILE="../../../cmake/toolchains/msvc.cmake" ..
           cmake --build . --config Debug
           ctest --output-on-failure --no-tests=error -C Debug
 
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index c491cd26..02d677e5 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -60,6 +60,7 @@ jobs:
             -DCMAKE_CXX_COMPILER=clang++ \
             -DCMAKE_C_COMPILER=clang \
             -DBOOST_BEAST_BUILD_EXAMPLES=OFF \
+            -DBOOST_BEAST_BUILD_TESTS=ON \
             -DBOOST_BEAST_BUILD_FUZZERS=ON \
             -DBOOST_BEAST_FUZZER_CORPUS_PATH=${{ github.workspace }}/corpus.tar ..
-          make boost_beast_fuzz_all
+          cmake --build . --target boost_beast_fuzz_all
diff --git a/test/cmake_test/CMakeLists.txt b/test/cmake_test/CMakeLists.txt
index 4872e3dd..847e52e7 100644
--- a/test/cmake_test/CMakeLists.txt
+++ b/test/cmake_test/CMakeLists.txt
@@ -1,6 +1,7 @@
 #
-# Copyright (c) 2023 Christian Mazakas
 # Copyright (c) 2022 alandefreitas (alandefreitas@gmail.com)
+# Copyright (c) 2023 Christian Mazakas
+# Copyright (c) 2024 Mohammad Nejati
 #
 # Distributed under the Boost Software License, Version 1.0.
 # https://www.boost.org/LICENSE_1_0.txt
@@ -18,7 +19,7 @@ else()
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
   add_subdirectory(../.. boostorg/beast)
 
-  set(BOOST_URL_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+  set(BOOST_BEAST_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 
   set(deps
   # Primary dependencies