diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index f6c25a28..6fb291c9 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -925,6 +925,10 @@ static unsigned int run_test_step(struct test_output *o)
 			o->flip_state.count : o->vblank_state.count;
 		int x_ofs = min(count * 10, o->fb_width - o->kmode[0].hdisplay);
 
+		/* Make sure DSPSURF changes value */
+		if (o->flags & TEST_HANG)
+			o->current_fb_id = !o->current_fb_id;
+
 		/* Make sure DSPSURF changes value */
 		if (o->flags & TEST_HANG)
 			o->current_fb_id = !o->current_fb_id;