diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fcb4e94..17b0cef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -712,6 +712,10 @@ jobs:
             cxxstd64: "11-gnu,14-gnu,17-gnu,2a-gnu"
             os: windows-2019
 
+          - name: CMake tests
+            cmake_tests: 1
+            os: windows-2022
+
     timeout-minutes: 120
     runs-on: ${{matrix.os}}
 
@@ -737,10 +741,13 @@ jobs:
             xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
             git submodule update --init tools/boostdep
             python tools/boostdep/depinst/depinst.py --git_args "--jobs %GIT_FETCH_JOBS%" %LIBRARY%
-            cmd /c bootstrap
-            b2 -d0 headers
+            if "${{matrix.cmake_tests}}" == "" (
+                cmd /c bootstrap
+                b2 -d0 headers
+            )
 
       - name: Run tests
+        if: matrix.cmake_tests == ''
         shell: cmd
         run: |
             cd ../boost-root
@@ -763,3 +770,18 @@ jobs:
                 echo;
                 b2 %B2_ARGS% cxxstd=${{matrix.cxxstd32}} address-model=32 libs/%LIBRARY%/test
             )
+
+      - name: Run CMake tests
+        if: matrix.cmake_tests
+        shell: cmd
+        run: |
+            cd ../boost-root
+            mkdir __build_static__
+            cd __build_static__
+            cmake ../libs/%LIBRARY%/test/test_cmake
+            cmake --build . --target boost_%LIBRARY%_cmake_self_test -j %NUMBER_OF_PROCESSORS%
+            cd ..
+            mkdir __build_shared__
+            cd __build_shared__
+            cmake -DBUILD_SHARED_LIBS=On ../libs/%LIBRARY%/test/test_cmake
+            cmake --build . --target boost_%LIBRARY%_cmake_self_test -j %NUMBER_OF_PROCESSORS%