diff --git a/src/amd/ci/radeonsi-stoney-fails.txt b/src/amd/ci/radeonsi-stoney-fails.txt
index 969b561b2f5..32dbc6685ec 100644
--- a/src/amd/ci/radeonsi-stoney-fails.txt
+++ b/src/amd/ci/radeonsi-stoney-fails.txt
@@ -231,3 +231,103 @@ spec@arb_fragment_layer_viewport@layer-gs-writes-out-of-range,Fail
 # uprev Piglit in Mesa
 spec@arb_tessellation_shader@execution@tesslevels-indirect,Crash
 
+# These are dEQP bugs. See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10361
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment.block_array.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment_only_vertex.default_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment_only_vertex.default_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment.default_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment_only_vertex.block_array.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment_only_vertex.unnamed_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment_only_vertex.unnamed_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment.uniform_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment.uniform_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment_only_vertex.uniform_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.random.65,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment_only_vertex.unnamed_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment_only_vertex.block_array.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment_only_vertex.default_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment_only_vertex.uniform_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_tess_fragment.named_block,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.random.47,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment.block_array.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment.default_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment.block_array.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment.unnamed_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_geo_fragment.unnamed_block,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.random.49,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.random.58,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.random.59,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment.default_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment_only_vertex.uniform_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment.unnamed_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment_only_vertex.default_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment.block_array.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_geo_fragment.named_block,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_tess_geo_fragment_only_vertex.named_block,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.random.40,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.random.42,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment.uniform_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment_only_vertex.block_array.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment_only_vertex.uniform_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment.unnamed_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment_only_vertex.block_array.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment_only_vertex.block_array.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_tess_fragment.unnamed_block,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_tess_geo_fragment.block_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_tess_geo_fragment_only_vertex.unnamed_block,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment.unnamed_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment_only_vertex.block_array.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment_only_vertex.uniform_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment_only_vertex.unnamed_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment.uniform_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment_only_vertex.uniform_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment.default_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment_only_vertex.uniform_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_geo_fragment_only_vertex.block_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_geo_fragment_only_vertex.unnamed_block,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_tess_geo_fragment.named_block,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_tess_geo_fragment.unnamed_block,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment.default_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment.block_array.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment_only_vertex.block_array.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment_only_vertex.default_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment_only_vertex.default_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment_only_vertex.unnamed_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_geo_fragment.block_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_tess_fragment_only_vertex.block_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_tess_fragment_only_vertex.unnamed_block,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment.block_array.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment.uniform_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment_only_vertex.default_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment_only_vertex.unnamed_block.float_array,Fail
+dEQP-GLES31.functional.tessellation.state_query.referenced_by_tess_evaluation_shader,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment.block_array.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment.uniform_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment.unnamed_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment_only_vertex.default_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment.uniform_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment.unnamed_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment_only_vertex.uniform_block.float_array,Fail
+dEQP-GLES31.functional.tessellation.state_query.referenced_by_tess_control_shader,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment.unnamed_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment.unnamed_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment_only_vertex.default_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment.block_array.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment_only_vertex.unnamed_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment.default_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment.unnamed_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_tess_geo_fragment_only_vertex.block_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment.default_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment.default_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment.uniform_block.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment_only_vertex.block_array.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_geo_fragment_only_vertex.unnamed_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment.block_array.float_struct,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment.uniform_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_fragment_only_vertex.uniform_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment.default_block.float_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment_only_vertex.block_array.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.vertex_tess_geo_fragment_only_vertex.unnamed_block.float,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_geo_fragment_only_vertex.named_block,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_tess_fragment.block_array,Fail
+dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.vertex_tess_fragment_only_vertex.named_block,Fail
diff --git a/src/amd/ci/radeonsi-stoney-flakes.txt b/src/amd/ci/radeonsi-stoney-flakes.txt
index 691ee7f87bf..828f92bb2f6 100644
--- a/src/amd/ci/radeonsi-stoney-flakes.txt
+++ b/src/amd/ci/radeonsi-stoney-flakes.txt
@@ -20,3 +20,8 @@ dEQP-GLES3.functional.occlusion_query.scissor_depth_write_stencil_write_stencil_
 glx@glx-multithread-texture
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount-multithread
 
+dEQP-GLES3.functional.occlusion_query.depth_clear_stencil_write_stencil_clear
+dEQP-GLES3.functional.occlusion_query.conservative_scissor_depth_write_stencil_write
+dEQP-GLES3.functional.occlusion_query.depth_write
+dEQP-GLES3.functional.occlusion_query.depth_write_depth_clear_stencil_write_stencil_clear
+dEQP-GLES3.functional.occlusion_query.scissor_stencil_write_stencil_clear
diff --git a/src/amd/ci/traces-amd.yml b/src/amd/ci/traces-amd.yml
index 5bb4ea4290f..b87841d18a9 100644
--- a/src/amd/ci/traces-amd.yml
+++ b/src/amd/ci/traces-amd.yml
@@ -26,7 +26,7 @@ traces:
       checksum: ef3653f50d4853d3e9cb3244c799565a
   0ad/0ad-v2.trace:
     gl-radeonsi-stoney:
-      checksum: 8d71757cb74f8d71bf87c8af7e7f725a
+      checksum: 9755e09853beefa3c901a00972cc8b67
   pathfinder/demo-v2.trace:
     gl-radeonsi-stoney:
       checksum: c81c85f9b247dd1b06c3dd5b669cc283
@@ -52,13 +52,13 @@ traces:
       checksum: 0e7441a7f2c86c75eeac72269786e7a1
   gputest/gimark-v2.trace:
     gl-radeonsi-stoney:
-      checksum: f2aee98f2b8813ad60d98cf241e42114
+      checksum: 942a9334e5e830cdfb950a72d77c48f5
   gputest/pixmark-julia-fp32-v2.trace:
     gl-radeonsi-stoney:
-      checksum: b5e0ae5ad680d884432f89a923f3e70d
+      checksum: 832d5f8268e953d6aa754c0aaf4b65d3
   gputest/pixmark-julia-fp64-v2.trace:
     gl-radeonsi-stoney:
-      checksum: b181b0a910f5ae5b161df70f834c3d5f
+      checksum: 38d31c579d9d1cca6a7a47035d19f194
   gputest/pixmark-volplosion-v2.trace:
     gl-radeonsi-stoney:
       checksum: c8321043b7c05156b71f9837b54e7b50
@@ -94,7 +94,7 @@ traces:
       checksum: 491d0572ab0bcbcbc9827521597b3787
   humus/VolumetricFogging2-v2.trace:
     gl-radeonsi-stoney:
-      checksum: b85d66d9c773fdc550e7d3038ccd71e6
+      checksum: 4c36bc32bc4512773533bbbea078f65b
   supertuxkart/supertuxkart-antediluvian-abyss.rdc:
     gl-radeonsi-stoney:
       checksum: 6b2e8d20d2774ece96c999ef01533695