diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa96731..f8ab544 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,69 +17,50 @@ permissions:
     contents: read
 
 jobs:
-  ubuntu-cmake-install:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: lukka/get-cmake@latest
-        with:
-          cmakeVersion: 3.17.0
-      - name: Configure Vulkan-Headers
-        run: cmake -S . -B build
-      - name: Install Vulkan-Headers
-        run: cmake --install build --prefix ${{ github.workspace }}/build/install
-      - name: Test Vulkan-Headers find_package support
-        run: cmake -S tests/find_package -B build/tests/find_package -D CMAKE_PREFIX_PATH=${{ github.workspace }}/build/install
-
-  ubuntu-cmake-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: lukka/get-cmake@latest
-        with:
-          cmakeVersion: 3.25.0
-      - name: Configure Vulkan-Headers
-        run: cmake -S . -B build -D BUILD_TESTS=ON --log-level=DEBUG
-      - name: Build Vulkan-Headers Tests
-        run: cmake --build build
-
-  windows-cmake-tests:
-    runs-on: windows-latest
+  build-tests:
+    name: BUILD_TESTS=ON ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        arch: [ amd64, amd64_x86 ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
     steps:
       - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: ${{ matrix.arch }}
-      - name: Configure Vulkan-Headers
-        run: cmake -S . -B build -D BUILD_TESTS=ON --log-level=DEBUG
-      - name: Build Vulkan-Headers Tests
-        run: cmake --build build
+      - run: cmake -S . -B build -D BUILD_TESTS=ON --log-level=DEBUG
+      - run: cmake --build build
 
   test-cmake-minimum:
+    name: Test CMake minimum
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
         with:
           cmakeVersion: 3.15.0
-      - name: Configure Vulkan-Headers
-        run: cmake -S . -B build/ --loglevel=DEBUG
-      - name: Install Vulkan-Headers
-        run: cmake --install build/ --prefix build/install
+      - run: cmake -S . -B build/ --loglevel=DEBUG
+      - run: cmake --install build/ --prefix build/install
 
-  ubuntu-cmake-add_subdirectory:
+  find_package:
+    name: Test find_package
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
-      - name: Test add_subdirectory support
-        run: cmake -S tests/add_subdirectory -B tests/add_subdirectory/build
-      - name: Build
-        run: cmake --build tests/add_subdirectory/build
+        with:
+          cmakeVersion: 3.17.0
+      - run: cmake -S . -B build
+      - run: cmake --install build --prefix ${{ github.workspace }}/build/install
+      - run: cmake -S tests/find_package -B build/tests/find_package -D CMAKE_PREFIX_PATH=${{ github.workspace }}/build/install
+
+  add_subdirectory:
+    name: Test add_subdirectory
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: lukka/get-cmake@latest
+      - run: cmake -S tests/add_subdirectory -B tests/add_subdirectory/build
+      - run: cmake --build tests/add_subdirectory/build
 
   reuse:
     runs-on: ubuntu-latest