diff --git a/.gitlab-ci/deqp-panfrost-g52-fails.txt b/.gitlab-ci/deqp-panfrost-g52-fails.txt
index 36ebabfbbc5..01b912cd805 100644
--- a/.gitlab-ci/deqp-panfrost-g52-fails.txt
+++ b/.gitlab-ci/deqp-panfrost-g52-fails.txt
@@ -37,3 +37,15 @@ dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_repeat,Fail
 dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_clamp,Fail
 dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_mirror,Fail
 dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_repeat,Fail
+dEQP-GLES3.functional.fbo.blit.conversion.rgb8_to_rgba4,Fail
+dEQP-GLES3.functional.fbo.blit.conversion.rgb8_to_srgb8_alpha8,Fail
+dEQP-GLES3.functional.fbo.blit.default_framebuffer.rgb8,Fail
+dEQP-GLES3.functional.fbo.blit.default_framebuffer.rgb8_linear_out_of_bounds_blit_to_default,Fail
+dEQP-GLES3.functional.fbo.blit.default_framebuffer.rgb8_linear_scale_blit_to_default,Fail
+dEQP-GLES3.functional.fbo.blit.default_framebuffer.rgb8_nearest_scale_blit_to_default,Fail
+dEQP-GLES3.functional.transform_feedback.array_element.interleaved.triangles.mediump_mat2x4,Fail
+dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.9,Fail
+dEQP-GLES3.functional.transform_feedback.random.interleaved.points.1,Fail
+dEQP-GLES3.functional.transform_feedback.random.interleaved.points.3,Fail
+dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.5,Fail
+dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.9,Fail
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 24e2f59ba6b..ed11f0a0098 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -242,18 +242,34 @@ panfrost-t860-traces:arm64:
   variables:
     ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1"
 
-panfrost-g52-gles2:arm64:
+.lava-meson-g12b-a311d-khadas-vim3:
   extends:
-    - .lava-test:arm64
     - .panfrost-rules
   variables:
     DEVICE_TYPE: meson-g12b-a311d-khadas-vim3
     DTB: ${DEVICE_TYPE}
     GPU_VERSION: panfrost-g52
-    ENV_VARS: "PAN_MESA_DEBUG=bifrost DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=G52"
   tags:
     - mesa-ci-aarch64-lava-collabora
 
+panfrost-g52-gles2:arm64:
+  extends:
+    - .lava-test:arm64
+    - .lava-meson-g12b-a311d-khadas-vim3
+  variables:
+    ENV_VARS: "DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=G52"
+
+panfrost-g52-gles3:arm64:
+  extends:
+    - .lava-test:arm64
+    - .lava-meson-g12b-a311d-khadas-vim3
+  variables:
+    # We don't have enough VIM3s to run the full GLES3 testsuite yet
+    CI_NODE_INDEX: 1
+    CI_NODE_TOTAL: 2
+    DEQP_VERSION: gles3
+    ENV_VARS: "PAN_MESA_DEBUG=deqp DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=G52"
+
 .panfrost-t820-gles2:arm64:
   extends:
     - .lava-test:arm64