diff --git a/cogl/cogl-journal.c b/cogl/cogl-journal.c
index 95d7fc60d..57322fb92 100644
--- a/cogl/cogl-journal.c
+++ b/cogl/cogl-journal.c
@@ -1316,6 +1316,10 @@ _cogl_journal_flush (CoglJournal *journal)
                                  ~(COGL_FRAMEBUFFER_STATE_MODELVIEW |
                                    COGL_FRAMEBUFFER_STATE_CLIP));
 
+  /* We need to mark the current modelview state of the framebuffer as
+   * dirty because we are going to manually replace it */
+  ctx->current_draw_buffer_changes |= COGL_FRAMEBUFFER_STATE_MODELVIEW;
+
   state.ctx = ctx;
   state.journal = journal;
 
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
index 6acca93bd..8cae25eff 100644
--- a/tests/conform/test-conform-main.c
+++ b/tests/conform/test-conform-main.c
@@ -116,7 +116,7 @@ main (int argc, char **argv)
 
   ADD_TEST (test_map_buffer_range, TEST_REQUIREMENT_MAP_WRITE, 0);
 
-  ADD_TEST (test_primitive_and_journal, 0, TEST_KNOWN_FAILURE);
+  ADD_TEST (test_primitive_and_journal, 0, 0);
 
   UNPORTED_TEST (test_viewport);