diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index a85ed74..e26a2a6 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -6,26 +6,48 @@ on:
     branches: master
 
 jobs:
-  test:
-    strategy:
-      matrix:
-        platform:
-          - windows-latest
-        toolchain:
-          - stable
-    runs-on: ${{ matrix.platform }}
+  test-x86_64-pc-windows-msvc:
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
       - uses: swatinem/rust-cache@v2
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: ${{ matrix.toolchain }}
+          toolchain: stable
           profile: minimal
           override: true
           targets: "wasm32-unknown-unknown"
-      - name: "Test on the native x86_64-pc-windows-mscv"
+      - name: "Test on the native x86_64-pc-windows-msvc"
         run: cargo test --all-features --workspace
+
+  test-x86_64-pc-windows-gnu:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: swatinem/rust-cache@v2
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+          targets: "wasm32-unknown-unknown"
       - name: "Test when cross-compiling to x86_64-pc-windows-gnu"
         env:
           AUDITABLE_TEST_TARGET: "x86_64-pc-windows-gnu"
         run: cargo test --all-features --workspace
+
+  test-i686-pc-windows-msvc:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: swatinem/rust-cache@v2
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+          targets: "wasm32-unknown-unknown,i686-pc-windows-msvc"
+      - name: "Test when cross-compiling to i686-pc-windows-msvc"
+        env:
+          AUDITABLE_TEST_TARGET: "i686-pc-windows-msvc"
+        run: cargo test --all-features --workspace
diff --git a/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml b/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml
index 1287e6b..b7511fc 100644
--- a/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml
+++ b/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml
@@ -31,3 +31,4 @@ rustflags = ["-C", "target-feature=+crt-static"]
 [target.x86_64-unknown-linux-musl]
 linker = "rust-lld"
 rustflags = ["-C", "target-feature=+crt-static"]
+