diff --git a/lib/i830_reg.h b/lib/i830_reg.h
index 93d03cf3..4d4e6188 100644
--- a/lib/i830_reg.h
+++ b/lib/i830_reg.h
@@ -43,6 +43,9 @@
 /* broadwater flush bits */
 #define BRW_MI_GLOBAL_SNAPSHOT_RESET   (1 << 3)
 
+#define MI_COND_BATCH_BUFFER_END	(0x36<<23 | 1)
+#define MI_DO_COMPARE			(1<<21)
+
 #define MI_BATCH_BUFFER_END	(0xA << 23)
 
 /* Noop */
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a4228995..c78f2d1f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,6 +33,7 @@ TESTS_progs_M = \
 	gem_set_tiling_vs_blt \
 	gem_tiled_blits \
 	gem_tiled_partial_pwrite_pread \
+	gem_write_read_ring_switch \
 	$(NOUVEAU_TESTS_M) \
 	kms_flip \
 	kms_render \