diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index 46a18666f0d..e4427a7c207 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -40,8 +40,13 @@ meson --default-library=shared -Dzlib:default_library=static --buildtype=release
 -Dbuild-tests=true -Dwerror=true -Dwarning_level=2 -Dzlib:warning_level=1 -Dlibelf:warning_level=1 `
 $sourcedir
 
-ninja install -j32
-meson test --num-processes 32
+if ($?) {
+  ninja install -j32
+}
+
+if ($?) {
+  meson test --num-processes 32
+}
 
 $buildstatus = $?
 Pop-Location
diff --git a/.pick_status.json b/.pick_status.json
index 2dbf26d0dbf..382628062e0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -679,7 +679,7 @@
         "description": "ci/windows: add back build-error detection",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "bf3c772e5e5854d60dcddceb29a6849701423320"
     },