diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt
index 262af0a3100..1ecb204f8ce 100644
--- a/src/freedreno/ci/freedreno-a618-fails.txt
+++ b/src/freedreno/ci/freedreno-a618-fails.txt
@@ -303,6 +303,15 @@ spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_TESS_CONTROL_SHADE
 spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_TESS_EVALUATION_SHADER_INVOCATIONS,Fail
 spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,Fail
 
+spec@arb_gpu_shader5@arb_gpu_shader5-interpolateatsample-dynamically-nonuniform,Fail
+spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams,Fail
+spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams-without-invocations,Fail
+spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams@arb_gpu_shader5-xfb-streams,Fail
+spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams@arb_gpu_shader5-xfb-streams-blocks,Fail
+spec@arb_gpu_shader_fp64@execution@built-in-functions@fs-op-div-dmat4-dmat4,Fail
+spec@glsl-4.00@execution@built-in-functions@fs-inverse-dmat4,Fail
+spec@glsl-4.00@execution@built-in-functions@fs-op-div-dmat4-dmat4,Fail
+
 # skqp failure:
 # SRGBReadWritePixels FAILED (7 errors)
 # ../../tests/SRGBReadWritePixelsTest.cpp:214	Could not create sRGB surface context. [OpenGL]
@@ -314,6 +323,9 @@ nobin-dEQP-VK.transform_feedback.simple.lines_or_triangles_triangle_strip_3,Fail
 spec@arb_vertex_attrib_64bit@execution@unused-sub-dvec4-01,Crash
 spec@arb_vertex_attrib_64bit@execution@unused-sub-dvec4-02,Crash
 
+spec@arb_gpu_shader_fp64@execution@built-in-functions@fs-inverse-dmat4,Fail
+spec@glsl-4.00@execution@built-in-functions@fs-op-div-double-dmat4,Fail
+
 # After switch from 6.3.1 to 6.3.13
 gmem-dEQP-VK.binding_model.descriptor_buffer.basic.limits,Fail
 
diff --git a/src/freedreno/ci/freedreno-a618-skips.txt b/src/freedreno/ci/freedreno-a618-skips.txt
index 8f06859d624..1c4691e898b 100644
--- a/src/freedreno/ci/freedreno-a618-skips.txt
+++ b/src/freedreno/ci/freedreno-a618-skips.txt
@@ -32,12 +32,6 @@ spec@ext_texture_array@fbo-depth-array stencil-draw
 spec@ext_transform_feedback@max-varyings
 spec@!opengl 1.0@gl-1.0-blend-func
 
-# Skip over a bunch of extensions since we don't have extension fast skipping yet.
-spec@glsl-4.*
-spec@arb_gpu_shader5.*
-spec@arb_gpu_shader_fp64.*
-spec@arb_gpu_shader_int64.*
-
 # TC Timeouts
 spec@arb_sync@clientwaitsync-timeout
 spec@arb_texture_buffer_object@bufferstorage
diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt
index 5d63c7d08a3..5b4eb9f6760 100644
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -315,6 +315,16 @@ spec@!opengl 1.1@line-smooth-stipple,Fail
 spec@arb_vertex_attrib_64bit@execution@unused-sub-dvec4-01,Crash
 spec@arb_vertex_attrib_64bit@execution@unused-sub-dvec4-02,Crash
 
+spec@arb_gpu_shader5@arb_gpu_shader5-interpolateatsample-dynamically-nonuniform,Fail
+spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams,Fail
+spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams-without-invocations,Fail
+spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams@arb_gpu_shader5-xfb-streams,Fail
+spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams@arb_gpu_shader5-xfb-streams-blocks,Fail
+spec@arb_gpu_shader_fp64@execution@arb_gpu_shader_fp64-gs-getuniformdv,Crash
+spec@arb_gpu_shader_fp64@execution@arb_gpu_shader_fp64-wrong-type-setter,Crash
+spec@arb_gpu_shader_fp64@execution@built-in-functions@fs-inverse-dmat4,Fail
+spec@glsl-4.00@execution@built-in-functions@fs-op-div-double-dmat4,Fail
+
 dynamic-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.compatibility_depth_zero_stencil_zero_testing_stencil,Fail
 
 dEQP-VK.binding_model.descriptor_buffer.basic.limits,Fail
diff --git a/src/freedreno/ci/freedreno-a630-skips.txt b/src/freedreno/ci/freedreno-a630-skips.txt
index f837c1b9156..d0c5c114577 100644
--- a/src/freedreno/ci/freedreno-a630-skips.txt
+++ b/src/freedreno/ci/freedreno-a630-skips.txt
@@ -48,12 +48,6 @@ spec@!opengl 1.0@gl-1.0-blend-func
 spec@ext_framebuffer_blit@fbo-blit-check-limits
 spec@egl 1.4@egl-copy-buffers
 
-# Skip over a bunch of extensions since we don't have extension fast skipping yet.
-spec@glsl-4.*
-spec@arb_gpu_shader5.*
-spec@arb_gpu_shader_fp64.*
-spec@arb_gpu_shader_int64.*
-
 # TC Timeouts
 spec@arb_sync@clientwaitsync-timeout
 spec@arb_texture_buffer_object@bufferstorage