diff --git a/src/virtio/ci/gitlab-ci-inc.yml b/src/virtio/ci/gitlab-ci-inc.yml
index 465f52557a1..0d0c96bb652 100644
--- a/src/virtio/ci/gitlab-ci-inc.yml
+++ b/src/virtio/ci/gitlab-ci-inc.yml
@@ -53,3 +53,12 @@
     CROSVM_GPU_ARGS: "vulkan=true,gles=false,backend=virglrenderer,egl=true,surfaceless=true,fixed-blob-mapping=false"
   tags:
     - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM
+
+.android-angle-venus-anv-test:
+  extends:
+    - .lava-x86_64-test-android
+    - .anv-test
+    - .test-angle
+  variables:
+    ANDROID_GPU_MODE: venus_guest_angle
+    VK_DRIVER: intel
diff --git a/src/virtio/ci/gitlab-ci.yml b/src/virtio/ci/gitlab-ci.yml
index e5866d2993b..4e8bfc401f8 100644
--- a/src/virtio/ci/gitlab-ci.yml
+++ b/src/virtio/ci/gitlab-ci.yml
@@ -49,14 +49,10 @@ venus-lavapipe-full:
 
 android-angle-venus-anv-cml:
   extends:
-    - .lava-x86_64-test-android
-    - .anv-test
-    - .test-angle
+    - .android-angle-venus-anv-test
     - .lava-asus-C436FA-Flip-hatch:x86_64
     - .venus-anv-rules
   variables:
-    ANDROID_GPU_MODE: venus_guest_angle
     DEQP_SUITE: android-angle-venus-anv
     GPU_VERSION: android-angle-venus-anv
     HWCI_KERNEL_MODULES: "i915,vhost_vsock"
-    VK_DRIVER: intel