diff --git a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv
index 7ecd488cc7b..078a9b08946 100644
--- a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv
+++ b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv
@@ -6,15 +6,12 @@ glx@glx_arb_sync_control@timing -divisor 2,Fail
 glx@glx-make-current,Fail
 glx@glx-multi-window-single-context,Fail
 glx@glx-swap-event_interval,Fail
-glx@glx_arb_create_context_no_error@no error,Fail
 glx@glx_ext_no_config_context@no fbconfig,Fail
 glx@glx-visuals-depth -pixmap,Fail
 glx@glx-visuals-stencil -pixmap,Fail
 spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail
 spec@!opengl 1.1@line-smooth-stipple,Fail
 spec@arb_pipeline_statistics_query@arb_pipeline_statistics_query-frag,Fail
-spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex,Fail
-spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex@'vs_input2[1][0]' on GL_PROGRAM_INPUT,Fail
 spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail
 spec@arb_shading_language_packing@execution@built-in-functions@fs-packhalf2x16,Fail
 spec@arb_shading_language_packing@execution@built-in-functions@vs-packhalf2x16,Fail
diff --git a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv
index c7f12352dc0..c42869410ca 100644
--- a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv
+++ b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv
@@ -3,6 +3,9 @@ glx@glx_arb_sync_control@timing.*
 glx@glx-multithread-texture
 glx@glx-visuals-stencil -pixmap
 
+# These either consistently pass or consistently fail depending on the X server version, DDX, etc.
+glx@glx_ext_import_context@*
+
 # This one will be Crash or Fail depending on the shader cache state
 spec@!opengl 1.0@rasterpos
 spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked