diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index a0a52437c05..1a1628577f4 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -192,7 +192,7 @@ debian-testing-ubsan:
       -Wno-error=stringop-truncation
     CPP_ARGS: >
       -Wno-error=array-bounds
-    GALLIUM_DRIVERS: "swrast"
+    GALLIUM_DRIVERS: "llvmpipe,softpipe"
     VULKAN_DRIVERS: "swrast"
     EXTRA_OPTION: >
       -D b_sanitize=undefined
diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index 7ba1430b09a..5c17c9dabf1 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -48,7 +48,7 @@ meson setup `
 -Dllvm=enabled `
 -Dshared-llvm=disabled `
 -Dvulkan-drivers="swrast,amd,microsoft-experimental" `
--Dgallium-drivers="swrast,d3d12,zink" `
+-Dgallium-drivers="llvmpipe,softpipe,d3d12,zink" `
 -Dgallium-va=enabled `
 -Dvideo-codecs="all" `
 -Dgles1=enabled `