diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index 254dfb977b5..a15fa6d2e25 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -2,6 +2,8 @@
 Write-Host "Refreshing Windows TLS CA cache"
 (New-Object System.Net.WebClient).DownloadString("https://github.com") >$null
 
+$env:PYTHONUTF8=1
+
 Get-Date
 Write-Host "Compiling Mesa"
 $builddir = New-Item -ItemType Directory -Name "_build"
diff --git a/.pick_status.json b/.pick_status.json
index e6ebeffff2c..af84a5dc0e7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -472,7 +472,7 @@
         "description": "ci/windows: work around meson encoding issues",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },