diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0fb019abf..e5c884e64 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,6 +11,15 @@ on:
         type: string
 
 jobs:
+  build-windows:
+    name: Windows MSVC
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      dfhack_ref: ${{ inputs.dfhack_ref }}
+      structures_ref: ${{ inputs.structures_ref }}
+      artifact-name: test-msvc
+      cache-id: test
+
   build-linux:
     name: Linux gcc-${{ matrix.gcc }}
     uses: ./.github/workflows/build-linux.yml
@@ -33,6 +42,55 @@ jobs:
         - gcc: 12
           plugins: "all"
 
+  test-windows:
+    name: Test (Windows, MSVC, default plugins)
+    needs: build-windows
+    runs-on: windows-latest
+    steps:
+    - name: Set env
+      run: echo "DF_FOLDER=DF" >> $GITHUB_ENV
+    - name: Clone DFHack
+      uses: actions/checkout@v3
+      with:
+        repository: 'DFHack/dfhack'
+        ref: ${{ inputs.dfhack_ref }}
+        sparse-checkout: CMakeLists.txt
+    - name: Detect DF version
+      id: get-df-version
+      run: echo ver="$(sh ci/get-df-version.sh)" >> $GITHUB_OUTPUT
+    - name: Fetch DF cache
+      id: restore-df
+      uses: actions/cache/restore@v3
+      with:
+        path: ${{ env.DF_FOLDER }}
+        key: df-windows-${{ steps.get-df-version.outputs.ver }}-${{ hashFiles('ci/download-df.sh') }}
+    - name: Download DF
+      if: steps.restore-df.outputs.cache-hit != 'true'
+      run: sh ci/download-df.sh ${{ env.DF_FOLDER }} windows ${{ steps.get-df-version.outputs.ver }}
+    - name: Save DF cache
+      if: steps.restore-df.outputs.cache-hit != 'true'
+      uses: actions/cache/save@v3
+      with:
+        path: ${{ env.DF_FOLDER }}
+        key: df-windows-${{ steps.get-df-version.outputs.ver }}-${{ hashFiles('ci/download-df.sh') }}
+    - name: Download DFHack
+      uses: actions/download-artifact@v3
+      with:
+        name: test-msvc
+        path: ${{ env.DF_FOLDER }}
+    - name: Run lua tests
+      id: run-tests
+      run: python ci/run-tests.py --keep-status "${{ env.DF_FOLDER }}"
+    - name: Upload test artifacts
+      uses: actions/upload-artifact@v3
+      if: always()
+      continue-on-error: true
+      with:
+        name: test-artifacts-msvc
+        path: |
+          ${{ env.DF_FOLDER }}/test*.json
+          ${{ env.DF_FOLDER }}/*.log
+
   test-linux:
     name: Test (Linux, GCC ${{ matrix.gcc }}, ${{ matrix.plugins }} plugins)
     needs: build-linux
diff --git a/ci/download-df.sh b/ci/download-df.sh
index 8d94d54dd..0f7a5517b 100755
--- a/ci/download-df.sh
+++ b/ci/download-df.sh
@@ -1,52 +1,48 @@
 #!/bin/sh
 
+DF_FOLDER=$1
+OS_TARGET=$2
+DF_VERSION=$3
+
 set -e
 
-df_tardest="df.tar.bz2"
-save_tardest="test_save.tgz"
-
-cd "$(dirname "$0")"
-echo "DF_VERSION: $DF_VERSION"
-echo "DF_FOLDER: $DF_FOLDER"
-mkdir -p "$DF_FOLDER"
-# back out of df_linux
-cd "$DF_FOLDER/.."
-
-if ! test -f "$df_tardest"; then
-    minor=$(echo "$DF_VERSION" | cut -d. -f2)
-    patch=$(echo "$DF_VERSION" | cut -d. -f3)
-    echo "Downloading DF $DF_VERSION"
-    while read url; do
-        echo "Attempting download: ${url}"
-        if wget -v "$url" -O "$df_tardest"; then
-            break
-        fi
-    done <<URLS
-    https://www.bay12games.com/dwarves/df_${minor}_${patch}_linux.tar.bz2
-    https://files.dfhack.org/DF/${minor}.${patch}/df_${minor}_${patch}_linux.tar.bz2
-URLS
-    echo $df_tardest
-    if ! test -f "$df_tardest"; then
-        echo "DF failed to download: $df_tardest not found"
-        exit 1
-    fi
-
-    echo "Downloading test save"
-    #test_save_url="https://files.dfhack.org/DF/0.${minor}.${patch}/test_save.tgz"
-    test_save_url="https://drive.google.com/uc?export=download&id=1XvYngl-DFONiZ9SD9OC4B2Ooecu8rPFz"
-    if ! wget -v "$test_save_url" -O "$save_tardest"; then
-        echo "failed to download test save"
-        exit 1
-    fi
-    echo $save_tardest
+minor=$(echo "$DF_VERSION" | cut -d. -f1)
+patch=$(echo "$DF_VERSION" | cut -d. -f2)
+df_url="https://www.bay12games.com/dwarves/df_${minor}_${patch}"
+if test "$OS_TARGET" = "windows"; then
+    df_url="${df_url}_win_s.zip"
+    df_archive_name="df.zip"
+    df_extract_cmd="unzip -d ${DF_FOLDER}"
+elif test "$OS_TARGET" = "linux"; then
+    df_url="${df_url}_linux.tar.bz2"
+    df_archive_name="df.tar.bz2"
+    df_extract_cmd="tar -x -j --strip-components=1 -f"
+else
+    echo "Unhandled OS target: ${OS_TARGET}"
+    exit 1
+fi
+
+if ! wget -v "$df_url" -O "$df_archive_name"; then
+    echo "Failed to download DF from $df_url"
+    exit 1
 fi
 
-rm -rf df_linux
-mkdir -p df_linux/save
+save_url="https://dffd.bay12games.com/download.php?id=15434&f=dreamfort.7z"
+save_archive_name="test_save.7z"
+save_extract_cmd="7z x -oDF/save"
+
+if ! wget -v "$save_url" -O "$save_archive_name"; then
+    echo "Failed to download test save from $save_url"
+    exit 1
+fi
 
 echo Extracting
-tar xf "$df_tardest" --strip-components=1 -C df_linux
-tar xf "$save_tardest" -C df_linux/save
+$df_extract_cmd "$df_archive_name"
+$save_extract_cmd "$save_archive_name"
+mv DF/save/* DF/save/region1
+
 echo Done
 
 ls -l
+
+md5sum "$df_archive_name" "$save_archive_name"