diff --git a/test/litest.c b/test/litest.c
index 676485ed..51085f19 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -777,6 +777,10 @@ litest_log_handler(struct libinput *libinput,
 
 	fprintf(stderr, "litest %s: ", priority);
 	vfprintf(stderr, format, args);
+
+	if (strstr(format, "client bug: ") ||
+	    strstr(format, "libinput bug: "))
+		litest_abort_msg("libinput bug triggered, aborting.\n");
 }
 
 static int
diff --git a/test/path.c b/test/path.c
index 22db7ae5..0b04b196 100644
--- a/test/path.c
+++ b/test/path.c
@@ -331,7 +331,9 @@ START_TEST(path_add_invalid_path)
 
 	li = litest_create_context();
 
+	litest_disable_log_handler(li);
 	device = libinput_path_add_device(li, "/tmp/");
+	litest_restore_log_handler(li);
 	ck_assert(device == NULL);
 
 	libinput_dispatch(li);