diff --git a/src/etnaviv/ci/etnaviv-gc7000-r6214-flakes.txt b/src/etnaviv/ci/etnaviv-gc7000-r6214-flakes.txt
index 3b5f2677084..7e8a31c4ae4 100644
--- a/src/etnaviv/ci/etnaviv-gc7000-r6214-flakes.txt
+++ b/src/etnaviv/ci/etnaviv-gc7000-r6214-flakes.txt
@@ -1,233 +1,12 @@
-dEQP-GLES2.functional.buffer.write.random.4
-dEQP-GLES2.functional.buffer.write.recreate_store.random_3
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_constant_color_one
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_one_minus_src_alpha_one_minus_dst_color
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_one_minus_src_color_src_alpha
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_zero_src_color
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_constant_alpha_one_minus_constant_color
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_dst_color_src_alpha
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_one_minus_dst_color_one
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_constant_color_src_color
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.dst.dst_color_dst_alpha
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.dst.one_minus_constant_alpha_one_minus_src_alpha
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.dst.src_color_dst_alpha
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.dst.src_color_src_color
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.constant_alpha_src_alpha
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.one_minus_constant_color_constant_alpha
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.one_minus_dst_alpha_one_minus_dst_color
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.one_minus_src_color_dst_alpha
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.one_src_alpha_saturate
-dEQP-GLES2.functional.fragment_ops.depth_stencil.random.14
-dEQP-GLES2.functional.fragment_ops.depth_stencil.random.15
-dEQP-GLES2.functional.fragment_ops.depth_stencil.random.18
-dEQP-GLES2.functional.fragment_ops.depth_stencil.stencil_depth_funcs.no_stencil_depth_gequal
-dEQP-GLES2.functional.fragment_ops.depth_stencil.stencil_depth_funcs.stencil_less_no_depth
-dEQP-GLES2.functional.fragment_ops.depth_stencil.write_mask.depth
-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.0
-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.25
-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.42
-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.47
-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.75
-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.9
-dEQP-GLES2.functional.fragment_ops.random.24
-dEQP-GLES2.functional.fragment_ops.random.52
-dEQP-GLES2.functional.fragment_ops.random.86
-dEQP-GLES2.functional.fragment_ops.random.92
-dEQP-GLES2.functional.rasterization.culling.back_triangle_strip
-dEQP-GLES2.functional.shaders.constant_expressions.builtin_functions.geometric.reflect_float_vertex
-dEQP-GLES2.functional.shaders.constant_expressions.builtin_functions.vector_relational.greaterThan_ivec4_fragment
-dEQP-GLES2.functional.shaders.constants.float_1_fragment
-dEQP-GLES2.functional.shaders.conversions.matrix_combine.bool_bool_bool_bool_to_mat2_fragment
-dEQP-GLES2.functional.shaders.conversions.vector_combine.bool_float_int_to_bvec3_vertex
-dEQP-GLES2.functional.shaders.conversions.vector_combine.int_ivec2_int_to_vec4_vertex
-dEQP-GLES2.functional.shaders.conversions.vector_to_scalar.vec3_to_float_fragment
-dEQP-GLES2.functional.shaders.functions.datatypes.int_int_fragment
-dEQP-GLES2.functional.shaders.indexing.tmp_array.float_dynamic_loop_write_dynamic_read_fragment
-dEQP-GLES2.functional.shaders.indexing.varying_array.vec3_dynamic_write_dynamic_loop_read
-dEQP-GLES2.functional.shaders.indexing.vector_subscript.vec2_dynamic_subscript_write_dynamic_subscript_read_fragment
-dEQP-GLES2.functional.shaders.loops.do_while_dynamic_iterations.conditional_body_vertex
-dEQP-GLES2.functional.shaders.loops.for_constant_iterations.empty_body_fragment
-dEQP-GLES2.functional.shaders.loops.for_dynamic_iterations.unconditional_break_vertex
-dEQP-GLES2.functional.shaders.loops.while_constant_iterations.nested_tricky_dataflow_2_vertex
-dEQP-GLES2.functional.shaders.loops.while_dynamic_iterations.pre_increment_fragment
-dEQP-GLES2.functional.shaders.matrix.div.const_mediump_mat3_mat3_vertex
-dEQP-GLES2.functional.shaders.matrix.mul.const_highp_mat4_mat4_fragment
-dEQP-GLES2.functional.shaders.matrix.mul.const_mediump_mat2_float_fragment
-dEQP-GLES2.functional.shaders.matrix.mul.uniform_mediump_mat3_vec3_fragment
-dEQP-GLES2.functional.shaders.matrix.pre_increment.dynamic_mediump_mat4_vertex
-dEQP-GLES2.functional.shaders.operator.binary_operator.add_assign_effect.lowp_ivec3_int_fragment
-dEQP-GLES2.functional.shaders.operator.binary_operator.add_assign_effect.lowp_vec3_fragment
-dEQP-GLES2.functional.shaders.operator.binary_operator.div.mediump_vec4_float_fragment
-dEQP-GLES2.functional.shaders.operator.binary_operator.mul_assign_result.highp_int_fragment
-dEQP-GLES2.functional.shaders.operator.binary_operator.mul.mediump_ivec3_vertex
-dEQP-GLES2.functional.shaders.operator.binary_operator.sub_assign_result.highp_vec2_float_fragment
-dEQP-GLES2.functional.shaders.operator.binary_operator.sub_assign_result.lowp_vec3_float_fragment
-dEQP-GLES2.functional.shaders.operator.common_functions.min.mediump_vec2_float_fragment
-dEQP-GLES2.functional.shaders.operator.common_functions.mod.mediump_vec4_float_fragment
-dEQP-GLES2.functional.shaders.operator.float_compare.lessThan.lowp_vec2_vertex
-dEQP-GLES2.functional.shaders.operator.int_compare.equal.highp_ivec2_fragment
-dEQP-GLES2.functional.shaders.operator.int_compare.lessThanEqual.highp_ivec3_vertex
-dEQP-GLES2.functional.shaders.operator.sequence.side_effects.lowp_float_int_vertex
-dEQP-GLES2.functional.shaders.operator.unary_operator.plus.lowp_float_vertex
-dEQP-GLES2.functional.shaders.operator.unary_operator.post_decrement_result.lowp_int_vertex
-dEQP-GLES2.functional.shaders.operator.unary_operator.post_decrement_result.lowp_ivec3_fragment
-dEQP-GLES2.functional.shaders.operator.unary_operator.pre_increment_effect.mediump_ivec2_vertex
-dEQP-GLES2.functional.shaders.random.all_features.fragment.0
-dEQP-GLES2.functional.shaders.random.all_features.fragment.12
-dEQP-GLES2.functional.shaders.random.all_features.fragment.13
-dEQP-GLES2.functional.shaders.random.all_features.fragment.19
-dEQP-GLES2.functional.shaders.random.all_features.fragment.34
-dEQP-GLES2.functional.shaders.random.all_features.fragment.35
-dEQP-GLES2.functional.shaders.random.all_features.fragment.36
-dEQP-GLES2.functional.shaders.random.all_features.fragment.39
-dEQP-GLES2.functional.shaders.random.all_features.fragment.46
-dEQP-GLES2.functional.shaders.random.all_features.fragment.48
-dEQP-GLES2.functional.shaders.random.all_features.fragment.5
-dEQP-GLES2.functional.shaders.random.all_features.fragment.76
-dEQP-GLES2.functional.shaders.random.all_features.fragment.79
-dEQP-GLES2.functional.shaders.random.all_features.fragment.81
-dEQP-GLES2.functional.shaders.random.all_features.fragment.86
-dEQP-GLES2.functional.shaders.random.all_features.fragment.90
-dEQP-GLES2.functional.shaders.random.all_features.fragment.94
-dEQP-GLES2.functional.shaders.random.all_features.fragment.98
-dEQP-GLES2.functional.shaders.random.all_features.vertex.1
-dEQP-GLES2.functional.shaders.random.all_features.vertex.17
-dEQP-GLES2.functional.shaders.random.all_features.vertex.4
-dEQP-GLES2.functional.shaders.random.all_features.vertex.82
-dEQP-GLES2.functional.shaders.random.all_features.vertex.9
-dEQP-GLES2.functional.shaders.random.all_features.vertex.95
-dEQP-GLES2.functional.shaders.random.all_features.vertex.98
-dEQP-GLES2.functional.shaders.random.conditionals.combined.58
-dEQP-GLES2.functional.shaders.random.conditionals.combined.59
-dEQP-GLES2.functional.shaders.random.conditionals.combined.7
-dEQP-GLES2.functional.shaders.random.conditionals.combined.83
-dEQP-GLES2.functional.shaders.random.conditionals.fragment.64
-dEQP-GLES2.functional.shaders.random.conditionals.fragment.80
-dEQP-GLES2.functional.shaders.random.conditionals.vertex.75
-dEQP-GLES2.functional.shaders.random.exponential.fragment.28
-dEQP-GLES2.functional.shaders.random.exponential.fragment.38
-dEQP-GLES2.functional.shaders.random.exponential.fragment.55
-dEQP-GLES2.functional.shaders.random.exponential.fragment.64
-dEQP-GLES2.functional.shaders.random.exponential.fragment.67
-dEQP-GLES2.functional.shaders.random.exponential.fragment.70
-dEQP-GLES2.functional.shaders.random.exponential.fragment.78
-dEQP-GLES2.functional.shaders.random.exponential.fragment.88
-dEQP-GLES2.functional.shaders.random.exponential.fragment.96
-dEQP-GLES2.functional.shaders.random.exponential.vertex.33
-dEQP-GLES2.functional.shaders.random.exponential.vertex.43
-dEQP-GLES2.functional.shaders.random.exponential.vertex.53
-dEQP-GLES2.functional.shaders.random.exponential.vertex.66
-dEQP-GLES2.functional.shaders.random.exponential.vertex.74
-dEQP-GLES2.functional.shaders.random.exponential.vertex.92
-dEQP-GLES2.functional.shaders.random.scalar_conversion.combined.1
-dEQP-GLES2.functional.shaders.random.scalar_conversion.combined.56
-dEQP-GLES2.functional.shaders.random.scalar_conversion.combined.72
-dEQP-GLES2.functional.shaders.random.texture.fragment.102
-dEQP-GLES2.functional.shaders.random.texture.fragment.115
-dEQP-GLES2.functional.shaders.random.texture.fragment.129
-dEQP-GLES2.functional.shaders.random.texture.fragment.40
-dEQP-GLES2.functional.shaders.random.texture.fragment.65
-dEQP-GLES2.functional.shaders.random.texture.fragment.66
-dEQP-GLES2.functional.shaders.random.texture.fragment.86
-dEQP-GLES2.functional.shaders.random.texture.fragment.96
-dEQP-GLES2.functional.shaders.random.texture.vertex.0
-dEQP-GLES2.functional.shaders.random.texture.vertex.17
-dEQP-GLES2.functional.shaders.random.texture.vertex.18
-dEQP-GLES2.functional.shaders.random.trigonometric.fragment.21
-dEQP-GLES2.functional.shaders.random.trigonometric.fragment.24
-dEQP-GLES2.functional.shaders.random.trigonometric.fragment.32
-dEQP-GLES2.functional.shaders.random.trigonometric.fragment.35
-dEQP-GLES2.functional.shaders.random.trigonometric.fragment.6
-dEQP-GLES2.functional.shaders.random.trigonometric.vertex.48
-dEQP-GLES2.functional.shaders.random.trigonometric.vertex.87
-dEQP-GLES2.functional.shaders.return.output_write_in_func_always_fragment
-dEQP-GLES2.functional.shaders.struct.local.nested_struct_array_dynamic_index_vertex
-dEQP-GLES2.functional.shaders.swizzles.vector_swizzles.mediump_vec2_r_fragment
-dEQP-GLES2.functional.shaders.swizzles.vector_swizzles.mediump_vec2_s_fragment
-dEQP-GLES2.functional.shaders.swizzles.vector_swizzles.mediump_vec3_bbbb_fragment
-dEQP-GLES2.functional.texture.filtering.2d.linear_linear_clamp_l8_pot
-dEQP-GLES2.functional.texture.filtering.2d.linear_linear_mirror_rgba8888_pot
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_repeat_l8
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_repeat_rgba4444
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_nearest_nearest_repeat_etc1
-dEQP-GLES2.functional.texture.filtering.2d.nearest_linear_repeat_rgba4444_pot
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_repeat_etc1
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_mirror_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_repeat_rgb888
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_nearest_linear_mirror_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_nearest_nearest_mirror_rgba8888
-dEQP-GLES2.functional.texture.filtering.cube.linear_linear_clamp_etc1
-dEQP-GLES2.functional.texture.filtering.cube.linear_linear_clamp_l8_npot
-dEQP-GLES2.functional.texture.filtering.cube.linear_linear_clamp_l8_pot
-dEQP-GLES2.functional.texture.filtering.cube.linear_linear_repeat_rgba8888_pot
-dEQP-GLES2.functional.texture.filtering.cube.linear_mipmap_linear_linear_mirror_rgba8888
-dEQP-GLES2.functional.texture.filtering.cube.linear_mipmap_nearest_nearest_repeat_rgba4444
-dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_repeat_l8_pot
-dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_repeat_rgb888_pot
-dEQP-GLES2.functional.texture.filtering.cube.nearest_linear_clamp_rgba8888_npot
-dEQP-GLES2.functional.texture.filtering.cube.nearest_mipmap_linear_nearest_repeat_rgba4444
-dEQP-GLES2.functional.texture.filtering.cube.nearest_mipmap_nearest_nearest_mirror_rgba8888
-dEQP-GLES2.functional.texture.filtering.cube.nearest_mipmap_nearest_nearest_repeat_rgba8888
-dEQP-GLES2.functional.texture.filtering.cube.nearest_nearest_clamp_etc1
-dEQP-GLES2.functional.texture.filtering.cube.nearest_nearest_clamp_l8_npot
-dEQP-GLES2.functional.texture.filtering.cube.nearest_nearest_clamp_rgba4444_npot
-dEQP-GLES2.functional.texture.filtering.cube.nearest_nearest_mirror_rgba4444_pot
-dEQP-GLES2.functional.texture.format.rgb565_2d_npot
-dEQP-GLES2.functional.texture.mipmap.2d.affine.nearest_linear_repeat
-dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_fastest
-dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_non_square_fastest
-dEQP-GLES2.functional.texture.mipmap.2d.generate.rgb888_nicest
-dEQP-GLES2.functional.texture.mipmap.2d.generate.rgb888_non_square_nicest
-dEQP-GLES2.functional.texture.mipmap.2d.generate.rgba5551_non_square_nicest
-dEQP-GLES2.functional.texture.mipmap.cube.generate.rgb565_fastest
-dEQP-GLES2.functional.texture.size.2d.2048x2048_l8_mipmap
-dEQP-GLES2.functional.texture.size.2d.2048x2048_rgba8888_mipmap
-dEQP-GLES2.functional.texture.size.2d.512x512_l8
-dEQP-GLES2.functional.texture.size.cube.15x15_rgb888
-dEQP-GLES2.functional.texture.size.cube.16x16_rgba4444
-dEQP-GLES2.functional.texture.size.cube.64x64_l8
-dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_luminance_alpha
-dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_rgb
-dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.cube_luminance_alpha
-dEQP-GLES2.functional.texture.specification.basic_teximage2d.a16f_cube
-dEQP-GLES2.functional.texture.specification.basic_teximage2d.la16f_cube
-dEQP-GLES2.functional.texture.specification.basic_teximage2d.la88_cube
-dEQP-GLES2.functional.texture.specification.basic_teximage2d.rgb16f_2d
-dEQP-GLES2.functional.texture.specification.basic_teximage2d.rgb16f_cube
-dEQP-GLES2.functional.texture.specification.basic_teximage2d.rgb888_2d
-dEQP-GLES2.functional.texture.specification.basic_teximage2d.rgb888_cube
-dEQP-GLES2.functional.texture.specification.basic_teximage2d.rgba4444_2d
-dEQP-GLES2.functional.texture.specification.basic_teximage2d.rgba4444_cube
-dEQP-GLES2.functional.texture.specification.basic_teximage2d.rgba5551_cube
-dEQP-GLES2.functional.texture.specification.basic_texsubimage2d.l16f_cube
-dEQP-GLES2.functional.texture.specification.basic_texsubimage2d.l8_cube
-dEQP-GLES2.functional.texture.specification.basic_texsubimage2d.la16f_cube
-dEQP-GLES2.functional.texture.specification.basic_texsubimage2d.rgb16f_cube
-dEQP-GLES2.functional.texture.specification.basic_texsubimage2d.rgb888_cube
-dEQP-GLES2.functional.texture.specification.basic_texsubimage2d.rgba5551_cube
+dEQP-GLES2.functional.color_clear.complex_rgb
+dEQP-GLES2.functional.color_clear.short_scissored_rgb
+dEQP-GLES2.functional.depth_stencil_clear.depth
+dEQP-GLES2.functional.shaders.matrix.mul.const_lowp_mat2_vec2_vertex
+dEQP-GLES2.functional.texture.specification.basic_teximage2d.a8_2
+dEQP-GLES2.functional.texture.specification.basic_teximage2d.l16f_cube
+dEQP-GLES2.functional.texture.specification.basic_texsubimage2d.a16f_cube
+dEQP-GLES2.functional.texture.specification.basic_texsubimage2d.rgb565_cube
 dEQP-GLES2.functional.texture.specification.random_teximage2d.cube_0
