diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt
index 3b80daa68e0..7621ee38a10 100644
--- a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt
+++ b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt
@@ -12,3 +12,8 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_x,Fa
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y,Fail
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x,Fail
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_y,Fail
+
+dEQP-GLES31.functional.shaders.framebuffer_fetch.framebuffer_format.rgb10_a2,Fail
+dEQP-GLES31.functional.draw_base_vertex.draw_elements_instanced_base_vertex.builtin_variable.vertex_id,Fail
+dEQP-GLES31.functional.draw_base_vertex.draw_range_elements_base_vertex.builtin_variable.vertex_id,Fail
+dEQP-GLES31.functional.draw_base_vertex.draw_elements_base_vertex.builtin_variable.vertex_id,Fail
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-skips.txt b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-skips.txt
index 978345eba28..e0feaa23d9c 100644
--- a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-skips.txt
+++ b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-skips.txt
@@ -9,65 +9,33 @@ dEQP-GLES[0-9]*.stress.*
 # These are really slow on tiling architectures (including llvmpipe).
 dEQP-GLES[0-9]*.functional.flush_finish.*
 
-# GLES 3.1 is not fully supported yet, some of these crash, some are slow, and
-# some are untested.
+# Skip slow tests to improve job duration
+dEQP-GLES31.functional.*mat[2-4].*
+.*3_level_array.*
+.*3_level_struct_array.*
+
+# GLES 3.1 is not fully supported yet, some of these crash, some hang, and some are untested.
 dEQP-GLES31.functional.android_extension_pack.*
-dEQP-GLES31.functional.blend_equation_advanced.*
 dEQP-GLES31.functional.copy_image.*
-dEQP-GLES31.functional.draw_base_vertex.*
 dEQP-GLES31.functional.draw_buffers_indexed.*
 dEQP-GLES31.functional.draw_indirect.*
 dEQP-GLES31.functional.fbo.*
 dEQP-GLES31.functional.geometry_shading.*
 dEQP-GLES31.functional.image_load_store.*
-dEQP-GLES31.functional.layout_binding.*
 dEQP-GLES31.functional.multisample.*
-dEQP-GLES31.functional.program_uniform.*
 dEQP-GLES31.functional.sample_shading.*
 dEQP-GLES31.functional.separate_shader.*
-dEQP-GLES31.functional.srgb_texture_decode.*
-dEQP-GLES31.functional.ssbo.*
-dEQP-GLES31.functional.state_query.*
-dEQP-GLES31.functional.stencil_texturing.*
 dEQP-GLES31.functional.synchronization.*
 dEQP-GLES31.functional.tessellation.*
 dEQP-GLES31.functional.tessellation_geometry_interaction.*
 dEQP-GLES31.functional.texture.*
-dEQP-GLES31.functional.ubo.*
-dEQP-GLES31.functional.vertex_attribute_binding.*
-dEQP-GLES31.functional.compute.indirect_dispatch.*
-dEQP-GLES31.functional.debug.async.*
-dEQP-GLES31.functional.debug.error_filters.*
-dEQP-GLES31.functional.debug.error_groups.*
-dEQP-GLES31.functional.debug.externally_generated.*
-dEQP-GLES31.functional.debug.object_labels.*
-dEQP-GLES31.functional.debug.state_query.*
-dEQP-GLES31.functional.shaders.arrays.*
-dEQP-GLES31.functional.shaders.arrays_of_arrays.*
-dEQP-GLES31.functional.shaders.framebuffer_fetch.*
 dEQP-GLES31.functional.shaders.multisample_interpolation.*
 dEQP-GLES31.functional.shaders.opaque_type_indexing.*
 dEQP-GLES31.functional.shaders.sample_variables.*
-dEQP-GLES31.functional.program_interface_query.uniform.array_size.*
-dEQP-GLES31.functional.program_interface_query.uniform.array_stride.*
-dEQP-GLES31.functional.program_interface_query.uniform.atomic_counter_buffer_index.*
-dEQP-GLES31.functional.program_interface_query.uniform.block_index.*
-dEQP-GLES31.functional.program_interface_query.uniform.location.*
-dEQP-GLES31.functional.program_interface_query.uniform.matrix_row_major.*
-dEQP-GLES31.functional.program_interface_query.uniform.matrix_stride.*
-dEQP-GLES31.functional.program_interface_query.uniform.name_length.*
-dEQP-GLES31.functional.program_interface_query.uniform.offset.*
-dEQP-GLES31.functional.program_interface_query.uniform.random.*
-dEQP-GLES31.functional.program_interface_query.uniform.resource_list.*
-dEQP-GLES31.functional.program_interface_query.uniform.type.*
-dEQP-GLES31.functional.program_interface_query.uniform_block.active_variables.*
-dEQP-GLES31.functional.program_interface_query.uniform_block.buffer_binding.*
-dEQP-GLES31.functional.program_interface_query.uniform_block.buffer_data_size.*
-dEQP-GLES31.functional.program_interface_query.uniform_block.name_length.*
-dEQP-GLES31.functional.program_interface_query.uniform_block.resource_list.*
 dEQP-GLES31.functional.shaders.builtin_constants.geometry_shader.*
 dEQP-GLES31.functional.shaders.builtin_constants.sample_variables.*
 dEQP-GLES31.functional.shaders.builtin_constants.tessellation_shader.*
 dEQP-GLES31.functional.shaders.builtin_functions.*
-dEQP-GLES31.functional.debug.negative_coverage.*
-dEQP-GLES31.functional.*mat[2-4].*
+
+# Skip some GLES 3.2 tests that are part of dEQP-GLES31
+dEQP-GLES31.*es32.*