diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
index 41d6344d409..bd2a3e0b1ad 100644
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
@@ -50,9 +50,6 @@ spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_
 # "error: main:90: eglChooseConfig() returned no configs"
 spec@egl 1.4@eglterminate then unbind context,Fail
 
-# Not allowed to force software rendering when API explicitly selects a hardware device.
-spec@egl_ext_platform_device@conformance,Crash
-
 # "eglChooseConfig failed"
 spec@egl_khr_surfaceless_context@viewport,Fail
 spec@egl_mesa_configless_context@basic,Fail
@@ -64,15 +61,6 @@ spec@ext_framebuffer_multisample@clip-and-scissor-blit 4 upsample,Fail
 spec@ext_framebuffer_multisample@interpolation 2 centroid-edges,Fail
 spec@ext_framebuffer_multisample@interpolation 4 centroid-edges,Fail
 
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_argb8888,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y210,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y216,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y410,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,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@khr_texture_compression_astc@miptree-gles srgb-fp,Fail
diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt
index 4984af93ed6..bd7599e7d1d 100644
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt
@@ -23,3 +23,14 @@ glx@glx-multi-context-single-window
 
 # unreliable, probably from scheduling.
 spec@arb_timer_query@timestamp-get
+
+# Started to flake after gitlab migration
+spec@egl_ext_platform_device@conformance
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_argb8888
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y210
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y216
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y410
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420