diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 507057afe5..3e811072ff 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -97,3 +97,44 @@ jobs:
 
       - name: Run tests
         run: go run build/ci.go test -p 8
+
+  windows:
+    name: Windows ${{ matrix.arch }}
+    needs: lint
+    runs-on: [self-hosted, windows, x64]
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: amd64
+            mingw: 'C:\msys64\mingw64'
+            test: true
+          - arch: '386'
+            mingw: 'C:\msys64\mingw32'
+            test: false
+    env:
+      GETH_MINGW: ${{ matrix.mingw }}
+      GETH_CC: ${{ matrix.mingw }}\bin\gcc.exe
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.25'
+          cache: false
+
+      - name: Build
+        shell: cmd
+        run: |
+          set PATH=%GETH_MINGW%\bin;%PATH%
+          go run build/ci.go install -arch ${{ matrix.arch }} -cc %GETH_CC%
+
+      - name: Run tests
+        if: matrix.test
+        shell: cmd
+        run: |
+          set PATH=%GETH_MINGW%\bin;%PATH%
+          go run build/ci.go test -arch ${{ matrix.arch }} -cc %GETH_CC% -short -p 8
diff --git a/.github/workflows/windows-smoke.yml b/.github/workflows/windows-smoke.yml
deleted file mode 100644
index 81b9ed9d38..0000000000
--- a/.github/workflows/windows-smoke.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Windows Runner Smoke Test
-
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - '.github/workflows/windows-smoke.yml'
-
-jobs:
-  windows:
-    name: Windows amd64
-    runs-on: [self-hosted, windows, x64]
-    env:
-      GETH_MINGW: 'C:\msys64\mingw64'
-      GETH_CC: 'C:\msys64\mingw64\bin\gcc.exe'
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.25'
-          cache: false
-
-      - name: Show tool versions
-        shell: cmd
-        run: |
-          go version
-          "%GETH_CC%" --version
-
-      - name: Build
-        shell: cmd
-        run: |
-          set PATH=%GETH_MINGW%\bin;%PATH%
-          go run build/ci.go install -arch amd64 -cc %GETH_CC%
-
-      - name: Test
-        shell: cmd
-        run: |
-          set PATH=%GETH_MINGW%\bin;%PATH%
-          go run build/ci.go test -arch amd64 -cc %GETH_CC% -short -p 8