diff --git a/lib/drmtest.c b/lib/drmtest.c
index 109fbc15..62b3f829 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -654,6 +654,8 @@ static enum {
 
 bool __igt_fixture(void)
 {
+	assert(!in_fixture);
+
 	if (igt_only_list_subtests())
 		return false;
 
@@ -666,6 +668,8 @@ bool __igt_fixture(void)
 
 void __igt_fixture_end(void)
 {
+	assert(in_fixture);
+
 	in_fixture = false;
 	longjmp(igt_subtest_jmpbuf, 1);
 }
diff --git a/tests/gem_concurrent_blit.c b/tests/gem_concurrent_blit.c
index 69477748..d9ef5b56 100644
--- a/tests/gem_concurrent_blit.c
+++ b/tests/gem_concurrent_blit.c
@@ -333,11 +333,11 @@ run_basic_modes(struct access_mode *mode,
 		run_wrap_func(mode, src, dst, dummy, do_gpu_read_after_write);
 }
 
+drm_intel_bo *src[MAX_NUM_BUFFERS], *dst[MAX_NUM_BUFFERS], *dummy = NULL;
+
 static void
 run_modes(struct access_mode *mode)
 {
-	drm_intel_bo *src[MAX_NUM_BUFFERS], *dst[MAX_NUM_BUFFERS], *dummy = NULL;
-
 	igt_fixture {
 		bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
 		drm_intel_bufmgr_gem_enable_reuse(bufmgr);