diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh
index 8558458456e..02aabf6845c 100644
--- a/.gitlab-ci/container/build-piglit.sh
+++ b/.gitlab-ci/container/build-piglit.sh
@@ -8,7 +8,7 @@ set -ex
 # DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
-REV="f7db20b03de6896d013826c0a731bc4417c1a5a0"
+REV="e9316bcd12544aaf7e753ce37fe50d64165d9598"
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 9abe01c6021..26927d7f8c8 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -19,13 +19,12 @@ variables:
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
    DEBIAN_X86_64_TEST_ANDROID_TAG: "2024-01-24-split"
-   DEBIAN_X86_64_TEST_GL_TAG: "2024-01-24-split"
-   DEBIAN_X86_64_TEST_VK_TAG: "2024-01-24-split"
-
+   DEBIAN_X86_64_TEST_GL_TAG: "2024-01-29-piglit-e931"
+   DEBIAN_X86_64_TEST_VK_TAG: "2024-01-29-piglit-e931"
    ALPINE_X86_64_BUILD_TAG: "2023-01-07-libdrm2_4_119"
    ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
    FEDORA_X86_64_BUILD_TAG: "2024-01-23-teflon-3"
-   KERNEL_ROOTFS_TAG: "2024-01-28-virglrenderer"
+   KERNEL_ROOTFS_TAG: "2024-01-29-piglit-e931"
    KERNEL_TAG: "v6.6.13-mesa-9916"
    KERNEL_REPO: "gfx-ci/linux"
    PKG_REPO_REV: "3cc12a2a"
diff --git a/src/amd/ci/radeonsi-raven-fails.txt b/src/amd/ci/radeonsi-raven-fails.txt
index 33c5ad8d0bc..ad3c4d2f40e 100644
--- a/src/amd/ci/radeonsi-raven-fails.txt
+++ b/src/amd/ci/radeonsi-raven-fails.txt
@@ -145,6 +145,6 @@ spec@arb_viewport_array@display-list,Fail
 # since transition XORG -> WESTON
 glx@glx_arb_sync_control@waitformsc,Fail
 
-# remove these after updating piglit:
-spec@arb_fragment_layer_viewport@layer-gs-write-simple,Fail
-spec@arb_fragment_layer_viewport@layer-vs-write-simple,Fail
+# uprev Piglit in Mesa
+spec@arb_tessellation_shader@execution@tesslevels-indirect,Crash
+
diff --git a/src/amd/ci/radeonsi-raven-flakes.txt b/src/amd/ci/radeonsi-raven-flakes.txt
index 40cd5037288..4bdeaa6572f 100644
--- a/src/amd/ci/radeonsi-raven-flakes.txt
+++ b/src/amd/ci/radeonsi-raven-flakes.txt
@@ -14,3 +14,9 @@ glx@glx-visuals-stencil -pixmap
 glx@glx-visuals-stencil
 # ci-collate: Issue found in https://gitlab.freedesktop.org/mesa/mesa/-/jobs/49445712
 glx@glx-multithread-texture
+
+# uprev Piglit in Mesa
+glx@glx-swap-singlebuffer
+spec@!opengl 1.1@ppgtt_memory_alignment
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount-multithread
+
diff --git a/src/amd/ci/radeonsi-stoney-fails.txt b/src/amd/ci/radeonsi-stoney-fails.txt
index 08e4e671059..969b561b2f5 100644
--- a/src/amd/ci/radeonsi-stoney-fails.txt
+++ b/src/amd/ci/radeonsi-stoney-fails.txt
@@ -227,6 +227,7 @@ glx@glx_arb_sync_control@waitformsc,Fail
 
 # remove these after updating piglit:
 spec@arb_fragment_layer_viewport@layer-gs-writes-out-of-range,Fail
-spec@arb_fragment_layer_viewport@layer-vs-write-simple,Fail
-spec@arb_fragment_layer_viewport@layer-gs-write-simple,Fail
-spec@arb_fragment_layer_viewport@layer-vs-gs-write-simple,Fail
+
+# uprev Piglit in Mesa
+spec@arb_tessellation_shader@execution@tesslevels-indirect,Crash
+
diff --git a/src/amd/ci/radeonsi-stoney-flakes.txt b/src/amd/ci/radeonsi-stoney-flakes.txt
index 3c4caa9ba8e..691ee7f87bf 100644
--- a/src/amd/ci/radeonsi-stoney-flakes.txt
+++ b/src/amd/ci/radeonsi-stoney-flakes.txt
@@ -14,3 +14,9 @@ glx@glx-visuals-depth -pixmap
 
 # OQ flakes/fails started with no perceivable pattern around 2023-12-13
 dEQP-GLES3.functional.occlusion_query..*
+
+# uprev Piglit in Mesa
+dEQP-GLES3.functional.occlusion_query.scissor_depth_write_stencil_write_stencil_clear
+glx@glx-multithread-texture
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount-multithread
+
diff --git a/src/amd/ci/radv-raven-flakes.txt b/src/amd/ci/radv-raven-flakes.txt
index c1cb913e211..d4cbe7f13e4 100644
--- a/src/amd/ci/radv-raven-flakes.txt
+++ b/src/amd/ci/radv-raven-flakes.txt
@@ -1,2 +1,7 @@
 # since Debian 12 CI uprev
 dEQP-VK.pipeline.pipeline_library.framebuffer_attachment.diff_attachments_2d_32x32_39x41_ms
+
+# uprev Piglit in Mesa
+dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.2_secondary_2_primary_cmdbuffers_resuming
+dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.contents_secondary_primary_cmdbuffers_resuming
+
diff --git a/src/amd/ci/radv-stoney-aco-flakes.txt b/src/amd/ci/radv-stoney-aco-flakes.txt
index 619670a8b08..d2957eec32d 100644
--- a/src/amd/ci/radv-stoney-aco-flakes.txt
+++ b/src/amd/ci/radv-stoney-aco-flakes.txt
@@ -1,3 +1,14 @@
 # The following tests started to flake after CI fix, see
 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16325
 dEQP-VK.rasterization.interpolation_multisample_4_bit.triangles
+
+# uprev Piglit in Mesa
+dEQP-GLES31.functional.texture.specification.teximage3d_depth.depth32f_stencil8_cube_array
+dEQP-GLES31.functional.texture.specification.teximage3d_depth.depth_component24_cube_array
+dEQP-GLES31.functional.texture.specification.texsubimage3d_depth.depth24_stencil8_cube_array
+dEQP-GLES31.functional.texture.specification.texsubimage3d_depth.depth_component24_cube_array
+multisample-dEQP-GLES31.functional.blend_equation_advanced.barrier.multiply
+multisample-dEQP-GLES31.functional.blend_equation_advanced.basic.colordodge
+multisample-dEQP-GLES31.functional.blend_equation_advanced.basic.darken
+multisample-dEQP-GLES31.functional.blend_equation_advanced.basic.overlay
+
diff --git a/src/amd/ci/radv-stoney-flakes.txt b/src/amd/ci/radv-stoney-flakes.txt
new file mode 100644
index 00000000000..b9841069212
--- /dev/null
+++ b/src/amd/ci/radv-stoney-flakes.txt
@@ -0,0 +1,4 @@
+# uprev Piglit in Mesa
+dEQP-GLES3.functional.texture.shadow.2d.*..*mipmap_nearest.*
+dEQP-GLES31.functional.texture.specification.teximage3d_depth.depth32f_stencil8_cube_array
+
diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt
index 607aae940c2..f9506a4933e 100644
--- a/src/broadcom/ci/broadcom-rpi3-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi3-fails.txt
@@ -895,7 +895,6 @@ spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail
 spec@!opengl 2.1@pbo,Fail
 spec@!opengl 2.1@pbo@test_polygon_stip,Fail
 spec@!opengl 2.1@polygon-stipple-fs,Fail
-spec@arb_arrays_of_arrays@execution@glsl-arrays-copy-size-mismatch,Fail
 spec@arb_depth_texture@depth-level-clamp,Fail
 spec@arb_depth_texture@texwrap formats,Fail
 spec@arb_depth_texture@texwrap formats@GL_DEPTH_COMPONENT16,Fail
@@ -951,7 +950,6 @@ spec@arb_pixel_buffer_object@texsubimage-unpack pbo,Fail
 spec@arb_point_sprite@arb_point_sprite-mipmap,Fail
 spec@arb_provoking_vertex@arb-provoking-vertex-render,Fail
 spec@arb_sampler_objects@sampler-objects,Fail
-spec@arb_shader_texture_lod@execution@glsl-fs-texturelod-01,Fail
 spec@arb_texture_rectangle@1-1-linear-texture,Fail
 spec@arb_texture_rectangle@texrect-many,Crash
 spec@arb_vertex_program@minmax,Fail
diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt
index ba102f03af2..28dd18a9813 100644
--- a/src/broadcom/ci/broadcom-rpi4-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi4-fails.txt
@@ -290,10 +290,7 @@ spec@ext_framebuffer_object@getteximage-formats init-by-clear-and-render,Fail
 spec@ext_framebuffer_object@getteximage-formats init-by-rendering,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers@autogen-AB24-DRM_FORMAT_MOD_LINEAR-clear_reimport,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers@autogen-AR24-DRM_FORMAT_MOD_LINEAR-clear_reimport,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers@autogen-R16-DRM_FORMAT_MOD_LINEAR-clear_reimport,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers@autogen-R8-DRM_FORMAT_MOD_LINEAR-clear_reimport,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_argb8888,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_nv12,Fail
@@ -508,3 +505,7 @@ dEQP-VK.pipeline.shader_object_unlinked_spirv.framebuffer_attachment.unused_atta
 
 # https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/4422
 KHR-GL31.texture_size_promotion.functional,Fail
+
+# uprev Piglit in Mesa
+spec@glsl-1.40@uniform_buffer@two-stages,Fail
+
diff --git a/src/etnaviv/ci/etnaviv-gc2000-fails.txt b/src/etnaviv/ci/etnaviv-gc2000-fails.txt
index ee10ea1dbdc..03363b11de1 100644
--- a/src/etnaviv/ci/etnaviv-gc2000-fails.txt
+++ b/src/etnaviv/ci/etnaviv-gc2000-fails.txt
@@ -129,7 +129,6 @@ dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear
 dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_nearest_linear_clamp,Fail
 dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_nearest_linear_mirror,Fail
 dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_nearest_linear_repeat,Fail
-dEQP-GLES2.functional.uniform_api.random.0,Fail
 fast_color_clear@fcc-read-after-clear blit tex,Fail
 fast_color_clear@fcc-read-after-clear copy rb,Fail
 fast_color_clear@fcc-read-after-clear copy tex,Fail
@@ -158,7 +157,6 @@ spec@arb_clear_texture@arb_clear_texture-sized-formats,Fail
 spec@arb_clear_texture@arb_clear_texture-supported-formats,Fail
 spec@arb_depth_texture@depth-level-clamp,Fail
 spec@arb_depth_texture@fbo-depth-gl_depth_component16-tex1d,Fail
-spec@arb_depth_texture@fbo-depth-gl_depth_component24-blit,Fail
 spec@arb_depth_texture@texwrap formats bordercolor,Fail
 spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT16- border color only,Fail
 spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT24- border color only,Fail
@@ -207,7 +205,6 @@ spec@arb_occlusion_query@occlusion_query_meta_fragments,Fail
 spec@arb_pixel_buffer_object@cubemap npot pbo,Fail
 spec@arb_pixel_buffer_object@fbo-pbo-readpixels-small,Fail
 spec@arb_pixel_buffer_object@texsubimage array pbo,Fail
-spec@arb_pixel_buffer_object@texsubimage-depth-formats pbo,Fail
 spec@arb_point_sprite@arb_point_sprite-interactions 1.0,Fail
 spec@arb_point_sprite@arb_point_sprite-mipmap,Fail
 spec@arb_provoking_vertex@arb-provoking-vertex-clipped-geometry-flatshading,Fail
@@ -275,9 +272,6 @@ spec@arb_texture_rectangle@texwrap rect bordercolor@GL_RGBA8- border color only,
 spec@arb_texture_rectangle@texwrap rect proj bordercolor,Fail
 spec@arb_texture_rectangle@texwrap rect proj bordercolor@GL_RGBA8- projected- border color only,Fail
 
-spec@arb_texture_storage@texture-storage@2D mipmap rendering ,Fail
-spec@arb_texture_storage@texture-storage,Fail
-spec@arb_vertex_buffer_object@pos-array,Fail
 spec@arb_vertex_program@big-param,Fail
 spec@arb_vertex_program@clip-plane-transformation arb,Fail
 
@@ -344,7 +338,6 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_vyuy,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvyu,Fail
 spec@ext_packed_depth_stencil@depth_stencil texture,Fail
-spec@ext_packed_depth_stencil@fbo-depth-gl_depth24_stencil8-copypixels,Fail
 spec@ext_packed_depth_stencil@fbo-stencil-gl_depth24_stencil8-blit,Fail
 spec@ext_packed_depth_stencil@texwrap formats bordercolor,Fail
 spec@ext_packed_depth_stencil@texwrap formats bordercolor@GL_DEPTH24_STENCIL8- border color only,Fail
@@ -526,7 +519,6 @@ spec@nv_conditional_render@copytexsubimage,Fail
 spec@nv_conditional_render@dlist,Fail
 spec@nv_conditional_render@drawpixels,Fail
 spec@nv_conditional_render@vertex_array,Fail
-spec@nv_copy_image@nv_copy_image-simple --tex-to-tex,Fail
 spec@nv_primitive_restart@primitive-restart-draw-mode-lines,Fail
 spec@nv_primitive_restart@primitive-restart-draw-mode-triangles,Fail
 
@@ -1972,7 +1964,6 @@ spec@!opengl 1.1@two-sided-lighting,Fail
 spec@!opengl 1.1@user-clip,Fail
 spec@!opengl 1.2@copyteximage 3d,Fail
 spec@!opengl 1.2@lodclamp-between-max,Fail
-spec@!opengl 1.2@texture-packed-formats,Fail
 spec@!opengl 1.2@texwrap 3d bordercolor,Fail
 spec@!opengl 1.2@texwrap 3d bordercolor@GL_RGBA8- border color only,Fail
 spec@!opengl 1.2@texwrap 3d proj bordercolor,Fail
diff --git a/src/etnaviv/ci/etnaviv-gc2000-flakes.txt b/src/etnaviv/ci/etnaviv-gc2000-flakes.txt
index ceb8c5c3fde..70e165824a9 100644
--- a/src/etnaviv/ci/etnaviv-gc2000-flakes.txt
+++ b/src/etnaviv/ci/etnaviv-gc2000-flakes.txt
@@ -217,3 +217,14 @@ spec@arb_fragment_program@texturing@txp-2d
 spec@arb_vertex_program@instructions@xpd
 
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y410
+
+# uprev Piglit in Mesa
+dEQP-GLES2.functional.fbo.render.stencil_clear.tex2d_rgb_stencil_index8
+dEQP-GLES2.functional.shaders.random.all_features.fragment.72
+dEQP-GLES2.functional.shaders.random.texture.fragment.43
+dEQP-GLES2.functional.shaders.random.texture.vertex.19
+dEQP-GLES2.functional.shaders.random.texture.vertex.23
+dEQP-GLES2.functional.texture.format.l8_cube_pot
+spec@ati_fragment_shader@ati_fragment_shader-error04-endshader
+spec@ext_texture_compression_s3tc@compressedteximage gl_compressed_rgba_s3tc_dxt1_ext
+
diff --git a/src/freedreno/ci/freedreno-a530-fails.txt b/src/freedreno/ci/freedreno-a530-fails.txt
index 3e130a15bf4..1a58b2fefde 100644
--- a/src/freedreno/ci/freedreno-a530-fails.txt
+++ b/src/freedreno/ci/freedreno-a530-fails.txt
@@ -343,7 +343,6 @@ spec@arb_uniform_buffer_object@execution@std140-struct-array-array-array-struct,
 spec@arb_uniform_buffer_object@execution@shared-array-struct-array-struct,Fail
 spec@arb_uniform_buffer_object@execution@std140-array-struct-array-struct,Fail
 
-dEQP-GLES31.functional.compute.indirect_dispatch.gen_in_compute.multi_dispatch_reuse_command,Fail
+# uprev Piglit in Mesa
+spec@glsl-1.40@uniform_buffer@two-stages,Fail
 
-# New CTS failures in 1.3.6.3
-KHR-GLES31.core.compute_shader.simple-compute-shared_context-persistent-buffer,Fail
diff --git a/src/freedreno/ci/freedreno-a530-flakes.txt b/src/freedreno/ci/freedreno-a530-flakes.txt
index ad0cb32c2c8..7a506de24fa 100644
--- a/src/freedreno/ci/freedreno-a530-flakes.txt
+++ b/src/freedreno/ci/freedreno-a530-flakes.txt
@@ -161,3 +161,7 @@ spec@arb_uniform_buffer_object@execution@shared-row_major-array-mat2x2-and-colum
 spec@mesa_shader_integer_functions@execution@built-in-functions@fs-umulextended-only-msb-nonuniform
 # ci-collate: Issue found in https://gitlab.freedesktop.org/mesa/mesa/-/jobs/49445812
 KHR-GLES31.core.compute_shader.simple-compute-shared_context
+
+# uprev Piglit in Mesa
+KHR-GLES31.core.compute_shader.simple-compute-shared_context-persistent-buffer
+
diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt
index 5581f8e7d13..b8273dd358a 100644
--- a/src/freedreno/ci/freedreno-a618-fails.txt
+++ b/src/freedreno/ci/freedreno-a618-fails.txt
@@ -3,10 +3,6 @@ KHR-GL46.shader_image_load_store.basic-allFormats-store,Fail
 KHR-GL46.shader_image_load_store.basic-allTargets-store,Fail
 KHR-GL46.shading_language_420pack.binding_images,Fail
 
-# "Invalid value returned: expected:[1, 1, 1, 1] retrieved: [0, 0, 0, 0
-#  Invalid rendering result at esextcTessellationShaderBarrier.cpp:504"
-KHR-GLES31.core.tessellation_shader.tessellation_shader_tc_barriers.barrier_guarded_read_calls,Fail
-
 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/5582
 KHR-GLES31.core.texture_cube_map_array.color_depth_attachments,Fail
 KHR-GL46.texture_cube_map_array.color_depth_attachments,Fail
@@ -27,8 +23,6 @@ glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
 glx@glx_arb_create_context_no_error@no error,Fail
 glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail
 glx@glx-swap-pixmap-bad,Fail
-glx@glx-visuals-depth -pixmap,Crash
-glx@glx-visuals-stencil -pixmap,Crash
 
 # "../src/freedreno/ir3/ir3_shader.h:968:ir3_link_add: Assertion `i < ARRAY_SIZE(l->var)' failed."
 shaders@glsl-max-varyings >max_varying_components,Crash
diff --git a/src/freedreno/ci/freedreno-a618-flakes.txt b/src/freedreno/ci/freedreno-a618-flakes.txt
index 5e8353c9c21..86cb29e828d 100644
--- a/src/freedreno/ci/freedreno-a618-flakes.txt
+++ b/src/freedreno/ci/freedreno-a618-flakes.txt
@@ -214,3 +214,13 @@ spec@!opengl 3.2@gl-3.2-adj-prims cull-front pv-last
 spec@!opengl 3.2@gl-3.2-adj-prims line cull-back pv-last
 spec@!opengl 3.2@gl-3.2-adj-prims line cull-front pv-last
 spec@!opengl 3.2@gl-3.2-adj-prims pv-last
+
+# uprev Piglit in Mesa
+KHR-GLES3.copy_tex_image_conversions.required.cubemap_posx_texture2d
+KHR-GLES31.core.shader_bitfield_operation.findMSB.ivec3_1
+KHR-GLES31.core.shader_multisample_interpolation.render.interpolate_at_offset.rgba8i.samples_1
+KHR-GLES31.core.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba8i.samples_1
+KHR-GLES31.core.tessellation_shader.tessellation_shader_tc_barriers.barrier_guarded_read_calls
+glx@glx-visuals-depth -pixmap
+glx@glx-visuals-stencil -pixmap
+
diff --git a/src/freedreno/ci/freedreno-a618-skips.txt b/src/freedreno/ci/freedreno-a618-skips.txt
index 19f1e355213..b1c4096740b 100644
--- a/src/freedreno/ci/freedreno-a618-skips.txt
+++ b/src/freedreno/ci/freedreno-a618-skips.txt
@@ -57,3 +57,8 @@ spec@nv_copy_image@nv_copy_image.*
 
 # Exclude this test which might fail when a new extension is implemented.
 dEQP-VK.info.device_extensions
+
+# uprev Piglit in Mesa
+spec@arb_timer_query@timestamp-get
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers.*
+
diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt
index 7876ae10381..8b51fea45d9 100644
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -30,8 +30,6 @@ glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail
 glx@glx-make-current,Fail
 glx@glx-multi-window-single-context,Fail
 glx@glx-swap-pixmap-bad,Fail
-glx@glx-visuals-depth -pixmap,Crash
-glx@glx-visuals-stencil -pixmap,Crash
 
 # "../src/freedreno/ir3/ir3_shader.h:968:ir3_link_add: Assertion `i < ARRAY_SIZE(l->var)' failed."
 shaders@glsl-max-varyings >max_varying_components,Crash
@@ -123,7 +121,6 @@ spec@egl_mesa_configless_context@basic,Fail
 # TU gmem mode gets fullscreen green.
 spec@ext_external_objects@vk-depth-display,Fail
 spec@ext_external_objects@vk-depth-display@D16,Fail
-spec@ext_external_objects@vk-depth-display@D24S8,Fail
 
 # "Failed to submit queue." from the test some of the time.  No validation failures.
 # When it doesn't fail with that message, gets a set of corrupted colors (supposed
@@ -376,3 +373,4 @@ stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.
 stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.32bit.geom.xfb.rast.line_strip_with_adjacency.pgq_default_xfb_1.single_draw.xfbq_first.after,Fail
 stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.32bit.geom.xfb.rast.triangle_strip_with_adjacency.pgq_default_xfb_1.single_draw.xfbq_first.before_2_queries,Fail
 stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.32bit.tese.xfb.rast.patch_list.pgq_default_xfb_default.two_draws.xfbq_first.none_2_queries,Fail
+
diff --git a/src/freedreno/ci/freedreno-a630-flakes.txt b/src/freedreno/ci/freedreno-a630-flakes.txt
index c0d63b32b5c..24b79fea4fa 100644
--- a/src/freedreno/ci/freedreno-a630-flakes.txt
+++ b/src/freedreno/ci/freedreno-a630-flakes.txt
@@ -226,3 +226,59 @@ KHR-GL46.shader_storage_buffer_object.basic-matrixOperations-case3-cs
 
 # recently started flaking towards to UnexpectedPass
 spec@ext_external_objects@vk-depth-display@D24S8
+
+# uprev Piglit in Mesa
+glx@glx-destroycontext-1
+glx@glx-visuals-depth -pixmap
+glx@glx-visuals-stencil -pixmap
+spec@arb_timer_query@timestamp-get
+stale-regs-dEQP-VK.clipping.clip_volume.clipped.large_points
+stale-regs-dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.simple_draw.simple_draw_instanced_triangle_list
+stale-regs-dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.multi_draw.mosaic.indexed_mixed.max_draws.standard_stride.2_instances_base_3.tess_geom.single_view.offset_6
+stale-regs-dEQP-VK.draw.renderpass.multi_draw.mosaic.indexed_random.max_draws.stride_extra_4.10_instances.vert_only.multiview.no_offset
+stale-regs-dEQP-VK.draw.renderpass.multi_draw.overlapping.indexed_mixed.one_draw.stride_zero.no_instances.with_tess.single_view.offset_6
+stale-regs-dEQP-VK.graphicsfuzz.cov-transpose-multiply
+stale-regs-dEQP-VK.image.format_reinterpret.2d_array.b8g8r8a8_uint_r8g8b8a8_sint
+stale-regs-dEQP-VK.image.format_reinterpret.cube.a8b8g8r8_unorm_pack32_a2b10g10r10_uint_pack32
+stale-regs-dEQP-VK.image.mutable.2d_array.r8g8b8a8_sint_r16g16_sfloat_store_load_format_list
+stale-regs-dEQP-VK.image.store.without_format.buffer.r16g16_uint_minalign_linear
+stale-regs-dEQP-VK.query_pool.statistics_query.host_query_reset.clipping_primitives.primary.64bits_triangle_strip_with_adjacency_clear_color
+stale-regs-dEQP-VK.ssbo.phys.layout.3_level_array.std140.mat4x3
+stale-regs-dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_nonconst_bvec3_requiredsubgroupsize64
+stale-regs-dEQP-VK.synchronization.*
+stale-regs-dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.clamp_to_edge.mirror_clamp_to_edge.repeat
+stale-regs-dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_nearest.nearest.mirror_clamp_to_edge.clamp_to_edge.clamp_to_edge
+stale-regs-dEQP-VK.texture.mipmap.2d.basic.linear_nearest_clamp_non_square
+stale-regs-dEQP-VK.texture.mipmap.3d.max_lod.linear_linear
+stale-regs-dEQP-VK.texture.shadow.cube_array.linear_mipmap_linear.non_seamless_greater_x8_d24_unorm_pack32
+stale-regs-dEQP-VK.texture.shadow.cube_array.nearest_mipmap_linear.non_seamless_not_equal_d32_sfloat_s8_uint
+stale-regs-dEQP-VK.texture.swizzle.component_mapping.color.r16_sscaled_2d_npot_zzzz
+stale-regs-dEQP-VK.texture.swizzle.texture_coordinate.astc_10x8_srgb_block_2d_npot_yy
+stale-regs-dEQP-VK.texture.swizzle.texture_coordinate.r32g32b32a32_sint_2d_npot_xx
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.copy..*reset.*
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.32bit.geom.xfb.rast.triangle_fan.pgq_0_xfb_0.single_draw.pqg_first.none
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.64bit.geom.xfb.rast.triangle_strip_with_adjacency.pgq_0_xfb_0.single_draw.xfbq_first.none_2_queries
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.64bit.vert.no_xfb.rast.triangle_fan.pgq_default.single_draw.pqg_first.after
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.pgq_32bit_xfb_64bit.geom.xfb.rast.line_list.pgq_0_xfb_0.two_draws.xfbq_first.none
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.pgq_32bit_xfb_64bit.geom.xfb.rast.line_strip.pgq_0_xfb_default.two_draws.xfbq_first.after_2_queries
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.pgq_32bit_xfb_64bit.geom.xfb.rast.triangle_strip_with_adjacency.pgq_0_xfb_0.two_draws.pqg_first.after_2_queries
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.pgq_64bit_xfb_32bit.geom.xfb.rast.triangle_fan.pgq_default_xfb_1.two_draws.xfbq_first.after_2_queries
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.pgq_64bit_xfb_32bit.geom.xfb.rast.triangle_strip.pgq_default_xfb_0.single_draw.xfbq_first.none
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.32bit.geom.no_xfb.empty_frag.line_list_with_adjacency.pgq_default.two_draws.pqg_first.none
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.32bit.geom.no_xfb.rast.line_list_with_adjacency.pgq_0.single_draw.pqg_first.before
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.32bit.geom.xfb.color_write_disable_dynamic.triangle_strip_with_adjacency.pgq_0_xfb_1.single_draw.xfbq_first.before
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.32bit.geom.xfb.color_write_disable_dynamic_ds.triangle_list.pgq_0_xfb_1.two_draws.pqg_first.before_2_queries
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.32bit.geom.xfb.color_write_disable_static.triangle_fan.pgq_default_xfb_default.single_draw.xfbq_first.before
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.32bit.geom.xfb.color_write_disable_static.triangle_list.pgq_default_xfb_default.two_draws.xfbq_first.after
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.32bit.geom.xfb.color_write_disable_static_ds.triangle_strip.pgq_0_xfb_default.single_draw.pqg_first.after_2_queries
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.32bit.geom.xfb.empty_frag.triangle_list.pgq_0_xfb_default.two_draws.pqg_first.none_2_queries
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.32bit.geom.xfb.rast.triangle_list.pgq_0_xfb_default.single_draw.pqg_first.none_2_queries
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.32bit.vert.xfb.no_attachment.triangle_fan.pgq_default_xfb_default.two_draws.pqg_first.none
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.64bit.geom.xfb.rast.line_list_with_adjacency.pgq_0_xfb_1.single_draw.pqg_first.before
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.pgq_32bit_xfb_64bit.geom.xfb.rast.line_list_with_adjacency.pgq_default_xfb_1.single_draw.pqg_first.before
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.pgq_32bit_xfb_64bit.vert.xfb.rast.line_list.pgq_default_xfb_default.single_draw.xfbq_first.none_2_queries
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.pgq_32bit_xfb_64bit.vert.xfb.rast.line_strip.pgq_default_xfb_default.two_draws.pqg_first.before_2_queries
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.pgq_64bit_xfb_32bit.geom.xfb.rast.line_list.pgq_0_xfb_0.single_draw.xfbq_first.before_2_queries
+stale-regs-dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.pgq_64bit_xfb_32bit.geom.xfb.rast.triangle_list.pgq_default_xfb_1.single_draw.xfbq_first.none
+stale-regs-dEQP-VK.transform_feedback.simple.query_omit_write_line_strip_with_adjacency_1_61_32bits
+
diff --git a/src/freedreno/ci/freedreno-a630-skips.txt b/src/freedreno/ci/freedreno-a630-skips.txt
index dc0f991fb4a..f48445ece15 100644
--- a/src/freedreno/ci/freedreno-a630-skips.txt
+++ b/src/freedreno/ci/freedreno-a630-skips.txt
@@ -73,3 +73,7 @@ spec@nv_copy_image@nv_copy_image.*
 
 # Exclude this test which might fail when a new extension is implemented.
 dEQP-VK.info.device_extensions
+
+# uprev Piglit in Mesa
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers.*
+
diff --git a/src/gallium/drivers/lima/ci/lima-fails.txt b/src/gallium/drivers/lima/ci/lima-fails.txt
index 948ca471b95..c305af4612d 100644
--- a/src/gallium/drivers/lima/ci/lima-fails.txt
+++ b/src/gallium/drivers/lima/ci/lima-fails.txt
@@ -67,7 +67,6 @@ shaders@glsl-bug-22603,Fail
 shaders@glsl-fs-flat-color,Fail
 shaders@glsl-predication-on-large-array,Fail
 shaders@glsl-routing,Fail
-spec@arb_arrays_of_arrays@execution@glsl-arrays-copy-size-mismatch,Fail
 spec@arb_color_buffer_float@gl_rgba8-render,Fail
 spec@arb_color_buffer_float@gl_rgba8-render-sanity,Fail
 spec@arb_depth_texture@fbo-depth-gl_depth_component16-blit,Fail
diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
index 8b584caad94..5824f5e6934 100644
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
@@ -144,7 +144,6 @@ spec@arb_gpu_shader_fp64@execution@conversion@vert-conversion-explicit-double-fl
 spec@arb_gpu_shader_fp64@execution@conversion@vert-conversion-explicit-dvec2-vec2,Fail
 spec@arb_gpu_shader_fp64@execution@conversion@vert-conversion-explicit-dvec3-vec3,Fail
 spec@arb_gpu_shader_fp64@execution@conversion@vert-conversion-explicit-dvec4-vec4,Fail
-spec@arb_shader_storage_buffer_object@execution@ssbo-atomiccompswap-int,Fail
 spec@arb_tessellation_shader@execution@gs-primitiveid-instanced,Fail
 spec@glsl-4.00@execution@conversion@frag-conversion-explicit-dmat2-mat2,Fail
 spec@glsl-4.00@execution@conversion@frag-conversion-explicit-dmat2x3-mat2x3,Fail
diff --git a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt
index cc3090165e3..77d39253d7a 100644
--- a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt
+++ b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt
@@ -1128,9 +1128,6 @@ spec@arb_transform_feedback3@arb_transform_feedback3-ext_interleaved_two_bufs_vs
 # error: main:90: eglChooseConfig() returned no configs
 spec@egl 1.4@eglterminate then unbind context,Fail
 
-# "No such file or directory (os error 2)"
-spec@egl_ext_protected_content@conformance,Fail
-
 # "eglChooseConfig() failed"
 spec@egl_khr_surfaceless_context@viewport,Fail
 spec@egl_mesa_configless_context@basic,Fail
@@ -1245,7 +1242,6 @@ spec@glsl-1.50@execution@primitive-id-no-gs-quads,Fail
 spec@glsl-1.50@execution@primitive-id-no-gs-strip,Fail
 spec@glsl-1.50@execution@primitive-id-no-gs-strip-first-vertex,Fail
 spec@glsl-es-3.00@execution@varying-struct-centroid_gles3,Fail
-spec@intel_performance_query@intel_performance_query-issue_2235,Fail
 
 spec@khr_texture_compression_astc@miptree-gl srgb-fp,Fail
 spec@khr_texture_compression_astc@miptree-gl srgb-fp@sRGB decode full precision,Fail
@@ -1283,3 +1279,7 @@ spec@arb_texture_buffer_object@texture-buffer-size-clamp@rg8ui_texture_buffer_si
 spec@arb_texture_buffer_object@texture-buffer-size-clamp@rg8ui_texture_buffer_size_via_sampler,Fail
 spec@arb_texture_buffer_object@texture-buffer-size-clamp@rgba8ui_texture_buffer_size_via_image,Fail
 spec@arb_texture_buffer_object@texture-buffer-size-clamp@rgba8ui_texture_buffer_size_via_sampler,Fail
+
+# uprev Piglit in Mesa
+spec@glsl-1.40@uniform_buffer@two-stages,Fail
+
diff --git a/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt b/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt
index 426c1886b05..d42f82ba422 100644
--- a/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt
+++ b/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt
@@ -1,7 +1,3 @@
-dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center,Fail
-dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail
-dEQP-GLES3.functional.clipping.point.wide_point_clip,Fail
-dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_corner,Fail
 dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_pixel.multisample_rbo_1,Fail
 dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_pixel.multisample_rbo_2,Fail
 dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_pixel.multisample_texture_1,Fail
diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt
index 63af0d0a903..5d2c6a0193c 100644
--- a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt
+++ b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt
@@ -38,7 +38,6 @@ KHR-GL43.shader_image_load_store.basic-allFormats-loadGeometryStages,Fail
 KHR-GL43.shader_image_load_store.basic-allFormats-storeGeometryStages,Fail
 KHR-GL43.shader_image_load_store.basic-allTargets-store,Fail
 KHR-GL43.shader_image_load_store.incomplete_textures,Fail
-KHR-GL43.shader_subroutine.ssbo_atomic_image_load_store,Fail
 
 KHR-Single-GL43.arrays_of_arrays_gl.InteractionArgumentAliasing1,Fail
 KHR-Single-GL43.arrays_of_arrays_gl.InteractionArgumentAliasing2,Fail
@@ -225,7 +224,6 @@ spec@arb_depth_texture@texwrap formats bordercolor-swizzled@GL_DEPTH_COMPONENT32
 spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT16- border color only,Fail
 spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT24- border color only,Fail
 spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT32- border color only,Fail
-spec@arb_direct_state_access@gettextureimage-formats init-by-rendering,Fail
 
 spec@arb_es2_compatibility@texwrap formats bordercolor,Fail
 spec@arb_es2_compatibility@texwrap formats bordercolor-swizzled,Fail
@@ -294,7 +292,6 @@ spec@arb_shader_image_load_store@max-size@image2DMSArray max size test/4x8x8x204
 spec@arb_shader_image_load_store@semantics,Fail
 spec@arb_shader_image_load_store@semantics@imageLoad/Vertex shader/rgba32f/image2DMS test,Fail
 spec@arb_shader_image_load_store@semantics@imageLoad/Vertex shader/rgba32f/image2DMSArray test,Fail
-spec@arb_shader_storage_buffer_object@execution@ssbo-atomiccompswap-int,Fail
 spec@arb_shader_texture_image_samples@builtin-image,Fail
 spec@arb_shader_texture_image_samples@builtin-image@r8/Compute/image2DMS samples test/2x8x96x1,Fail
 spec@arb_shader_texture_image_samples@builtin-image@r8/Compute/image2DMSArray samples test/2x8x16x6,Fail
@@ -382,8 +379,6 @@ spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled@GL_COMPRE
 spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT- swizzled- border color only,Fail
 spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM- swizzled- border color only,Fail
 spec@arb_texture_cube_map_array@fbo-generatemipmap-cubemap array s3tc_dxt1,Fail
-spec@arb_texture_float@fbo-blending-formats,Fail
-spec@arb_texture_float@fbo-blending-formats@GL_RGB32F,Fail
 spec@arb_texture_float@texwrap formats bordercolor,Fail
 spec@arb_texture_float@texwrap formats bordercolor-swizzled,Fail
 spec@arb_texture_float@texwrap formats bordercolor-swizzled@GL_ALPHA16F_ARB- swizzled- border color only,Fail
@@ -601,7 +596,6 @@ spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail
 spec@glsl-1.50@execution@primitive-id-no-gs-quad-strip,Fail
 spec@glsl-1.50@execution@primitive-id-no-gs-quads,Fail
 
-spec@glsl-1.50@execution@variable-indexing@gs-input-array-float-index-rd,Fail
 
 spec@glsl-4.00@execution@conversion@frag-conversion-explicit-dmat2-mat2,Fail
 spec@glsl-4.00@execution@conversion@frag-conversion-explicit-dmat2x3-mat2x3,Fail
@@ -660,7 +654,6 @@ spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Fail
 
 spec@nv_copy_image@nv_copy_image-formats,Fail
 spec@nv_copy_image@nv_copy_image-formats@Source: GL_DEPTH_COMPONENT24/Destination: GL_DEPTH_COMPONENT24,Fail
-spec@nv_primitive_restart@primitive-restart-draw-mode-polygon,Crash
 spec@nv_primitive_restart@primitive-restart-draw-mode-quad_strip,Crash
 spec@nv_read_depth@read_depth_gles3,Fail
 spec@oes_shader_io_blocks@compiler@layout-location-aliasing.vert,Fail
diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-flakes.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-flakes.txt
index 4191a8008a2..34cfb9ea597 100644
--- a/src/gallium/drivers/virgl/ci/virpipe-gl-flakes.txt
+++ b/src/gallium/drivers/virgl/ci/virpipe-gl-flakes.txt
@@ -52,3 +52,7 @@ spec@nv_primitive_restart@primitive-restart-draw-mode-quads
 shaders@glsl-uniform-interstage-limits@subdivide 5- statechanges
 spec@arb_framebuffer_no_attachments@arb_framebuffer_no_attachments-atomic@glScissor
 spec@arb_framebuffer_no_attachments@arb_framebuffer_no_attachments-atomic@glViewport
+
+# uprev Piglit in Mesa
+spec@ext_texture_array@fbo-depth-array stencil-clear
+
diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
index bc47108d236..04d3aacf472 100644
--- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
@@ -690,3 +690,11 @@ KHR-GL46.sparse_texture_tests.SparseTextureCommitment,Crash
 # Assertion `size % ZINK_SPARSE_BUFFER_PAGE_SIZE == 0 || offset + size == bo->base.size' failed.
 spec@arb_sparse_buffer@basic,Crash
 spec@arb_sparse_buffer@buffer-data,Crash
+
+# uprev Piglit in Mesa
+spec@arb_shader_storage_buffer_object@max-ssbo-size@fs,Crash
+spec@arb_shader_storage_buffer_object@max-ssbo-size@vs,Crash
+spec@ext_external_objects@vk-buf-exchange,Crash
+spec@ext_external_objects@vk-image-display-muliple-textures,Crash
+spec@ext_external_objects@vk-vert-buf-update-errors,Crash
+
diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-flakes.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-flakes.txt
index 9881a6deb84..cadb22dad83 100644
--- a/src/gallium/drivers/zink/ci/zink-anv-tgl-flakes.txt
+++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-flakes.txt
@@ -125,3 +125,13 @@ spec@ext_timer_query@time-elapsed
 spec@!opengl 2.0@occlusion-query-discard
 spec@arb_shader_storage_buffer_object@max-ssbo-size@fsexceed
 spec@arb_shader_storage_buffer_object@max-ssbo-size@vsexceed
+
+# uprev Piglit in Mesa
+spec@!opengl 1.1@depthstencil-default_fb-blit samples=16
+spec@!opengl 1.1@depthstencil-default_fb-blit samples=6
+spec@!opengl 1.1@depthstencil-default_fb-blit samples=8
+spec@arb_query_buffer_object@.*CPU_READ_BEFORE.*
+spec@arb_shader_image_load_store@coherency@Tessellation evaluation-Geometry shader/'coherent' qualifier coherency test/256x256
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers
+spec@ext_timer_query@time-elapsed
+
diff --git a/src/gallium/drivers/zink/ci/zink-freedreno-a618-fails.txt b/src/gallium/drivers/zink/ci/zink-freedreno-a618-fails.txt
index 2f0c8f25e00..8663b7b0049 100644
--- a/src/gallium/drivers/zink/ci/zink-freedreno-a618-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-freedreno-a618-fails.txt
@@ -1,6 +1,4 @@
-# Some incorrect colors and missing lines.  Passes on its own.  Need to extract and minify the failing caselist.
-dEQP-GLES3.functional.transform_feedback.random_full_array_capture.separate.lines.4,Fail
-
 # piglit xfb tests
 spec@ext_transform_feedback@tessellation quad_strip wireframe,Fail
 spec@ext_transform_feedback@tessellation quads wireframe,Fail
+
diff --git a/src/gallium/drivers/zink/ci/zink-freedreno-a618-flakes.txt b/src/gallium/drivers/zink/ci/zink-freedreno-a618-flakes.txt
index c46594c87b6..11898356cb4 100644
--- a/src/gallium/drivers/zink/ci/zink-freedreno-a618-flakes.txt
+++ b/src/gallium/drivers/zink/ci/zink-freedreno-a618-flakes.txt
@@ -53,3 +53,11 @@ dEQP-GLES3.functional.fbo.color.tex2d.rgb565
 dEQP-GLES3.functional.texture.specification.teximage2d_align.cube_rgba4_51_2
 # ci-collate: Issue found in https://gitlab.freedesktop.org/mesa/mesa/-/jobs/49638414
 dEQP-GLES31.functional.fbo.color.texcubearray.rgb565
+
+# uprev Piglit in Mesa
+dEQP-GLES3.functional.fbo.blit.conversion.rgba4_to_rgb10_a2
+dEQP-GLES3.functional.fbo.blit.conversion.rgba8_to_r16f
+dEQP-GLES31.functional.copy_image.non_compressed.viewclass_16_bits.r16f_rg8.texture2d_array_to_texture3d
+dEQP-GLES31.functional.copy_image.non_compressed.viewclass_16_bits.r16f_rg8ui.texture2d_array_to_texture3d
+dEQP-GLES31.functional.copy_image.non_compressed.viewclass_16_bits.r16ui_r16i.texture2d_array_to_texture2d_array
+
diff --git a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
index dfb56f0c41b..0973f2f0691 100644
--- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
@@ -120,7 +120,6 @@ spec@ext_framebuffer_multisample@interpolation 4 centroid-edges,Fail
 spec@ext_framebuffer_multisample@interpolation 4 non-centroid-deriv-disabled,Fail
 spec@ext_framebuffer_multisample@interpolation 4 non-centroid-disabled,Fail
 spec@ext_packed_float@query-rgba-signed-components,Fail
-spec@intel_performance_query@intel_performance_query-issue_2235,Fail
 
 spec@khr_texture_compression_astc@miptree-gl srgb-fp,Fail
 spec@khr_texture_compression_astc@miptree-gl srgb-fp@sRGB decode full precision,Fail
@@ -228,7 +227,6 @@ spec@glsl-4.00@execution@conversion@vert-conversion-explicit-double-float,Fail
 spec@glsl-4.00@execution@conversion@vert-conversion-explicit-dvec2-vec2,Fail
 spec@glsl-4.00@execution@conversion@vert-conversion-explicit-dvec3-vec3,Fail
 spec@glsl-4.00@execution@conversion@vert-conversion-explicit-dvec4-vec4,Fail
-spec@glsl-4.50@execution@ssbo-atomiccompswap-int,Fail
 
 spec@ext_transform_feedback@tessellation quads wireframe,Fail
 
diff --git a/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt b/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt
index 6fb69a4c812..a883379893e 100644
--- a/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt
+++ b/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt
@@ -34,3 +34,7 @@ spec@ext_texture_array@texsubimage array
 
 # crash in https://gitlab.freedesktop.org/mesa/mesa/-/jobs/48476882 and others
 KHR-GL46.layout_location.sampler_2d_shadow
+
+# uprev Piglit in Mesa
+spec@ext_framebuffer_multisample@accuracy all_samples depth_draw small depthstencil
+
diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt
index 248257a7d79..353bb7c8069 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt
@@ -184,8 +184,6 @@ spec@!opengl 2.1@pbo,Fail
 spec@!opengl 2.1@pbo@test_polygon_stip,Fail
 spec@!opengl 2.1@polygon-stipple-fs,Fail
 spec@!opengl 3.0@clearbuffer-depth-cs-probe,Fail
-spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail
-spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail
 
 spec@!opengl 1.1@teximage-colors gl_sluminance8_alpha8,Fail
 spec@!opengl 1.1@teximage-colors gl_sluminance8_alpha8@GL_SLUMINANCE8_ALPHA8 texture with GL_ABGR_EXT and GL_BYTE,Fail
@@ -339,3 +337,7 @@ spec@arb_viewport_array@display-list,Fail
 
 # New CTS failures in 1.3.6.3
 dEQP-GLES31.functional.image_load_store.buffer.atomic.comp_swap_r32i_return_value,Fail
+
+# uprev Piglit in Mesa
+spec@arb_tessellation_shader@execution@tesslevels-indirect,Crash
+
diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt b/src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt
index 8a00003bc6c..7bb1d28b7a4 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt
@@ -24,10 +24,6 @@ spec@arb_shader_image_load_store@shader-mem-barrier@Fragment shader/'volatile' q
 spec@arb_shader_image_load_store@shader-mem-barrier@Fragment shader/'volatile' qualifier memory barrier test/modulus=32
 spec@arb_shader_image_load_store@shader-mem-barrier@Fragment shader/'volatile' qualifier memory barrier test/modulus=64
 spec@arb_shader_image_load_store@shader-mem-barrier@Fragment shader/'volatile' qualifier memory barrier test/modulus=8
-spec@arb_shader_image_load_store@shader-mem-barrier@Geometry shader/'coherent' qualifier memory barrier test/modulus=128
-spec@arb_shader_image_load_store@shader-mem-barrier@Geometry shader/'coherent' qualifier memory barrier test/modulus=64
-spec@arb_shader_image_load_store@shader-mem-barrier@Geometry shader/'volatile' qualifier memory barrier test/modulus=128
-spec@arb_shader_image_load_store@shader-mem-barrier@Geometry shader/'volatile' qualifier memory barrier test/modulus=64
 spec@arb_shader_image_load_store@shader-mem-barrier@Tessellation control shader/'coherent' qualifier memory barrier test/modulus=128
 spec@arb_shader_image_load_store@shader-mem-barrier@Tessellation control shader/'coherent' qualifier memory barrier test/modulus=16
 spec@arb_shader_image_load_store@shader-mem-barrier@Tessellation control shader/'coherent' qualifier memory barrier test/modulus=32
@@ -46,10 +42,6 @@ spec@arb_shader_image_load_store@shader-mem-barrier@Tessellation evaluation shad
 spec@arb_shader_image_load_store@shader-mem-barrier@Tessellation evaluation shader/'volatile' qualifier memory barrier test/modulus=32
 spec@arb_shader_image_load_store@shader-mem-barrier@Tessellation evaluation shader/'volatile' qualifier memory barrier test/modulus=64
 spec@arb_shader_image_load_store@shader-mem-barrier@Tessellation evaluation shader/'volatile' qualifier memory barrier test/modulus=8
-spec@arb_shader_image_load_store@shader-mem-barrier@Vertex shader/'coherent' qualifier memory barrier test/modulus=128
-spec@arb_shader_image_load_store@shader-mem-barrier@Vertex shader/'coherent' qualifier memory barrier test/modulus=64
-spec@arb_shader_image_load_store@shader-mem-barrier@Vertex shader/'volatile' qualifier memory barrier test/modulus=128
-spec@arb_shader_image_load_store@shader-mem-barrier@Vertex shader/'volatile' qualifier memory barrier test/modulus=64
 
 # First noticed on ea2eade57b6a99d6db26d9571b3d2901e7106001
 # (https://gitlab.freedesktop.org/mesa/mesa/-/jobs/42417670);
@@ -85,3 +77,10 @@ spec@arb_query_buffer_object@qbo@query-GL_PRIMITIVES_GENERATED-ASYNC-GL_UNSIGNED
 # contradicts the resolution of GL_ARB_fragment_shader_interlock issue 1.
 # https://gitlab.freedesktop.org/mesa/piglit/-/issues/93
 spec@arb_fragment_shader_interlock@arb_fragment_shader_interlock-image-load-store
+
+# uprev Piglit in Mesa
+spec@arb_shader_image_load_store@shader-mem-barrier@Geometry shader.*
+spec@arb_shader_image_load_store@shader-mem-barrier@Vertex shader.*
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers@autogen-AR24-0x200000000801b02-modifiers_test
+
diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt
index 03e0bacfb29..d293367a226 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt
@@ -183,8 +183,6 @@ spec@!opengl 2.1@pbo,Fail
 spec@!opengl 2.1@pbo@test_polygon_stip,Fail
 spec@!opengl 2.1@polygon-stipple-fs,Fail
 spec@!opengl 3.0@clearbuffer-depth-cs-probe,Fail
-spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail
-spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail
 
 spec@!opengl 1.1@teximage-colors gl_sluminance8_alpha8,Fail
 spec@!opengl 1.1@teximage-colors gl_sluminance8_alpha8@GL_SLUMINANCE8_ALPHA8 texture with GL_ABGR_EXT and GL_BYTE,Fail
@@ -340,3 +338,7 @@ spec@!opengl 1.0@gl-1.0-polygon-line-aa,Fail
 
 # Regression noticed in https://gitlab.freedesktop.org/mesa/mesa/-/pipelines/891104
 spec@arb_viewport_array@display-list,Fail
+
+# uprev Piglit in Mesa
+spec@arb_tessellation_shader@execution@tesslevels-indirect,Crash
+
diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt b/src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt
index aa72e5fbbe9..b81c686a8bc 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt
@@ -81,3 +81,11 @@ spec@ext_texture_array@copyteximage 1d_array samples=2
 dEQP-GLES31.functional.copy_image.mixed.viewclass_128_bits_mixed.rgba32ui_srgb8_alpha8_astc_12x10_khr.renderbuffer_to_cubemap
 dEQP-GLES31.functional.copy_image.mixed.viewclass_128_bits_mixed.srgb8_alpha8_astc_10x8_khr_rgba32ui.cubemap_to_texture2d
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.using_sampler
+
+# uprev Piglit in Mesa
+spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked
+spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers@autogen-AR24-0x200000008567b03-modifiers_test
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers@autogen-AR24-0x200000008567b03-stress_test
+spec@glsl-1.50@execution@redeclare-pervertex-out-subset-gs
+
diff --git a/src/intel/ci/iris-kbl-fails.txt b/src/intel/ci/iris-kbl-fails.txt
index 3bebc1a8433..d43450ae1f5 100644
--- a/src/intel/ci/iris-kbl-fails.txt
+++ b/src/intel/ci/iris-kbl-fails.txt
@@ -128,3 +128,7 @@ spec@!opengl 1.1@line-smooth-stipple,Fail
 
 # fails after Debian bookworm update
 spec@arb_viewport_array@display-list,Fail
+
+# uprev Piglit in Mesa
+spec@arb_tessellation_shader@execution@tesslevels-indirect,Crash
+
diff --git a/src/intel/ci/iris-kbl-flakes.txt b/src/intel/ci/iris-kbl-flakes.txt
index d4f72b0af71..82bfc6132cb 100644
--- a/src/intel/ci/iris-kbl-flakes.txt
+++ b/src/intel/ci/iris-kbl-flakes.txt
@@ -18,3 +18,7 @@ spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_
 
 # See the https://gitlab.freedesktop.org/mesa/mesa/-/issues/7547
 spec@egl 1.4@largest possible eglcreatepbuffersurface and then glclear
+
+# uprev Piglit in Mesa
+spec@!opengl 1.2@tex3d-maxsize
+
diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt
index 0a87160fe16..c5b34313e24 100644
--- a/src/panfrost/ci/panfrost-g52-fails.txt
+++ b/src/panfrost/ci/panfrost-g52-fails.txt
@@ -78,7 +78,6 @@ spec@arb_sample_shading@samplemask 4 all@sample mask_in_one,Fail
 spec@arb_sample_shading@samplemask 4,Fail
 spec@arb_sample_shading@samplemask 4@noms mask_in_one,Fail
 spec@arb_sample_shading@samplemask 4@sample mask_in_one,Fail
-spec@arb_separate_shader_objects@atomic counter,Fail
 spec@arb_shader_draw_parameters@drawid-indirect-baseinstance,Fail
 spec@arb_shader_draw_parameters@drawid-indirect-basevertex,Fail
 spec@arb_shader_draw_parameters@drawid-indirect,Fail
@@ -418,10 +417,6 @@ spec@!opengl 3.1@primitive-restart-xfb generated,Fail
 spec@!opengl 3.1@primitive-restart-xfb written,Fail
 spec@!opengl es 3.0@gles-3.0-transform-feedback-uniform-buffer-object,Fail
 
-# https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/858
-spec@arb_shader_atomic_counters@semantics,Fail
-spec@arb_shader_atomic_counters@semantics@Fragment shader atomic built-in semantics,Fail
-
 # The following tests started to fail after CI fix, see
 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16325
 dEQP-VK.rasterization.interpolation_multisample_4_bit.lines_wide,Fail
@@ -745,3 +740,7 @@ spec@arb_copy_image@arb_copy_image-formats --samples=4@Source: GL_RGBA8_SNORM/De
 spec@arb_copy_image@arb_copy_image-formats --samples=4@Source: GL_RGBA8_SNORM/Destination: GL_RG16UI,Fail
 spec@arb_copy_image@arb_copy_image-formats --samples=4@Source: GL_RGBA8_SNORM/Destination: GL_RGBA8I,Fail
 spec@arb_copy_image@arb_copy_image-formats --samples=4@Source: GL_RGBA8_SNORM/Destination: GL_RGBA8UI,Fail
+
+# uprev Piglit in Mesa
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount-multithread,Crash
+
diff --git a/src/virtio/ci/venus-flakes.txt b/src/virtio/ci/venus-flakes.txt
index 82de0365d03..24b210e7422 100644
--- a/src/virtio/ci/venus-flakes.txt
+++ b/src/virtio/ci/venus-flakes.txt
@@ -3,3 +3,7 @@ dEQP-VK.robustness.buffer_access.through_pointers.graphics.writes.fragment.32B_i
 # New CTS flakes in 1.3.7.0
 dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.*
 dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.*
+
+# uprev Piglit in Mesa
+dEQP-VK.transform_feedback.primitives_generated_query.get.*reset.*
+