diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4087012939a91dd589e0071e8403144823a6d70c..8e1820025f3998498b75a19226b5605c4602e935 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -198,7 +198,6 @@ make check venus:
 .deqp-host:
   extends:
     - .gl-host-test
-  parallel: 3
 
 .piglit-host:
   extends:
@@ -207,7 +206,6 @@ make check venus:
     PIGLIT_PLATFORM: surfaceless_egl
     PIGLIT_NO_WINDOW: 1
     PIGLIT_PROFILES: gpu
-  parallel: 2
 
 .deqp-virt:
   extends:
@@ -215,7 +213,6 @@ make check venus:
   variables:
     # There will be FDO_CI_CONCURRENT Crosvm processes, so each should use a single thread
     LP_NUM_THREADS: 1
-  parallel: 3
 
 .piglit-virt:
   extends:
@@ -225,7 +222,6 @@ make check venus:
     # Use all threads for rendering and only run one job at a time
     LP_NUM_THREADS: ${FDO_CI_CONCURRENT}
     FORCE_FDO_CI_CONCURRENT: 1
-  parallel: 4
 
 # Host runners (virpipe/vtest)
 
@@ -279,6 +275,7 @@ deqp-gles-virt:
 piglit-gl-virt:
   extends:
     - .piglit-virt
+  parallel: 3
   variables:
     GPU_VERSION: virgl-gl
     CROSVM_GPU_ARGS: *deqp-gl-crosvm-gpu-args
@@ -286,6 +283,7 @@ piglit-gl-virt:
 piglit-gles-virt:
   extends:
     - .piglit-virt
+  parallel: 3
   variables:
     VIRGL_HOST_API: GLES
     GPU_VERSION: virgl-gles
diff --git a/.gitlab-ci/expectations/host/deqp-virgl-gl-flakes.txt b/.gitlab-ci/expectations/host/deqp-virgl-gl-flakes.txt
index 38f817bd53cc2f8a6740e6efd1e79e3d5e4f2126..788c571181616efa731c7f281ea6e12866a6193f 100644
--- a/.gitlab-ci/expectations/host/deqp-virgl-gl-flakes.txt
+++ b/.gitlab-ci/expectations/host/deqp-virgl-gl-flakes.txt
@@ -1,3 +1,4 @@
+dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.8
 dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.36
 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4651
 KHR-GL30.shaders30.glsl_constructors.bvec4_from_bool_mat3_vs
diff --git a/.gitlab-ci/expectations/host/deqp-virgl-gles-flakes.txt b/.gitlab-ci/expectations/host/deqp-virgl-gles-flakes.txt
index 2c6033864603dff851f6b861be9f0d189adbbc38..f5437a10af430ecd785958bc8e91aedcf5556e6d 100644
--- a/.gitlab-ci/expectations/host/deqp-virgl-gles-flakes.txt
+++ b/.gitlab-ci/expectations/host/deqp-virgl-gles-flakes.txt
@@ -1 +1,2 @@
 dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.9
+dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.8
diff --git a/.gitlab-ci/expectations/virt/deqp-virgl-gl-flakes.txt b/.gitlab-ci/expectations/virt/deqp-virgl-gl-flakes.txt
index 4b5d0d5c48f14b0831c80874b12a760cb98c9029..dd7d5318aa7aac4f7f7faaefa4b2d8da84fbc986 100644
--- a/.gitlab-ci/expectations/virt/deqp-virgl-gl-flakes.txt
+++ b/.gitlab-ci/expectations/virt/deqp-virgl-gl-flakes.txt
@@ -1,3 +1,4 @@
+dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.8
 dEQP-GLES31.functional.ssbo.layout.3_level_unsized_array.shared.mat4
 dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.36
 dEQP-GLES31.functional.ssbo.layout.random.arrays_of_arrays.1
diff --git a/.gitlab-ci/expectations/virt/deqp-virgl-gles-flakes.txt b/.gitlab-ci/expectations/virt/deqp-virgl-gles-flakes.txt
index 41cf7a2f10ab8e59497e691e8f2f5654f2693508..c3e2a1728d2351e3c63c5cb517eb16ccb46d1715 100644
--- a/.gitlab-ci/expectations/virt/deqp-virgl-gles-flakes.txt
+++ b/.gitlab-ci/expectations/virt/deqp-virgl-gles-flakes.txt
@@ -1,3 +1,4 @@
+dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.8
 dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.36
 dEQP-GLES31.functional.ssbo.layout.random.arrays_of_arrays.1
 dEQP-GLES31.functional.ssbo.layout.random.nested_structs_arrays_instance_arrays.22