diff --git a/gitlab/build-linux b/gitlab/build-linux
index 532a462a..b149132c 100755
--- a/gitlab/build-linux
+++ b/gitlab/build-linux
@@ -11,7 +11,7 @@ set -Eeuxo pipefail
 rm -fr build
 mkdir build
 cd build
-export LD_LIBRARY_PATH=/usr/local/lib
+export LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH-}"
 if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL -DVKD3D_SHADER_UNSUPPORTED_GLSL" && \
         make -j$(nproc) ; then
     make -j$(nproc) AM_COLOR_TESTS=always check || \
diff --git a/gitlab/build.yml b/gitlab/build.yml
index af68e9ef..fb8a6879 100644
--- a/gitlab/build.yml
+++ b/gitlab/build.yml
@@ -61,6 +61,17 @@ build-llvmpipe-32:
     CC: 'i686-linux-gnu-gcc'
     VKD3D_SHADER_CONFIG: 'force_validation'
 
+build-llvmpipe-64-mesa24:
+  extends: .build-linux
+  allow_failure:
+    exit_codes:
+      - 2
+  variables:
+    VK_DRIVER_FILES: '/opt/mesa24/share/vulkan/icd.d/lvp_icd.x86_64.json'
+    LD_LIBRARY_PATH: '/opt/mesa24/lib/x86_64-linux-gnu'
+    __EGL_VENDOR_LIBRARY_FILENAMES: '/opt/mesa24/share/glvnd/egl_vendor.d/50_mesa.json'
+    VKD3D_SHADER_CONFIG: 'force_validation'
+
 build-crosstest:
   stage: build
   rules: