diff --git a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv
index 1ae7508cd1e..b2ec9a51d3d 100644
--- a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv
+++ b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv
@@ -9,19 +9,6 @@ glx@glx_ext_import_context@*
 # Random: ../src/util/hash_table.c:311: hash_table_search: Assertion `!key_pointer_is_reserved(ht, key)' failed.
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount-multithread
 
-# Random
-# Mostly reported by "Some new flakes found:" and most of them never appear in the failures
-KHR-GL46.geometry_shader.primitive_counter.triangles_to_line_strip_rp
-
-KHR-GLES31.core.geometry_shader.primitive_counter.lines_to_line_strip
-KHR-GLES31.core.geometry_shader.primitive_counter.lines_to_line_strip_rp
-KHR-GLES31.core.geometry_shader.primitive_counter.points_to_line_strip
-KHR-GLES31.core.geometry_shader.primitive_counter.triangles_to_line_strip
-KHR-GLES32.core.geometry_shader.primitive_counter.lines_to_line_strip
-KHR-GLES32.core.geometry_shader.primitive_counter.lines_to_line_strip_rp
-KHR-GLES32.core.geometry_shader.primitive_counter.points_to_line_strip
-KHR-GLES32.core.geometry_shader.primitive_counter.triangles_to_line_strip
-
 dEQP-GLES3.functional.flush_finish.wait
 
 dEQP-GLES2.functional.fragment_ops.random.0
diff --git a/src/gallium/drivers/zink/ci/zink-radv-gfx1201-flakes.txt b/src/gallium/drivers/zink/ci/zink-radv-gfx1201-flakes.txt
index c5208fdf045..1cf94a82edf 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-gfx1201-flakes.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-gfx1201-flakes.txt
@@ -2,15 +2,6 @@ KHR-GL46.explicit_uniform_location.subroutine-index
 KHR-GL46.explicit_uniform_location.uniform-loc-implicit-in-some-stages3
 KHR-GL46.explicit_uniform_location.uniform-loc-mix-with-implicit-max-array
 KHR-GL46.explicit_uniform_location.uniform-loc-types-mix
-KHR-GL46.geometry_shader.primitive_counter.lines_to_line_strip
-KHR-GL46.geometry_shader.primitive_counter.lines_to_line_strip_rp
-KHR-GL46.geometry_shader.primitive_counter.lines_to_triangle_strip
-KHR-GL46.geometry_shader.primitive_counter.points_to_line_strip
-KHR-GL46.geometry_shader.primitive_counter.points_to_line_strip_rp
-KHR-GL46.geometry_shader.primitive_counter.points_to_triangle_strip
-KHR-GL46.geometry_shader.primitive_counter.triangles_to_line_strip
-KHR-GL46.geometry_shader.primitive_counter.triangles_to_line_strip_rp
-KHR-GL46.geometry_shader.primitive_counter.triangles_to_triangle_strip
 KHR-GL46.gl_spirv.spirv_glsl_to_spirv_specialization_constants_test
 KHR-GL46.layout_binding.atomic_uint_layout_binding_atomic_ComputeShader
 KHR-GL46.layout_binding.sampler2D_layout_binding_texture_ComputeShader
diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi31-flakes.txt b/src/gallium/drivers/zink/ci/zink-radv-navi31-flakes.txt
index 6a1bbe7ba18..852d0be8279 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-navi31-flakes.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-navi31-flakes.txt
@@ -3,15 +3,6 @@ KHR-GL46.explicit_uniform_location.subroutine-index
 KHR-GL46.explicit_uniform_location.uniform-loc-implicit-in-some-stages3
 KHR-GL46.explicit_uniform_location.uniform-loc-mix-with-implicit-max-array
 KHR-GL46.explicit_uniform_location.uniform-loc-types-mix
-KHR-GL46.geometry_shader.primitive_counter.lines_to_line_strip
-KHR-GL46.geometry_shader.primitive_counter.lines_to_line_strip_rp
-KHR-GL46.geometry_shader.primitive_counter.lines_to_triangle_strip
-KHR-GL46.geometry_shader.primitive_counter.points_to_line_strip
-KHR-GL46.geometry_shader.primitive_counter.points_to_line_strip_rp
-KHR-GL46.geometry_shader.primitive_counter.points_to_triangle_strip
-KHR-GL46.geometry_shader.primitive_counter.triangles_to_line_strip
-KHR-GL46.geometry_shader.primitive_counter.triangles_to_line_strip_rp
-KHR-GL46.geometry_shader.primitive_counter.triangles_to_triangle_strip
 KHR-GL46.gl_spirv.spirv_glsl_to_spirv_specialization_constants_test
 KHR-GL46.layout_binding.atomic_uint_layout_binding_atomic_ComputeShader
 KHR-GL46.layout_binding.sampler2D_layout_binding_texture_ComputeShader