diff --git a/.github/workflows/fips.yml b/.github/workflows/fips.yml
index 48869c0b45f..40a85273387 100644
--- a/.github/workflows/fips.yml
+++ b/.github/workflows/fips.yml
@@ -58,29 +58,29 @@ jobs:
       fail-fast: false
       matrix:
         rust: [ stable ]
-        os: [ windows-2019, windows-2022 ]
-        args:
-          - --all-targets --features fips,unstable
-          - --all-targets --features fips,bindgen,unstable
-          - --release --all-targets --features fips,unstable
-          - --no-default-features --features fips,unstable
-          - --no-default-features --features fips,ring-io,unstable
-          - --no-default-features --features fips,ring-sig-verify,unstable
-          - --no-default-features --features fips,alloc,unstable
+        os: [ windows-2019, windows-latest ]
     steps:
-      - uses: ilammy/setup-nasm@v1
-      - uses: actions/checkout@v3
+      - name: Checkout sources
+        uses: actions/checkout@v4
         with:
+          persist-credentials: false
           submodules: 'recursive'
-      - uses: actions-rs/toolchain@v1.0.7
-        id: toolchain
+      - name: Install ${{ matrix.rust }} toolchain
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          override: true
-      - name: Install ninja-build tool
+      - name: Install NASM for aws-lc-rs on Windows
+        if: runner.os == 'Windows'
+        uses: ilammy/setup-nasm@v1
+
+      - name: Install ninja-build tool for aws-lc-fips-sys on Windows
+        if: runner.os == 'Windows'
         uses: seanmiddleditch/gha-setup-ninja@v4
-      - name: Run cargo test
-        working-directory: ./aws-lc-rs
-        # Doc-tests fail to link with dynamic build
-        # See: https://github.com/rust-lang/cargo/issues/8531
-        run: cargo test --tests ${{ matrix.args }}
+
+      - name: cargo build (debug; default features)
+        run: cargo build
+
+      - name: cargo test (release; all features)
+        run: cargo test --release --features fips
+        env:
+          RUST_BACKTRACE: 1
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8fe825688d0..91f001a9b95 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-12 ]
+        os: [ ubuntu-latest, macos-12, windows-latest ]
         features: [ aws-lc-sys, aws-lc-fips-sys ]
     steps:
       - uses: actions/checkout@v3
@@ -31,6 +31,15 @@ jobs:
         id: toolchain
       - name: Set Rust toolchain override
         run: rustup override set ${{ steps.toolchain.outputs.name }}
+      - name: Install NASM for aws-lc-rs on Windows
+        if: runner.os == 'Windows'
+        uses: ilammy/setup-nasm@v1
+      - name: Setup Go >=v1.18
+        uses: actions/setup-go@v4
+        with:
+          go-version: '>=1.18'
+      - name: Install ninja-build tool
+        uses: seanmiddleditch/gha-setup-ninja@v4
       - name: Run cargo test
         working-directory: ./sys-testing
         run: cargo test --features ${{ matrix.features }} --no-default-features