diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh
index cc096410340..d3ce66303f1 100755
--- a/.gitlab-ci/meson/build.sh
+++ b/.gitlab-ci/meson/build.sh
@@ -59,7 +59,8 @@ case $CI_JOB_NAME in
 esac
 
 rm -rf _build
-meson _build --native-file=native.file \
+meson setup _build \
+      --native-file=native.file \
       --wrap-mode=nofallback \
       --force-fallback-for perfetto \
       ${CROSS+--cross "$CROSS_FILE"} \
diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index 25a6565d3d9..e79eb6b6587 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -36,7 +36,7 @@ $depsInstallPath="C:\mesa-deps"
 
 Push-Location $builddir
 
-meson `
+meson setup `
 --default-library=shared `
 --buildtype=release `
 --wrap-mode=nodownload `