diff --git a/src/panfrost/ci/panfrost-g610-fails.txt b/src/panfrost/ci/panfrost-g610-fails.txt
index e4579e67684..8b4ae43692b 100644
--- a/src/panfrost/ci/panfrost-g610-fails.txt
+++ b/src/panfrost/ci/panfrost-g610-fails.txt
@@ -366,24 +366,6 @@ dEQP-VK.pipeline.fast_linked_library.multisample.alpha_to_coverage_unused_attach
 
 dEQP-VK.glsl.loops.special.do_while_dynamic_iterations.dowhile_trap_vertex,Crash
 
-dEQP-VK.ssbo.phys.layout.3_level_array.std140.row_major_mat4,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_array.std140.row_major_mat4_comp_access,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_array.std140.row_major_mat4_comp_access_store_cols,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_array.std140.row_major_mat4_store_cols,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_array.std430.row_major_mat4,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_array.std430.row_major_mat4_comp_access,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_array.std430.row_major_mat4_comp_access_store_cols,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_array.std430.row_major_mat4_store_cols,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_unsized_array.std140.row_major_mat4,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_unsized_array.std140.row_major_mat4_comp_access,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_unsized_array.std140.row_major_mat4_comp_access_store_cols,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_unsized_array.std140.row_major_mat4_store_cols,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_unsized_array.std430.row_major_mat4,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_unsized_array.std430.row_major_mat4_comp_access,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_unsized_array.std430.row_major_mat4_comp_access_store_cols,Timeout
-dEQP-VK.ssbo.phys.layout.3_level_unsized_array.std430.row_major_mat4_store_cols,Timeout
-dEQP-VK.ssbo.phys.layout.random.8bit.nested_structs_arrays_instance_arrays.12,Timeout
-
 dEQP-VK.rasterization.discard.point_list.query_pipeline_false,Crash
 dEQP-VK.rasterization.rasterization_order_attachment_access.depth.samples_1.multi_draw_barriers,Crash
 
diff --git a/src/panfrost/ci/panfrost-g610-skip.txt b/src/panfrost/ci/panfrost-g610-skips.txt
similarity index 99%
rename from src/panfrost/ci/panfrost-g610-skip.txt
rename to src/panfrost/ci/panfrost-g610-skips.txt
index 9a665607bf0..8e1ca9e1b7a 100644
--- a/src/panfrost/ci/panfrost-g610-skip.txt
+++ b/src/panfrost/ci/panfrost-g610-skips.txt
@@ -114,6 +114,7 @@ dEQP-VK.ssbo.phys.layout.basic_unsized_array.std430.row_major_mat4
 dEQP-VK.ssbo.phys.layout.basic_unsized_array.std430.row_major_mat4_comp_access
 dEQP-VK.ssbo.phys.layout.basic_unsized_array.std430.row_major_mat4_comp_access_store_cols
 dEQP-VK.ssbo.phys.layout.basic_unsized_array.std430.row_major_mat4_store_cols
+dEQP-VK.ssbo.phys.layout.random.8bit.nested_structs_arrays_instance_arrays.12
 dEQP-VK.ssbo.phys.layout.random.all_per_block_buffers.22
 dEQP-VK.ssbo.phys.layout.random.all_per_block_buffers.22
 dEQP-VK.ssbo.phys.layout.random.all_shared_buffer.3