diff --git a/configure.ac b/configure.ac
index 1024ad80..05897820 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,7 +178,7 @@ AM_CONDITIONAL(HAVE_VC4, [test "x$VC4" = xyes])
 # Define a configure option for the shader debugger
 AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
 	      [Enable shader debugging support [autodetected]]),
-	      [BUILD_SHADER_DEBUGGER="$enableval"], [BUILD_SHADER_DEBUGGER=$build_x86])
+	      [BUILD_SHADER_DEBUGGER="$enableval"], [BUILD_SHADER_DEBUGGER=no])
 
 # Shader debugger depends on python3, intel-genasm and objcopy
 if test "x$BUILD_SHADER_DEBUGGER" != xno; then
diff --git a/tests/gem_busy.c b/tests/gem_busy.c
index af634c58..100a42c1 100644
--- a/tests/gem_busy.c
+++ b/tests/gem_busy.c
@@ -318,6 +318,12 @@ static void one(int fd, unsigned ring, uint32_t flags, unsigned test_flags)
 			if (e->exec_id == 0 || e->exec_id == ring)
 				continue;
 
+			if (e->exec_id == I915_EXEC_BSD && gen == 6)
+				continue;
+
+			if (!gem_has_ring(fd, e->exec_id | e->flags))
+				continue;
+
 			igt_debug("Testing %s in parallel\n", e->name);
 			one(fd, e->exec_id, e->flags, 0);
 		}