diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24657a37..daee7a16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@
 variables:
   FDO_UPSTREAM_REPO: wayland/weston
   FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH"
-  FDO_DISTRIBUTION_TAG: '2021-07-31.1-wayland-protocols'
+  FDO_DISTRIBUTION_TAG: '2021-08-02.2-meson'
 
 
 include:
diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh
index 4d9a821e..26a5e612 100755
--- a/.gitlab-ci/build-deps.sh
+++ b/.gitlab-ci/build-deps.sh
@@ -12,9 +12,10 @@ export MAKEFLAGS="-j${FDO_CI_CONCURRENT:-4}"
 export NINJAFLAGS="-j${FDO_CI_CONCURRENT:-4}"
 
 # Build and install Meson. Generally we want to keep this in sync with what
-# we require inside meson.build, however per wayland/weston@bcf37c937a36,
-# we use a higher version here 
-pip3 install --user git+https://github.com/mesonbuild/meson.git@0.57.0
+# we require inside meson.build, however we require at least 0.57.0 per
+# wayland/weston@bcf37c937a36, and 0.57.1 to fix the TAP parser when a test
+# exits unsuccessfully
+pip3 install --user git+https://github.com/mesonbuild/meson.git@0.57.1
 export PATH=$HOME/.local/bin:$PATH
 
 # Our docs are built using Sphinx (top-level organisation and final HTML/CSS