diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82f3435d..492ebb1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -839,7 +839,7 @@ check-test-suites:
   extends:
     - .fedora-build@template
   script:
-    - meson builddir
+    - meson setup builddir
     - meson introspect builddir --test | jq -r '.[].name' | grep 'libinput-test-suite' | sort > meson-testsuites
     - |
       cat <<EOF > ci-testsuites ;
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index ff4189d4..6cdfb13a 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -557,7 +557,7 @@ check-test-suites:
   extends:
     - .{{distro.name}}-build@template
   script:
-    - meson builddir
+    - meson setup builddir
     - meson introspect builddir --test | jq -r '.[].name' | grep 'libinput-test-suite' | sort > meson-testsuites
     - |
       cat <<EOF > ci-testsuites ;
diff --git a/doc/user/building.rst b/doc/user/building.rst
index 7e0c0073..832dc08b 100644
--- a/doc/user/building.rst
+++ b/doc/user/building.rst
@@ -55,7 +55,7 @@ process below.  A successful build requires the
 
      $> git clone https://gitlab.freedesktop.org/libinput/libinput
      $> cd libinput
-     $> meson --prefix=/usr builddir/
+     $> meson setup --prefix=/usr builddir/
      $> ninja -C builddir/
      $> sudo ninja -C builddir/ install
 
@@ -71,7 +71,7 @@ Additional options may also be specified. For example:
 
 ::
 
-     $> meson --prefix=/usr -Ddocumentation=false builddir/
+     $> meson setup --prefix=/usr -Ddocumentation=false builddir/
 
 
 We recommend that users disable the documentation, it's not usually required
@@ -96,7 +96,7 @@ again:
 ::
 
      $> rm -r builddir/
-     $> meson --prefix=....
+     $> meson setup --prefix=....
 
 
 .. _verifying_install:
@@ -242,7 +242,7 @@ available options. The default build enables most options and thus requires
 more build dependencies. On systems where build dependencies are an issue,
 options may be disabled with this meson command: ::
 
-    meson --prefix=/usr -Dsomefeature=false builddir
+    meson setup --prefix=/usr -Dsomefeature=false builddir
 
 Where ``-Dsomefeature=false`` may be one of:
 
diff --git a/doc/user/contributing.rst b/doc/user/contributing.rst
index b3ca95df..44649e6c 100644
--- a/doc/user/contributing.rst
+++ b/doc/user/contributing.rst
@@ -69,7 +69,7 @@ will be:
 
      $> git clone https://gitlab.freedesktop.org/libinput/libinput
      $> cd libinput
-     $> meson --prefix=/usr builddir/
+     $> meson setup --prefix=/usr builddir/
      $> ninja -C builddir/
      $> sudo ninja -C builddir/ install
 
diff --git a/doc/user/test-suite.rst b/doc/user/test-suite.rst
index 29484b25..5323e4b2 100644
--- a/doc/user/test-suite.rst
+++ b/doc/user/test-suite.rst
@@ -208,7 +208,7 @@ verification of distribution composes.
 To configure libinput to install the tests, use the ``-Dinstall-tests=true``
 meson option::
 
-  $ meson builddir -Dtests=true -Dinstall-tests=true <other options>
+  $ meson setup builddir -Dtests=true -Dinstall-tests=true <other options>
 
 .. _test-meson-suites: