diff --git a/src/etnaviv/ci/etnaviv-gc2000-r5108-fails.txt b/src/etnaviv/ci/etnaviv-gc2000-r5108-fails.txt
index f1220771762..75350dcb8da 100644
--- a/src/etnaviv/ci/etnaviv-gc2000-r5108-fails.txt
+++ b/src/etnaviv/ci/etnaviv-gc2000-r5108-fails.txt
@@ -121,15 +121,9 @@ dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear
 dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_nearest_linear_clamp,Fail
 dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_nearest_linear_mirror,Fail
 dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_nearest_linear_repeat,Fail
-fast_color_clear@fcc-read-after-clear blit tex,Fail
-fast_color_clear@fcc-read-after-clear copy rb,Fail
-fast_color_clear@fcc-read-after-clear copy tex,Fail
 
 shaders@glsl-fs-pointcoord,Fail
 
-# segfault
-shaders@glsl-kwin-blur-1,Crash
-
 shaders@glsl-uniform-interstage-limits@subdivide 5- statechanges,Timeout
 shaders@glsl-uniform-interstage-limits@subdivide 5,Timeout
 
@@ -263,8 +257,6 @@ spec@ext_direct_state_access@textures,Crash
 
 spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail
 
-spec@ext_framebuffer_object@fbo-copyteximage,Fail
-spec@ext_framebuffer_object@fbo-copyteximage-simple,Fail
 spec@ext_framebuffer_object@fbo-cubemap,Fail
 spec@ext_framebuffer_object@fbo-readpixels,Fail
 spec@ext_framebuffer_object@fbo-stencil-gl_stencil_index16-blit,Fail
@@ -414,8 +406,6 @@ spec@khr_texture_compression_astc@miptree-gles srgb-fp,Fail
 spec@khr_texture_compression_astc@miptree-gl srgb-fp,Fail
 spec@khr_texture_compression_astc@miptree-gl srgb-fp@sRGB decode full precision,Fail
 spec@nv_conditional_render@copypixels,Fail
-spec@nv_conditional_render@copyteximage,Fail
-spec@nv_conditional_render@copytexsubimage,Fail
 spec@nv_conditional_render@dlist,Fail
 spec@nv_conditional_render@drawpixels,Fail
 spec@nv_conditional_render@vertex_array,Fail
@@ -560,7 +550,6 @@ spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA4- swizzled- border
 spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA8- swizzled- border color only,Fail
 spec@!opengl 1.1@two-sided-lighting,Fail
 spec@!opengl 1.1@user-clip,Fail
-spec@!opengl 1.2@copyteximage 3d,Fail
 spec@!opengl 1.2@lodclamp-between-max,Fail
 spec@!opengl 1.2@texwrap 3d bordercolor,Fail
 spec@!opengl 1.2@texwrap 3d bordercolor@GL_RGBA8- border color only,Fail
@@ -657,18 +646,3 @@ spec@glsl-1.10@execution@variable-indexing@fs-input-array-vec4-index-rd,Fail
 
 # uprev Piglit in Mesa
 spec@!opengl 1.1@push-pop-color-material,Fail
-spec@arb_depth_texture@fbo-clear-formats,Fail
-spec@arb_depth_texture@fbo-clear-formats@GL_DEPTH_COMPONENT,Fail
-spec@arb_depth_texture@fbo-clear-formats@GL_DEPTH_COMPONENT16,Fail
-spec@arb_depth_texture@fbo-clear-formats@GL_DEPTH_COMPONENT24,Fail
-spec@arb_depth_texture@fbo-clear-formats@GL_DEPTH_COMPONENT32,Fail
-spec@arb_framebuffer_object@fbo-mipmap-copypix,Fail
-spec@ext_framebuffer_multisample@clip-and-scissor-blit 2 normal,Fail
-spec@ext_framebuffer_multisample@clip-and-scissor-blit 4 normal,Fail
-spec@sgis_generate_mipmap@gen-teximage,Fail
-
-# New failures with ES CTS 3.2.12.0
-dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.2d_rgb,Fail
-dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.2d_rgba,Fail
-dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.cube_rgb,Fail
-dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.cube_rgba,Fail
diff --git a/src/etnaviv/ci/etnaviv-gc2000-r5108-flakes.txt b/src/etnaviv/ci/etnaviv-gc2000-r5108-flakes.txt
index 2db0e53dbdf..cbd98f0cde7 100644
--- a/src/etnaviv/ci/etnaviv-gc2000-r5108-flakes.txt
+++ b/src/etnaviv/ci/etnaviv-gc2000-r5108-flakes.txt
@@ -215,13 +215,6 @@ dEQP-GLES2.functional.shaders.random.texture.fragment.43
 dEQP-GLES2.functional.shaders.random.texture.vertex.19
 dEQP-GLES2.functional.shaders.random.texture.vertex.23
 dEQP-GLES2.functional.texture.format.l8_cube_pot
-fast_color_clear@fcc-read-after-clear blit rb
-spec@arb_clear_texture@arb_clear_texture-3d
-spec@arb_clear_texture@arb_clear_texture-base-formats
-spec@arb_clear_texture@arb_clear_texture-simple
-spec@arb_framebuffer_object@fbo-deriv
-spec@arb_framebuffer_object@fbo-drawbuffers-none glblitframebuffer
-spec@arb_texture_rectangle@tex-miplevel-selection gl2:textureproj 2drectshadow
 spec@ati_fragment_shader@ati_fragment_shader-error04-endshader
 spec@ext_framebuffer_object@fbo-alphatest-nocolor
 spec@ext_texture_compression_s3tc@compressedteximage gl_compressed_rgba_s3tc_dxt1_ext