-dEQP-GLES2.functional.texture.specification.random_teximage2d.cube_2
+dEQP-GLES2.functional.texture.specification.random_teximage2d.cube_5
+dEQP-GLES2.functional.texture.specification.random_teximage2d.cube_5
 dEQP-GLES2.functional.texture.specification.random_teximage2d.cube_9
-dEQP-GLES2.functional.texture.specification.teximage2d_align.2d_rgba4444_51_4
-dEQP-GLES2.functional.texture.specification.texsubimage2d_align.2d_rgba8888_47_8
-dEQP-GLES2.functional.texture.specification.texsubimage2d_align.cube_l8_63_4
-dEQP-GLES2.functional.texture.specification.texsubimage2d_align.cube_rgba4444_51_2
-dEQP-GLES2.functional.texture.specification.texsubimage2d_empty_tex.rgba8888_2d
-dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_nearest_repeat
-dEQP-GLES2.functional.texture.vertex.2d.wrap.clamp_mirror
-dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_repeat
-dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_nearest_mirror
-dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_linear_repeat
-dEQP-GLES2.functional.texture.vertex.cube.wrap.repeat_mirror
-dEQP-GLES2.functional.uniform_api.random.79
-dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.array_in_struct.int_ivec4_vertex
-dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.struct_in_array.sampler2D_samplerCube_vertex
-dEQP-GLES2.functional.vertex_arrays.multiple_attributes.input_types.3_unsigned_short2_vec2_fixed2_vec2_unsigned_short2_vec2
-dEQP-GLES2.functional.vertex_arrays.multiple_attributes.input_types.3_unsigned_short2_vec2_short2_vec2_unsigned_byte2_vec2
-dEQP-GLES2.functional.vertex_arrays.multiple_attributes.stride.3_float2_32_float2_32_float2_32
-dEQP-GLES2.functional.vertex_arrays.multiple_attributes.stride.3_float2_8_float2_0_float2_0
-dEQP-GLES2.functional.vertex_arrays.single_attribute.output_types.user_ptr_0_0_float3_vec3_dynamic_draw_quads_256
-
-# Nightly run expectations update
-dEQP-GLES2.functional.texture.specification.random_teximage2d.cube_4
-