diff --git a/.gitlab-ci/android-runner.sh b/.gitlab-ci/android-runner.sh
index d791996f06f..1a15e1bbc0f 100755
--- a/.gitlab-ci/android-runner.sh
+++ b/.gitlab-ci/android-runner.sh
@@ -71,17 +71,10 @@ $ADB push "$INSTALL/lib/libEGL.so" /vendor/lib64/egl/libEGL_mesa.so
 $ADB push "$INSTALL/lib/libGLESv1_CM.so" /vendor/lib64/egl/libGLESv1_CM_mesa.so
 $ADB push "$INSTALL/lib/libGLESv2.so" /vendor/lib64/egl/libGLESv2_mesa.so
 
-# Remove and replace Vulkan drivers:
-# - For Cuttlefish virtual machines, replace lavapipe or venus
-# - For Android hardware, replace the Vulkan driver specified by VK_DRIVER
-if [ -n "${CUTTLEFISH_GPU_MODE:-}" ]; then
-  if [ "$CUTTLEFISH_GPU_MODE" = "mesa_swrast" ] || [ "$CUTTLEFISH_GPU_MODE" = "mesa_swrast_guest_angle" ]; then
-    $ADB shell rm -f /vendor/lib64/hw/vulkan.lvp.so*
-    $ADB push "$INSTALL/lib/libvulkan_lvp.so" /vendor/lib64/hw/vulkan.lvp.so
-  else
-    $ADB shell rm -f /vendor/lib64/hw/vulkan.virtio.so*
-    $ADB push "$INSTALL/lib/libvulkan_virtio.so" /vendor/lib64/hw/vulkan.virtio.so
-  fi
+# Remove and replace Vulkan drivers
+if [ "${CUTTLEFISH_GPU_MODE:-}" = "venus" ] || [ "${CUTTLEFISH_GPU_MODE:-}" = "venus_guest_angle" ]; then
+  $ADB shell rm -f /vendor/lib64/hw/vulkan.virtio.so*
+  $ADB push "$INSTALL/lib/libvulkan_virtio.so" /vendor/lib64/hw/vulkan.virtio.so
 else
   $ADB shell rm -f /vendor/lib64/hw/vulkan.${VK_DRIVER}.so*
   $ADB push "$INSTALL/lib/libvulkan_${VK_DRIVER}.so" /vendor/lib64/hw/vulkan.${VK_DRIVER}.so
diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
index e28926541b6..4165ca49728 100644
--- a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
+++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
@@ -71,6 +71,7 @@ android-angle-lavapipe:
     CUTTLEFISH_GPU_MODE: mesa_swrast_guest_angle
     DEQP_SUITE: android-angle-lavapipe
     GPU_VERSION: lvp-android-angle
+    VK_DRIVER: lvp
   timeout: 15m
   extends:
     - .test-android
@@ -81,6 +82,7 @@ android-angle-lavapipe-cts-full:
   variables:
     CUTTLEFISH_GPU_MODE: mesa_swrast_guest_angle
     GPU_VERSION: lvp-android-angle
+    VK_DRIVER: lvp
   timeout: 45m
   extends:
     - .test-android