diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 827d54c0492..f094b3b244c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1458,7 +1458,11 @@ arm64_a630_vk_sysmem:
     #
     # Known flakes in the list are between "arb_blend_func_extended" and
     # "varray-disabled"
+    #
+    # vs-output-array-vec2-index-wr-before-gs is skipped because it causes
+    # a flood of GPU hangs and makes the rest of the job flakey
     PIGLIT_OPTIONS: >-
+      -x vs-output-array-vec2-index-wr-before-gs
       -x arb_blend_func_extended-fbo-extended-blend-pattern_gles2
       -x clear-accum
       -x copypixels-sync
diff --git a/.gitlab-ci/piglit/freedreno-a630-shader.txt b/.gitlab-ci/piglit/freedreno-a630-shader.txt
index 89c8b43856d..7adcbb339e0 100644
--- a/.gitlab-ci/piglit/freedreno-a630-shader.txt
+++ b/.gitlab-ci/piglit/freedreno-a630-shader.txt
@@ -1001,7 +1001,6 @@ spec/glsl-1.50/execution/variable-indexing/gs-input-array-vec3-index-rd: crash
 spec/glsl-1.50/execution/variable-indexing/gs-input-array-vec4-index-rd: fail
 spec/glsl-1.50/execution/variable-indexing/gs-output-array-vec3-index-wr: fail
 spec/glsl-1.50/execution/variable-indexing/gs-output-array-vec4-index-wr: crash
-spec/glsl-1.50/execution/variable-indexing/vs-output-array-vec2-index-wr-before-gs: fail
 spec/glsl-1.50/execution/variable-indexing/vs-output-array-vec3-index-wr-before-gs: fail
 spec/glsl-1.50/execution/variable-indexing/vs-output-array-vec4-index-wr-before-gs: fail
 spec/glsl-es-3.10/execution/cs-image-atomic-if-else-2: fail
@@ -1129,7 +1128,7 @@ summary:
        name:  results
        ----  --------
        pass:     8878
-       fail:       33
+       fail:       32
       crash:       95
        skip:      997
     timeout:        0
@@ -1140,4 +1139,4 @@ summary:
     changes:        0
       fixes:        0
 regressions:        0
-      total:    10005
+      total:    10004