diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index 1bb7e18bf5f..f27c9522063 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -120,9 +120,7 @@ v3d-rpi4-traces:arm64:
   variables:
     GPU_VERSION: broadcom-rpi4
     HWCI_KERNEL_MODULES: v3d,vc4
-    HWCI_START_XORG: 1
     HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
-    PIGLIT_PLATFORM: mixed_glx_egl
     PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-broadcom.yml"
     PIGLIT_REPLAY_DEVICE_NAME: "broadcom-rpi4"
     PIGLIT_RESULTS: "broadcom-rpi4-replay"
diff --git a/src/broadcom/ci/traces-broadcom.yml b/src/broadcom/ci/traces-broadcom.yml
index 9a9f39a6ff8..73ffb7ab917 100644
--- a/src/broadcom/ci/traces-broadcom.yml
+++ b/src/broadcom/ci/traces-broadcom.yml
@@ -34,6 +34,8 @@ traces:
 
   glxgears/glxgears-2-v2.trace:
     broadcom-rpi4:
+      label: [skip, flakes]
+      text: "Often fails when running on xwayland, with what looks like an incorrect resolution"
       checksum: 2a9c5e35fa5693fd7d3a76f7b9746edb
 
   godot/godot-thrive.trace: