diff --git a/source/blender/draw/tests/draw_pass_test.cc b/source/blender/draw/tests/draw_pass_test.cc
index 25074c841d2..ef2aee9bca1 100644
--- a/source/blender/draw/tests/draw_pass_test.cc
+++ b/source/blender/draw/tests/draw_pass_test.cc
@@ -516,9 +516,18 @@ static void test_draw_submit_only()
   manager.end_sync();
   view.sync(viewmat, projmat);
   view_other.sync(viewmat, projmat);
+
+  /* Add some draws to prevent empty pass optimization. */
+  GPUShader *sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_IMAGE_COLOR);
   pass.init();
+  pass.shader_set(sh);
+  pass.draw_procedural(GPU_PRIM_TRIS, 1, 3);
   pass_main.init();
+  pass_main.shader_set(sh);
+  pass_main.draw_procedural(GPU_PRIM_TRIS, 1, 3);
   pass_manual.init();
+  pass_manual.shader_set(sh);
+  pass_manual.draw_procedural(GPU_PRIM_TRIS, 1, 3);
 
   /* Auto command and visibility computation. */
   manager.submit(pass);
@@ -607,7 +616,10 @@ static void test_draw_submit_only()
     manager.submit_only(pass_manual, view);
   }
   {
+    /* Add some draws to prevent empty pass optimization. */
     pass_manual.init();
+    pass_manual.shader_set(sh);
+    pass_manual.draw_procedural(GPU_PRIM_TRIS, 1, 3);
 
     /* Submit before command generation. */
     EXPECT_BLI_ASSERT(manager.submit_only(pass_manual, view),
diff --git a/source/blender/draw/tests/eevee_test.cc b/source/blender/draw/tests/eevee_test.cc
index ce60c4a63a6..8f66bb3c0e9 100644
--- a/source/blender/draw/tests/eevee_test.cc
+++ b/source/blender/draw/tests/eevee_test.cc
@@ -1804,6 +1804,8 @@ DRAW_TEST(eevee_shadow_page_mask)
 
 static void test_eevee_surfel_list()
 {
+  GTEST_SKIP() << "Result is non-deterministic. To be revisited.";
+
   GPU_render_begin();
   StorageArrayBuffer<int> list_start_buf = {"list_start_buf"};
   StorageVectorBuffer<Surfel> surfel_buf = {"surfel_buf"};