diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1ddd816..9f0ab731 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,21 +173,21 @@ debian cmake:
     - .debian-build
   when: manual
   variables:
-    ci_buildsys: "cmake-dist"
+    ci_buildsys: "cmake"
 
 debian meson:
   extends:
     - .meson-common
     - .debian-build
   variables:
-    ci_buildsys: "meson-dist"
+    ci_buildsys: "meson"
 
 debian meson clang debug:
   extends:
     - .meson-common
     - .debian-build
   variables:
-    ci_buildsys: "meson-dist"
+    ci_buildsys: "meson"
     ci_compiler: "clang"
     ci_variant: "debug"
   script:
diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 239a69a3..b95cfa86 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -228,7 +228,7 @@ make="${make} -j${ci_parallel} V=1 VERBOSE=1"
 export UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
 
 case "$ci_buildsys" in
-    (cmake|cmake-dist)
+    (cmake)
         cmdwrapper=
         cmake=cmake
         case "$ci_host" in
@@ -279,7 +279,7 @@ case "$ci_buildsys" in
         ( cd DESTDIR && find . -ls)
         ;;
 
-    (meson|meson-dist)
+    (meson)
         # The test coverage for OOM-safety is too verbose to be useful on
         # travis-ci, and too slow when running under wine.
         export DBUS_TEST_MALLOC_FAILURES=0