diff --git a/appveyor.yml b/appveyor.yml
index 585c0aac4e..6e168e5714 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -59,7 +59,7 @@ install:
         C:\msys64\usr\bin\bash -lc 'PATH="/mingw64/bin:$PATH" ; export PATH ; pwd ; ccache -sv || echo "SKIP: Could not query ccache stats" ; ccache -o sloppiness=file_macro || true ; ccache -o compression=true || true '
 
 
-before_build:
+build_script:
   - cmd: |
       REM Ensure we have a net-snmp to build against
       REM Adapted from scripts/Windows/README.adoc document.
@@ -72,15 +72,6 @@ before_build:
       C:\msys64\usr\bin\bash -lc 'date -u; export MSYS2_PATH ; PATH="/mingw64/lib/ccache/bin:/mingw64/bin:$PATH" bash ./scripts/Windows/build-mingw-prereqs.sh -f'
 
 
-build_script:
-  - cmd: |
-        REM Preserve the current working directory:
-        set CHERE_INVOKING=yes
-        REM Start a 64 bit Mingw environment:
-        set MSYSTEM=MINGW64
-        C:\msys64\usr\bin\bash -lc 'date -u; PATH="/mingw64/bin:$PATH" CI_SKIP_CHECK=true ./ci_build.sh'
-
-
 after_build:
   - cmd: |
         REM Preserve the current working directory:
@@ -90,42 +81,7 @@ after_build:
         C:\msys64\usr\bin\bash -lc 'date -u; PATH="/mingw64/bin:$PATH" ; export PATH ; ccache -sv || ccache -s || echo "SKIP: Could not query ccache stats"'
 
 
-test_script:
-  - cmd: |
-        REM Preserve the current working directory:
-        set CHERE_INVOKING=yes
-        REM Start a 64 bit Mingw environment:
-        set MSYSTEM=MINGW64
-        REM Start Mingw-based integration and unit checks:
-        C:\msys64\usr\bin\bash -lc 'date -u; NUT_STATEPATH="C:\\Users\\appveyor\\AppData\\Local\\Temp\\nut-test"; mkdir -p "${NUT_STATEPATH}"; export NUT_STATEPATH; PATH="/mingw64/lib/ccache/bin:/mingw64/bin:$PATH" make -s check || bash -lc "for F in tests/*.log tests/*.trs ; do echo \"===---=== $F :\"; cat \"$F\"; done; exit 1;" '
-        REM Start a Mingw-based documentation spellcheck (note that "make check" above could cover some documents in path of artifact delivery, but maybe not all that we have):
-        C:\msys64\usr\bin\bash -lc 'date -u; PATH="/mingw64/lib/ccache/bin:/mingw64/bin:$PATH" make -s -j 8 spellcheck'
-
-
-after_test:
-  - cmd: |
-        REM Preserve the current working directory:
-        set CHERE_INVOKING=yes
-        REM Start a 64 bit Mingw environment:
-        set MSYSTEM=MINGW64
-        REM Oh the joys of shell scripting with strings passed through CMD:
-        REM Note: currently Python installation path with MSYS is buggy [#1584]
-        C:\msys64\usr\bin\bash -lc 'date -u; if ! rm -rf ".inst" ; then echo "WARNING: Failed to clean away .inst" ; fi ; PATH="/mingw64/lib/ccache/bin:/mingw64/bin:$PATH" make -s install-win-bundle DESTDIR="`pwd`/.inst/NUT-for-Windows-x86_64-SNAPSHOT-%APPVEYOR_BUILD_VERSION%" ; ln -fs "NUT-for-Windows-x86_64-SNAPSHOT-%APPVEYOR_BUILD_VERSION%" ./.inst/NUT-for-Windows-x86_64-SNAPSHOT ; ( cd .inst/NUT-for-Windows-x86_64-SNAPSHOT ; find . -ls ; )'
-        cd .inst
-        7z a ../NUT-for-Windows-x86_64-SNAPSHOT-%APPVEYOR_BUILD_VERSION%.7z NUT*
-  - cmd: |
-        REM Preserve the current working directory:
-        set CHERE_INVOKING=yes
-        REM Start a 64 bit Mingw environment:
-        set MSYSTEM=MINGW64
-        C:\msys64\usr\bin\bash -lc 'date -u; PATH="/mingw64/bin:$PATH" ; export PATH ; ccache -sv || ccache -s || echo "SKIP: Could not query ccache stats"'
-        C:\msys64\usr\bin\bash -lc 'date -u; PATH="/mingw64/bin:$PATH" ; export PATH ; ccache -x || echo "SKIP: Could not query ccache compression stats"'
-
-
 artifacts:
-  - path: 'NUT-for-Windows*.7z'
-    name: Bundle of binary files and FOSS dependencies of NUT for Windows
-
   - path: config.log
     name: config.log of recent build of NUT for Windows