diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e9df00d3..4cb5e7d33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,8 +64,6 @@ debian-testing:
             - ccache/
     variables:
         LC_ALL: C.UTF-8
-        PIGLIT_DIR: /root/piglit
-        XTEST_DIR: /root/xts
     before_script:
         - export CCACHE_BASEDIR="$PWD"
         - export CCACHE_DIR="$PWD/ccache"
@@ -81,9 +79,10 @@ autotools-build-and-test:
     script:
         - mkdir build/
         - cd build/
+        - ../autogen.sh --prefix=/usr
+        - make -j$(nproc) distcheck
         - |
-          ../autogen.sh --prefix=/usr
-          make -j$(nproc) install
+          export PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts
           set +e
           set -x
           make -j$(nproc) check
@@ -93,6 +92,9 @@ autotools-build-and-test:
 
 meson-build-and-test:
     extends: .common-build-and-test
+    variables:
+        PIGLIT_DIR: /root/piglit
+        XTEST_DIR: /root/xts
     script:
         - meson -Dprefix=/usr build/
         - |