diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 6619e3aa7..266d6e66d 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -38,7 +38,6 @@
 #ifdef WITH_LIBDRM
 #include <xf86drm.h>
 #endif
-#include "xf86Module.h"
 #include "list.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
diff --git a/test/scripts/run-piglit.sh b/test/scripts/run-piglit.sh
index b999c2598..224ef24bd 100755
--- a/test/scripts/run-piglit.sh
+++ b/test/scripts/run-piglit.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# workaround for the docker image not being sufficiently python3 yet
+unset CI_COMMIT_TAG CI_COMMIT_MESSAGE CI_COMMIT_TITLE CI_COMMIT_DESCRIPTION
+
 set -e
 
 if test "x$XTEST_DIR" = "x"; then