diff --git a/src/gallium/frontends/lavapipe/ci/deqp-android-angle-lavapipe.toml b/src/gallium/frontends/lavapipe/ci/deqp-android-angle-lavapipe.toml
index 0b8ba002290..0dccfd4d613 100644
--- a/src/gallium/frontends/lavapipe/ci/deqp-android-angle-lavapipe.toml
+++ b/src/gallium/frontends/lavapipe/ci/deqp-android-angle-lavapipe.toml
@@ -20,7 +20,13 @@ caselists = ["/data/deqp/vk-main.txt"]
 include = ["dEQP-VK.api.external.memory.android_hardware_buffer.*"]
 renderer_check = "llvmpipe"
 
-# Basic EGL test set
+# Vulkan WSI test set
+[[deqp]]
+deqp = "/data/deqp/deqp-vk"
+caselists = ["/data/deqp/vk-main.txt"]
+include = ["dEQP-VK.wsi.android.*"]
+
+# EGL test set
 [[deqp]]
 deqp = "/data/deqp/deqp-egl-android"
 caselists = ["/data/deqp/egl-main.txt"]
diff --git a/src/gallium/frontends/lavapipe/ci/lvp-android-angle-fails.txt b/src/gallium/frontends/lavapipe/ci/lvp-android-angle-fails.txt
index e69de29bb2d..c705eae6037 100644
--- a/src/gallium/frontends/lavapipe/ci/lvp-android-angle-fails.txt
+++ b/src/gallium/frontends/lavapipe/ci/lvp-android-angle-fails.txt
@@ -0,0 +1,145 @@
+# Lavapipe bug with ANGLE
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_clear_render_even_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_clear_render_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_clear_render_even_clear_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_clear_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_clear_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_clear_render_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_clear_even_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_clear_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_clear_even_clear_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_clear_even_none,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_clear_even_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_clear_even_render_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_clear_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_even_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_render_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_render_render_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_clear_render_even_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_clear_render_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_clear_render_even_clear_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_clear_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_clear_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_clear_render_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_clear_even_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_clear_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_clear_even_clear_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_clear_even_none,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_clear_even_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_clear_even_render_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_clear_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_even_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_render_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_after_swap.odd_render_render_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_clear_render_even_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_clear_render_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_clear_render_even_clear_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_clear_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_clear_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_clear_render_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_clear_even_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_clear_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_clear_even_clear_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_clear_even_none,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_clear_even_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_clear_even_render_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_clear_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_even_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_render_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.no_preserve.resize_before_swap.odd_render_render_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_clear_render_even_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_clear_render_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_clear_render_even_clear_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_clear_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_clear_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_clear_render_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_clear_even_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_clear_even_clear_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_clear_even_none,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_clear_even_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_clear_even_render_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_clear_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_even_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_render_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.no_resize.odd_render_render_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_clear_render_even_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_clear_render_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_clear_render_even_clear_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_clear_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_clear_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_clear_render_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_clear_even_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_clear_even_clear_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_clear_even_none,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_clear_even_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_clear_even_render_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_clear_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_even_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_render_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_after_swap.odd_render_render_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_clear_render_even_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_clear_render_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_clear_render_even_clear_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_clear_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_clear_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_clear_render_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_clear_even_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_clear_even_clear_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_clear_even_none,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_clear_even_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_clear_even_render_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_clear_even_render_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_even_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_render_even_clear_clear,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_render_even_none,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_render_even_render,Fail
+dEQP-EGL.functional.buffer_age.preserve.resize_before_swap.odd_render_render_even_render_render,Fail
+dEQP-EGL.functional.fence_sync.valid.egl_fence_persistent_buffer,Fail
+dEQP-EGL.functional.partial_update.odd_clear_render_even_clear,Fail
+dEQP-EGL.functional.partial_update.odd_clear_render_even_clear_clear,Fail
+dEQP-EGL.functional.partial_update.odd_clear_render_even_clear_render,Fail
+dEQP-EGL.functional.partial_update.odd_clear_render_even_none,Fail
+dEQP-EGL.functional.partial_update.odd_clear_render_even_render,Fail
+dEQP-EGL.functional.partial_update.odd_clear_render_even_render_render,Fail
+dEQP-EGL.functional.partial_update.odd_render_clear_even_clear,Fail
+dEQP-EGL.functional.partial_update.odd_render_clear_even_clear_clear,Fail
+dEQP-EGL.functional.partial_update.odd_render_clear_even_clear_render,Fail
+dEQP-EGL.functional.partial_update.odd_render_clear_even_none,Fail
+dEQP-EGL.functional.partial_update.odd_render_clear_even_render,Fail
+dEQP-EGL.functional.partial_update.odd_render_clear_even_render_clear,Fail
+dEQP-EGL.functional.partial_update.odd_render_clear_even_render_render,Fail
+dEQP-EGL.functional.partial_update.odd_render_even_clear,Fail
+dEQP-EGL.functional.partial_update.odd_render_even_none,Fail
+dEQP-EGL.functional.partial_update.odd_render_even_render,Fail
+dEQP-EGL.functional.partial_update.odd_render_render_even_clear_clear,Fail
+dEQP-EGL.functional.partial_update.odd_render_render_even_none,Fail
+dEQP-EGL.functional.partial_update.odd_render_render_even_render,Fail
+dEQP-EGL.functional.partial_update.odd_render_render_even_render_render,Fail
+dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.reset_status.reads.uniform_block.compute,Crash
+dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.reset_status.reads.uniform_block.fragment,Crash
+dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.reset_status.reads.uniform_block.vertex_and_fragment,Crash
+dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.reset_status.writes.local_array.compute,Crash
+dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.reset_status.writes.shader_storage_block.compute,Crash
+dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.reset_status.writes.uniform_block.compute,Crash