diff --git a/src/amd/ci/traces-amd.yml b/src/amd/ci/traces-amd.yml
index 1d769427bbf..bb8d64dc0f2 100644
--- a/src/amd/ci/traces-amd.yml
+++ b/src/amd/ci/traces-amd.yml
@@ -50,9 +50,10 @@ traces:
       label: [skip]
       text: Nothing wrong with it, proxy issues. Revert ASAP.
       checksum: 0e7441a7f2c86c75eeac72269786e7a1
-  gputest/gimark-v2.trace:
-    gl-radeonsi-stoney:
-      checksum: 942a9334e5e830cdfb950a72d77c48f5
+# gimark requires an environment var to work around a bug, disable for now
+#  gputest/gimark-v2.trace:
+#    gl-radeonsi-stoney:
+#      checksum: 942a9334e5e830cdfb950a72d77c48f5
   gputest/pixmark-julia-fp32-v2.trace:
     gl-radeonsi-stoney:
       checksum: 832d5f8268e953d6aa754c0aaf4b65d3
diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml
index bb5d58614a1..92ffed6b3ba 100644
--- a/src/freedreno/ci/traces-freedreno.yml
+++ b/src/freedreno/ci/traces-freedreno.yml
@@ -266,21 +266,22 @@ traces:
     zink-a630:
       checksum: fe317b1f69f9a2f3e20bf51f63753d2a
 
-  gputest/gimark-v2.trace:
-    freedreno-a306:
-      label: [unsupported]
-      text: requires GL 3.3
-    freedreno-a530:
-      label: [unsupported]
-      text: requires GL 3.3
-    freedreno-a618:
-      checksum: e58167bd8eeb8952facbc00ff0449135
-    freedreno-a630:
-      checksum: e58167bd8eeb8952facbc00ff0449135
-    zink-a618:
-      checksum: e58167bd8eeb8952facbc00ff0449135
-    zink-a630:
-      checksum: e58167bd8eeb8952facbc00ff0449135
+# gimark requires an environment var to work around a bug, disable for now
+#  gputest/gimark-v2.trace:
+#    freedreno-a306:
+#      label: [unsupported]
+#      text: requires GL 3.3
+#    freedreno-a530:
+#      label: [unsupported]
+#      text: requires GL 3.3
+#    freedreno-a618:
+#      checksum: e58167bd8eeb8952facbc00ff0449135
+#    freedreno-a630:
+#      checksum: e58167bd8eeb8952facbc00ff0449135
+#    zink-a618:
+#      checksum: e58167bd8eeb8952facbc00ff0449135
+#    zink-a630:
+#      checksum: e58167bd8eeb8952facbc00ff0449135
 
   gputest/pixmark-julia-fp32-v2.trace:
     freedreno-a306:
diff --git a/src/gallium/drivers/crocus/ci/traces-crocus.yml b/src/gallium/drivers/crocus/ci/traces-crocus.yml
index 19aba3bd49f..d8b215bb628 100644
--- a/src/gallium/drivers/crocus/ci/traces-crocus.yml
+++ b/src/gallium/drivers/crocus/ci/traces-crocus.yml
@@ -24,12 +24,13 @@ traces:
       checksum: c7c3df989f88852e88bef101b5c1dc22
     crocus-hsw:
       checksum: bb84373a69751942956d2320cff6dd1d
-  gputest/gimark-v2.trace:
-    crocus-g41:
-      label: [unsupported]
-    crocus-hsw:
-      label: [skip, flakes]
-      text: lighting comes in from a different direction than on freedreno?
+# gimark requires an environment var to work around a bug, disable for now
+#  gputest/gimark-v2.trace:
+#    crocus-g41:
+#      label: [unsupported]
+#    crocus-hsw:
+#      label: [skip, flakes]
+#      text: lighting comes in from a different direction than on freedreno?
   gputest/pixmark-julia-fp32-v2.trace:
     crocus-g41:
       checksum: 03776a063ee7049256acd414239a7f13
diff --git a/src/panfrost/ci/traces-panfrost.yml b/src/panfrost/ci/traces-panfrost.yml
index dc587fc6bc9..17f2c236605 100644
--- a/src/panfrost/ci/traces-panfrost.yml
+++ b/src/panfrost/ci/traces-panfrost.yml
@@ -47,12 +47,13 @@ traces:
   0ad/0ad-v2.trace:
     gl-panfrost-t860:
       label: [skip, timeout]
-  # Flaky since the introduction of parallel trace replay
-  gputest/gimark-v2.trace:
-    gl-panfrost-t860:
-      label: [skip, flakes, broken]
-      checksum: 0020a77e25003e4e8db1ce929eed8914
-      text: Some blue rings are missing on the top-left corner, also the penguin watermark.
+# gimark requires an environment var to work around a bug, disable for now
+#  # Flaky since the introduction of parallel trace replay
+#  gputest/gimark-v2.trace:
+#    gl-panfrost-t860:
+#      label: [skip, flakes, broken]
+#      checksum: 0020a77e25003e4e8db1ce929eed8914
+#      text: Some blue rings are missing on the top-left corner, also the penguin watermark.
   gputest/pixmark-julia-fp32-v2.trace:
     gl-panfrost-t860:
       checksum: d85b6967b7c768f28395c5c5dfbcfe3e