diff --git a/src/broadcom/ci/broadcom-rpi5-fails.txt b/src/broadcom/ci/broadcom-rpi5-fails.txt
index 8319ae6e118..3bc6f34f12b 100644
--- a/src/broadcom/ci/broadcom-rpi5-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi5-fails.txt
@@ -576,7 +576,6 @@ dEQP-VK.image.mutable.2d_array.r8g8b8a8_sint_r16g16_sint_draw_copy_resolve_mutab
 dEQP-VK.image.mutable.2d_array.r8g8b8a8_sint_r16g16_sint_draw_copy_resolve_mutable_resolve_att,Fail
 dEQP-VK.image.mutable.2d_array.r8g8b8a8_sint_r16g16_uint_draw_copy_resolve_mutable_color_att,Fail
 dEQP-VK.image.mutable.2d_array.r8g8b8a8_sint_r16g16_uint_draw_copy_resolve_mutable_resolve_att,Fail
-dEQP-VK.image.mutable.2d_array.r8g8b8a8_sint_r32_sfloat_draw_copy_resolve,Fail
 dEQP-VK.image.mutable.2d_array.r8g8b8a8_sint_r32_sfloat_draw_copy_resolve_mutable_color_att,Fail
 dEQP-VK.image.mutable.2d_array.r8g8b8a8_sint_r32_sfloat_draw_copy_resolve_mutable_resolve_att,Fail
 dEQP-VK.image.mutable.2d_array.r8g8b8a8_sint_r32_sint_draw_copy_resolve_mutable_resolve_att,Fail
diff --git a/src/broadcom/ci/broadcom-rpi5-flakes.txt b/src/broadcom/ci/broadcom-rpi5-flakes.txt
index 6810955f269..654b8aa6139 100644
--- a/src/broadcom/ci/broadcom-rpi5-flakes.txt
+++ b/src/broadcom/ci/broadcom-rpi5-flakes.txt
@@ -202,3 +202,6 @@ x11-dEQP-EGL.functional.sharing.gles2.multithread.simple_egl_sync.images.texture
 
 spec@egl_chromium_sync_control@conformance
 spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test
+
+# It works with ci-tron, but fails with baremetal. Maybe a kernel issue?
+dEQP-VK.image.mutable.2d_array.r8g8b8a8_sint_r32_sfloat_draw_copy_resolve
diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index 2cd593c69cf..b73c77252ec 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -157,7 +157,7 @@ v3d-rpi4-gl-full:arm64:
   variables:
     DEQP_FRACTION: 1
 
-.ci-tron-v3d-rpi4-gl-full:arm64:
+ci-tron-v3d-rpi4-gl-full:arm64:
   extends:
     - .ci-tron-v3d-rpi4-gl:arm64
     - .v3d-manual-rules
@@ -321,7 +321,7 @@ v3dv-rpi4-vk-full:arm64:
     TEST_SETUP_AND_UPLOAD_MARGIN_MINUTES: 10
     DEQP_FRACTION: 1
 
-.ci-tron-v3dv-rpi4-vk-full:arm64:
+ci-tron-v3dv-rpi4-vk-full:arm64:
   extends:
     - .ci-tron-v3dv-rpi4-vk:arm64
     - .v3dv-manual-rules
@@ -422,7 +422,7 @@ v3d-rpi5-gl-full:arm64:
     TEST_SETUP_AND_UPLOAD_MARGIN_MINUTES: 10
     DEQP_FRACTION: 1
 
-.ci-tron-v3d-rpi5-gl-full:arm64:
+ci-tron-v3d-rpi5-gl-full:arm64:
   extends:
     - .ci-tron-v3d-rpi5-gl:arm64
     - .v3d-manual-rules
@@ -465,7 +465,7 @@ v3d-rpi5-traces:arm64:
   variables:
     PIGLIT_TRACES_FILE: traces-broadcom.yml
 
-v3d-rpi5-gl-asan:arm64:
+.v3d-rpi5-gl-asan:arm64:
   extends:
     - .igalia-bcm2712-rpi-5
     - .broadcom-asan-test:arm64-gl
@@ -522,7 +522,7 @@ v3dv-rpi5-vk:arm64:
     DEQP_SUITE: broadcom-rpi5-vk
     DEQP_FRACTION: 6
 
-v3dv-rpi5-vk-full:arm64:
+.v3dv-rpi5-vk-full:arm64:
   extends:
     - v3dv-rpi5-vk:arm64
     - .broadcom-test-full:arm64-vk
@@ -537,7 +537,7 @@ v3dv-rpi5-vk-full:arm64:
     TEST_SETUP_AND_UPLOAD_MARGIN_MINUTES: 10
     DEQP_FRACTION: 1
 
-.ci-tron-v3dv-rpi5-vk-full:arm64:
+ci-tron-v3dv-rpi5-vk-full:arm64:
   extends:
     - .ci-tron-v3dv-rpi5-vk:arm64
     - .v3dv-manual-rules
@@ -546,7 +546,7 @@ v3dv-rpi5-vk-full:arm64:
     CI_TRON_TIMEOUT__OVERALL__MINUTES: 145
     DEQP_FRACTION: 1
 
-v3dv-rpi5-vk-asan:arm64:
+.v3dv-rpi5-vk-asan:arm64:
   extends:
     - .igalia-bcm2712-rpi-5
     - .broadcom-asan-test:arm64-vk