diff --git a/src/panfrost/ci/panfrost-g610-fails.txt b/src/panfrost/ci/panfrost-g610-fails.txt
index 272edc16918..6ff2a24b1d3 100644
--- a/src/panfrost/ci/panfrost-g610-fails.txt
+++ b/src/panfrost/ci/panfrost-g610-fails.txt
@@ -1007,73 +1007,11 @@ dEQP-VK.dynamic_rendering.primary_cmd_buff.suballocation.multisample_resolve.r8g
 dEQP-VK.dynamic_rendering.primary_cmd_buff.suballocation.multisample_resolve.r8g8b8a8_unorm.samples_4_resolve_level_3,Fail
 dEQP-VK.dynamic_rendering.primary_cmd_buff.suballocation.multisample_resolve.r8g8b8a8_unorm.samples_4_resolve_level_4,Fail
 
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.ivec2.as_int_int,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.ivec4.as_int_int_int_int,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.ivec4.as_int_int_ivec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.ivec4.as_int_ivec2_int,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.ivec4.as_int_ivec3,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.ivec4.as_ivec2_int_int,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.ivec4.as_ivec2_ivec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.two_vec4.array_writes.as_float-2_float-2_float-2_float-2_float-2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.two_vec4.array_writes.as_float_float-2_vec2-2_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.two_vec4.array_writes.as_float_vec3-2_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.two_vec4.array_writes.as_vec2-2_vec2_vec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.two_vec4.array_writes.as_vec2_vec2-2_vec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.two_vec4.array_writes.as_vec3-2_float_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.vec2.as_float_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.vec3.as_float_float_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.vec3.as_float_vec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.vec3.as_vec2_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.vec4.as_float_float_float_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.vec4.as_float_float_vec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.vec4.as_float_vec2_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.vec4.as_float_vec3,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.vec4.as_vec2_float_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.vec4.as_vec2_vec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.vec4.as_vec3_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.ivec2.as_int_int,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.ivec2.as_int_int_unused,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.ivec4.as_int_int_int_int,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.ivec4.as_int_int_ivec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.ivec4.as_int_ivec2_int,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.ivec4.as_int_ivec3,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.ivec4.as_ivec2_int_int,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.ivec4.as_ivec2_ivec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.ivec4.as_ivec3_int,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec2.as_float_float_unused,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec3.as_float_float_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec3.as_float_float_float_unused,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec3.as_float_vec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec3.as_float_vec2_unused,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec3.as_vec2_float_unused,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec4.as_float_float_float_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec4.as_float_float_vec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec4.as_vec2_float_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec4.as_vec2_vec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec4.as_vec3_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.ivec2.as_int_int,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.ivec4.as_int_int_ivec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.ivec4.as_int_ivec2_int,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.ivec4.as_int_ivec3,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.ivec4.as_ivec2_ivec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.vec2.as_float_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.vec3.as_float_float_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.vec3.as_float_vec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.vec3.as_vec2_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.vec4.as_float_float_float_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.vec4.as_float_float_vec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.vec4.as_float_vec2_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.vec4.as_vec2_float_float,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.vec4.as_vec2_vec2,Fail
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.vec4.as_vec3_float,Fail
-
 dEQP-VK.glsl.limits.near_max.fragment_input.components_123,Fail
 dEQP-VK.glsl.limits.near_max.fragment_input.components_124,Fail
 
 dEQP-VK.info.device_mandatory_features,Fail
 
-dEQP-VK.image.sample_cubemap.write_face_0,Fail
-
 dEQP-VK.memory.pipeline_barrier.host_write_storage_texel_buffer.1024,Fail
 dEQP-VK.memory.pipeline_barrier.host_write_storage_texel_buffer.65536,Fail
 dEQP-VK.memory.pipeline_barrier.host_write_storage_texel_buffer.8192,Fail
diff --git a/src/panfrost/ci/panfrost-g610-flakes.txt b/src/panfrost/ci/panfrost-g610-flakes.txt
index 9952ce4a79c..4b099521199 100644
--- a/src/panfrost/ci/panfrost-g610-flakes.txt
+++ b/src/panfrost/ci/panfrost-g610-flakes.txt
@@ -23,19 +23,6 @@ dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.vertex_attribute_divisor.ext.sta
 
 dEQP-VK.dynamic_rendering.graphics_pipeline_library.dedicated_allocation.formats.r16g16b16a16_uint.input.dont_care.store.self_dep_draw
 
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.ivec4.as_ivec3_int
-dEQP-VK.glsl.440.linkage.varying.component.frag_out.vec4.as_vec3_float
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec2.as_float_float
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec3.as_vec2_float
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec4.as_float_vec2_float
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec4.as_float_vec3
-dEQP-VK.glsl.440.linkage.varying.component.vert_in.vec4.as_vec2_vec2
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.ivec4.as_int_int_int_int
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.ivec4.as_ivec2_int_int
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.ivec4.as_ivec3_int
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.vec4.as_float_float_float_float
-dEQP-VK.glsl.440.linkage.varying.component.vert_out_frag_in.vec4.as_float_vec3
-
 dEQP-VK.glsl.arrays.declaration.implicit_size_float_vec3_fragment
 
 dEQP-VK.glsl.conversions.matrix_combine.bool_float_int_bool_float_int_to_mat2x3_fragment