diff --git a/.github/workflows/windows-msys1.yml b/.github/workflows/windows-msys1.yml
index 67f3801c6..35fbe4d1e 100644
--- a/.github/workflows/windows-msys1.yml
+++ b/.github/workflows/windows-msys1.yml
@@ -17,6 +17,7 @@ env:
   MSYSTEM: MINGW32
   MSYSPKGS: msys-m4 msys-flex msys-coreutils msys-help2man
 
+  MINGW_AUTOCONF_VERS: autoconf-2.70
   MINGW_BISON_VERS: bison-3.0.1
   MINGW_GMP_VERS: gmp-6.3.0
   MINGW_BDB_VERS: db-6.0.19.NC
@@ -85,6 +86,15 @@ jobs:
         run: |
           bash -lc "mingw-get install %MSYSPKGS%"
 
+      - name: Install Autoconf 2.70
+        if: steps.restore-msys.outputs.cache-hit != 'true'
+        run: |
+          curl -L https://ftpmirror.gnu.org/autoconf/%MINGW_AUTOCONF_VERS%.tar.gz -o %MINGW_AUTOCONF_VERS%.tar.gz
+          tar -xvzf %MINGW_AUTOCONF_VERS%.tar.gz
+          bash -lc "cd %MINGW_AUTOCONF_VERS% && ./configure"
+          bash -lc "cd %MINGW_AUTOCONF_VERS% && make"
+          bash -lc "cd %MINGW_AUTOCONF_VERS% && make install"
+
       - name: Install Bison 3.0
         if: steps.restore-msys.outputs.cache-hit != 'true'
         run: |
diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml
index 59ba117b5..588164d61 100644
--- a/.github/workflows/windows-msys2.yml
+++ b/.github/workflows/windows-msys2.yml
@@ -88,15 +88,18 @@ jobs:
           save-always: true
           enableCrossOsArchive: true
 
+      - name: Run NIST
+        shell: msys2 {0}
+        run: |
+          make -C _build/tests test --jobs=$(($(nproc)+1)) TESTSUITEFLAGS="--jobs=$(($(nproc)+1))"
+
       - name: Run testuite
         shell: msys2 {0}
         run: |
           sed '/AT_SETUP(\[temporary path invalid\])/a \
                 AT_SKIP_IF(\[true\])' \
               -i tests/testsuite.src/used_binaries.at
-          make -C _build/tests checkall \
-                               --jobs=$(($(nproc)+1)) \
-                               TESTSUITEFLAGS="--jobs=$(($(nproc)+1))" || \
+          make -C _build/tests check
           make -C _build/tests check \
                                TESTSUITEFLAGS="--recheck --verbose"