diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 59175211..70b175a0 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -31,14 +31,15 @@ jobs:
           cargo build --examples --features "${CI_BUILD_FEATURES}"
           cargo test --features "${CI_BUILD_FEATURES}"
 
-  build-windows:
+  build-bundled:
     name: build windows bundled
-    runs-on: windows-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         feature: ["", "static-link"]
         build_mode: ["", "--release"]
+        os: [macos-latest, ubuntu-latest, windows-latest]
     steps:
       - uses: actions/checkout@v2
       - name: Build SDL2
@@ -56,12 +57,10 @@ jobs:
           cargo test --features "${CI_BUILD_FEATURES} ${{matrix.feature}}" ${{matrix.build_mode}}
 
   build-linux:
-    name: build linux
+    name: build linux pkg-config
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
-      matrix:
-        feature: ["", "bundled"]
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
@@ -77,6 +76,6 @@ jobs:
           set -xeuo pipefail
           rustc --version
           cargo --version
-          cargo build --features "${CI_BUILD_FEATURES},${{matrix.feature}}"
-          cargo build --examples --features "${CI_BUILD_FEATURES},${{matrix.feature}}"
-          cargo test --features "${CI_BUILD_FEATURES},${{matrix.feature}}"
+          cargo build --features "${CI_BUILD_FEATURES}"
+          cargo build --examples --features "${CI_BUILD_FEATURES}"
+          cargo test --features "${CI_BUILD_FEATURES}"