diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e23c2bb0e..8318ab029 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -272,7 +272,7 @@ msys2-mingw32:
   extends: .only-default
   stage: build
   tags:
-    - win32
+    - win32-ps
   variables:
     MSYSTEM: "MINGW32"
     CHERE_INVOKING: "yes"
@@ -281,29 +281,29 @@ msys2-mingw32:
     - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
   artifacts:
     reports:
-      junit: "_build/%CI_JOB_NAME%-report.xml"
-    name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
+      junit: "_build/${env:CI_JOB_NAME}-report.xml"
+    name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
     when: always
     paths:
       - _build/meson-logs
-      - "_build/%CI_JOB_NAME%-report.xml"
+      - "_build/${env:CI_JOB_NAME}-report.xml"
       - _coverage/
 
 vs2017-x64:
   extends: .only-default
   stage: build
   tags:
-    - win32
+    - win32-ps
   script:
     - .gitlab-ci/test-msvc.bat
   artifacts:
     reports:
-      junit: "_build/%CI_JOB_NAME%-report.xml"
-    name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
+      junit: "_build/${env:CI_JOB_NAME}-report.xml"
+    name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
     when: always
     paths:
       - _build/meson-logs
-      - "_build/%CI_JOB_NAME%-report.xml"
+      - "_build/${env:CI_JOB_NAME}-report.xml"
 
 freebsd-11-x86_64:
   stage: build
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index ea1870eab..6cc6d80ca 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -1,7 +1,7 @@
 @echo on
 :: vcvarsall.bat sets various env vars like PATH, INCLUDE, LIB, LIBPATH for the
 :: specified build architecture
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64
 @echo on
 
 :: FIXME: make warnings fatal