diff --git a/.gitlab-ci/virtme-scripts/run-weston-tests.sh b/.gitlab-ci/virtme-scripts/run-weston-tests.sh
index 2b156333..c61bd615 100755
--- a/.gitlab-ci/virtme-scripts/run-weston-tests.sh
+++ b/.gitlab-ci/virtme-scripts/run-weston-tests.sh
@@ -28,6 +28,10 @@ export PATH=/usr/local/bin:$PATH
 
 export SEATD_LOGLEVEL=debug
 
+# Terrible hack, per comment in weston-test-runner.c's main(): find Mesa's
+# llvmpipe driver module location
+export WESTON_CI_LEAK_DL_HANDLE=$(find /usr/local -name swrast_dri.so -print 2>/dev/null || true)
+
 # run the tests and save the exit status
 # we give ourselves a very generous timeout multiplier due to ASan overhead
 echo 0x1f > /sys/module/drm/parameters/debug
diff --git a/tests/meson.build b/tests/meson.build
index 6a5dea41..06479710 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -14,6 +14,7 @@ lib_test_runner = static_library(
 	dependencies: [
 		dep_libweston_private_h_deps,
 		dep_wayland_client,
+                dep_libdl,
 	],
 	include_directories: common_inc,
 	install: false,
diff --git a/tests/weston-test-runner.c b/tests/weston-test-runner.c
index 0ab7bc1b..6bea6705 100644
--- a/tests/weston-test-runner.c
+++ b/tests/weston-test-runner.c
@@ -34,12 +34,18 @@
 #include <errno.h>
 #include <signal.h>
 #include <getopt.h>
+#include <dlfcn.h>
 
 #include "test-config.h"
 #include "weston-test-runner.h"
 #include "weston-testsuite-data.h"
 #include "shared/string-helpers.h"
 
+/* This is a glibc extension; if we can't use it then make it harmless. */
+#ifndef RTLD_NODELETE
+#define RTLD_NODELETE 0
+#endif
+
 /**
  * \defgroup testharness Test harness
  * \defgroup testharness_private Test harness private
@@ -627,9 +633,23 @@ main(int argc, char *argv[])
 	enum test_result_code ret;
 	enum test_result_code result = RESULT_OK;
 	const struct fixture_setup_array *fsa;
+	const char *leak_dl_handle;
 	int fi;
 	int fi_end;
 
+	/* This is horrific, but it gives us working leak checking. If we
+	 * actually unload llvmpipe, then we also unload LLVM, and some global
+	 * setup it's done - which llvmpipe can't tear down because the actual
+	 * client might be using LLVM instead.
+	 *
+	 * Turns out if llvmpipe is always live, then the pointers are always
+	 * reachable, so LeakSanitizer just tells us about our own code rather
+	 * than LLVM's, so ...
+	 */
+	leak_dl_handle = getenv("WESTON_CI_LEAK_DL_HANDLE");
+	if (leak_dl_handle)
+		(void) dlopen(leak_dl_handle, RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE);
+
 	harness = weston_test_harness_create(argc, argv);
 
 	fsa = fixture_setup_array_get_();