diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-fails.txt b/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-fails.txt
index a491e4c562d..e69de29bb2d 100644
--- a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-fails.txt
+++ b/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-fails.txt
@@ -1,4 +0,0 @@
-# The shader assisted indirect draw path is buggy. The shader assisted indirect
-# draw path is disabled outside of CI due to these conformance issues.
-KHR-GLES31.core.draw_indirect.advanced-twoPass-transformFeedback-arrays,Fail
-KHR-GLES31.core.draw_indirect.advanced-twoPass-transformFeedback-elements,Fail
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-skips.txt b/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-skips.txt
index 5c2544f59bf..b18975e33ce 100644
--- a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-skips.txt
+++ b/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-skips.txt
@@ -5,3 +5,11 @@
 # Some compute jobs take more 0.5s, the maximum allowed by the
 # kernel driver
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.*
+
+# We lack a dependency between the vertex job filling the indirect draw
+# buffers and the indirect draw compute job reading from these buffers,
+# leading to unreliable results (the tests pass if the vertex job is
+# done before the compute job starts, and fail otherwise). Let's disable
+# those tests until we sort it out.
+KHR-GLES31.core.draw_indirect.advanced-twoPass-transformFeedback-arrays
+KHR-GLES31.core.draw_indirect.advanced-twoPass-transformFeedback-elements