diff --git a/src/gallium/drivers/softpipe/ci/deqp-softpipe.toml b/src/gallium/drivers/softpipe/ci/deqp-softpipe.toml
index 77c38b0ef6a..a4c8c5d2996 100644
--- a/src/gallium/drivers/softpipe/ci/deqp-softpipe.toml
+++ b/src/gallium/drivers/softpipe/ci/deqp-softpipe.toml
@@ -51,3 +51,10 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
     "--deqp-visibility=hidden"
 ]
+
+[[piglit]]
+piglit_folder = "/piglit"
+# We use "gpu" to skip running glslparser tests, with the assumption that
+# they're covered by the llvmpipe run.
+profile = "gpu"
+process_isolation = true
diff --git a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml
index d922fa6f34a..5561a839ca0 100644
--- a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml
@@ -15,11 +15,14 @@
   variables:
     DEQP_EXPECTED_RENDERER: softpipe
 
-softpipe-deqp:
+softpipe:
+  tags:
+    - mesa-swrast
   variables:
     DEQP_SUITE: softpipe
-  parallel: 2
   extends: .softpipe-deqp-test
+  script:
+    - LD_LIBRARY_PATH=`pwd`/install/lib xvfb-run --server-args='-noreset' install/deqp-runner.sh
 
 softpipe-asan-gles31:
   variables:
@@ -31,16 +34,3 @@ softpipe-asan-gles31:
   needs:
     - debian/x86_test-gl
     - debian-testing-asan
-
-# We use "gpu" to skip running glslparser tests, with the assumption that
-# they're covered by the llvmpipe run.
-softpipe-piglit:
-  extends:
-    - .test-gl
-    - .piglit-test
-    - .softpipe-test
-    - .softpipe-rules
-  variables:
-    PIGLIT_PROFILES: gpu
-  script:
-    - LD_LIBRARY_PATH=`pwd`/install/lib xvfb-run --server-args='-noreset' install/piglit/piglit-runner.sh
diff --git a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt
index 4e48c4249ba..d2bd01fe034 100644
--- a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt
+++ b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt
@@ -907,7 +907,7 @@ KHR-GLES31.core.texture_storage_multisample.FunctionalTests.texture_size_in_vert
 KHR-GLES31.core.texture_storage_multisample.GLCoverage.get_tex_parameter_reports_correct_default_values_for_multisample_texture_targets,Fail
 KHR-GLES31.core.texture_storage_multisample.GLCoverage.gl_tex_parameter_handlers_accept_zero_base_level,Fail
 
-fast_color_clear@fcc-front-buffer-distraction,Crash
+fast_color_clear@fcc-front-buffer-distraction,Fail
 
 # X Error of failed request:  BadMatch (invalid parameter attributes)
 #   Major opcode of failed request:  150 (GLX)
@@ -943,14 +943,14 @@ glx@glx_ext_import_context@imported context has same context id,Fail
 glx@glx_ext_import_context@make current- multi process,Fail
 glx@glx_ext_import_context@make current- single process,Fail
 glx@glx_ext_import_context@query context info,Fail
-hiz@hiz-depth-read-window-stencil0,Crash
-hiz@hiz-depth-read-window-stencil1,Crash
-hiz@hiz-depth-test-window-stencil0,Crash
-hiz@hiz-depth-test-window-stencil1,Crash
-hiz@hiz-stencil-read-window-depth0,Crash
-hiz@hiz-stencil-read-window-depth1,Crash
-hiz@hiz-stencil-test-window-depth0,Crash
-hiz@hiz-stencil-test-window-depth1,Crash
+hiz@hiz-depth-read-window-stencil0,Fail
+hiz@hiz-depth-read-window-stencil1,Fail
+hiz@hiz-depth-test-window-stencil0,Fail
+hiz@hiz-depth-test-window-stencil1,Fail
+hiz@hiz-stencil-read-window-depth0,Fail
+hiz@hiz-stencil-read-window-depth1,Fail
+hiz@hiz-stencil-test-window-depth0,Fail
+hiz@hiz-stencil-test-window-depth1,Fail
 shaders@glsl-bug-110796,Fail
 spec@!opengl 1.0@gl-1.0-drawbuffer-modes,Fail
 spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail
@@ -1092,9 +1092,9 @@ spec@arb_occlusion_query@occlusion_query_meta_save,Fail
 spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex,Fail
 spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex@'vs_input2[1][0]' on GL_PROGRAM_INPUT,Fail
 
-spec@arb_provoking_vertex@arb-provoking-vertex-clipped-geometry-flatshading,Crash
-spec@arb_provoking_vertex@arb-provoking-vertex-render,Crash
-spec@arb_robustness@arb_robustness_client-mem-bounds,Crash
+spec@arb_provoking_vertex@arb-provoking-vertex-clipped-geometry-flatshading,Fail
+spec@arb_provoking_vertex@arb-provoking-vertex-render,Fail
+
 spec@arb_shader_image_load_store@execution@disable_early_z,Fail
 spec@arb_shader_storage_buffer_object@execution@ssbo-atomiccompswap-int,Fail
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 1d,Fail
@@ -1112,7 +1112,7 @@ spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2dshad
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 3d,Fail
 spec@arb_stencil_texturing@glblitframebuffer corrupts state@gl_texture_2d_multisample,Fail
 spec@arb_stencil_texturing@glblitframebuffer corrupts state@gl_texture_2d_multisample_array,Fail
-spec@arb_sync@sync_api,Crash
+
 spec@arb_texture_buffer_object@data-sync,Fail
 
 spec@arb_texture_buffer_object@formats (fs- 3.1 core),Fail
diff --git a/src/gallium/drivers/softpipe/ci/softpipe-flakes.txt b/src/gallium/drivers/softpipe/ci/softpipe-flakes.txt
index 070d3515262..8971b3a3ecb 100644
--- a/src/gallium/drivers/softpipe/ci/softpipe-flakes.txt
+++ b/src/gallium/drivers/softpipe/ci/softpipe-flakes.txt
@@ -2,3 +2,6 @@
 glx@glx-multithread-clearbuffer
 glx@glx-multithread-shader-compile
 glx@glx-multithread-texture
+
+# Sometimes crashes, less so since moving to the google runners
+spec@arb_sync@sync_api