diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 14361daeb..f79ffeca6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,11 +83,13 @@ jobs:
       id: run_tests
       run: |
         export TERM=dumb
+        status=0
         mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
-        script -qe -c "python ci/run-tests.py --headless --keep-status \"$DF_FOLDER\""
-        python ci/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt"
+        script -qe -c "python ci/run-tests.py --headless --keep-status \"$DF_FOLDER\"" || status=$((status + 1))
+        python ci/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt" || status=$((status + 2))
         mkdir -p artifacts
-        cp "$DF_FOLDER/test_status.json" "$DF_FOLDER"/*.log artifacts
+        cp "$DF_FOLDER/test_status.json" "$DF_FOLDER"/*.log artifacts || status=$((status + 4))
+        exit $status
     - name: Upload test artifacts
       uses: actions/upload-artifact@v1
       if: (success() || failure()) && steps.run_tests.outcome != 'skipped'