diff --git a/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt b/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt
index 99e4785ef7a..e68d97ed84a 100644
--- a/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt
+++ b/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt
@@ -10,6 +10,9 @@ spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail
 # Compat mode failure
 spec@!opengl 1.0@rasterpos,Fail
 
+spec@!opengl 1.1@line-smooth-coverage,Fail
+spec@!opengl 1.1@line-smooth-stipple,Fail
+
 spec@!opengl 1.1@linestipple,Fail
 spec@!opengl 1.1@linestipple@Factor 2x,Fail
 spec@!opengl 1.1@linestipple@Factor 3x,Fail
@@ -26,8 +29,6 @@ spec@!opengl 3.2@gl-3.2-adj-prims pv-first,Fail
 
 spec@arb_direct_state_access@gettextureimage-formats init-by-rendering,Fail
 
-spec@arb_gpu_shader_fp64@execution@arb_gpu_shader_fp64-vs-non-uniform-control-flow-ssbo,Fail
-
 spec@arb_indirect_parameters@conditional-render,Fail
 spec@arb_indirect_parameters@conditional-render@Query result: Fail. Inverted mode: No.  Points drawn: 6,Fail
 spec@arb_indirect_parameters@conditional-render@Query result: Pass. Inverted mode: Yes.  Points drawn: 6,Fail
@@ -184,6 +185,10 @@ KHR-GL46.direct_state_access.textures_storage_multisample_3d_rgb32i,Fail
 KHR-GL46.direct_state_access.textures_storage_multisample_3d_rgba16i,Fail
 KHR-GL46.direct_state_access.textures_storage_multisample_3d_rgba32i,Fail
 KHR-GL46.direct_state_access.textures_storage_multisample_3d_rgba8i,Fail
+
+# glcts: ../src/compiler/nir/nir.h:127: nir_component_mask: Assertion `nir_num_components_valid(num_components)' failed.
+KHR-GL46.gpu_shader_fp64.fp64.state_query,Crash
+
 KHR-GL46.sample_shading.render.rgba8i.full,Fail
 KHR-GL46.sample_shading.render.rgba8i.half,Fail
 KHR-GL46.sample_shading.render.rgba8i.none,Fail
diff --git a/src/gallium/drivers/crocus/ci/crocus-hsw-flakes.txt b/src/gallium/drivers/crocus/ci/crocus-hsw-flakes.txt
index 58ade04935a..cb46a106694 100644
--- a/src/gallium/drivers/crocus/ci/crocus-hsw-flakes.txt
+++ b/src/gallium/drivers/crocus/ci/crocus-hsw-flakes.txt
@@ -1,6 +1,7 @@
 KHR-GL46.texture_barrier.overlapping-texels
 KHR-GL46.texture_barrier_ARB.overlapping-texels
 KHR-GL46.texture_barrier_ARB.same-texel-rw-multipass
+KHR-GL46.texture_barrier.same-texel-rw-multipass
 spec@arb_query_buffer_object@qbo
 spec@arb_shader_storage_buffer_object@execution@ssbo-atomicexchange-int
 spec@amd_performance_monitor@measure
diff --git a/src/gallium/drivers/crocus/ci/traces-crocus.yml b/src/gallium/drivers/crocus/ci/traces-crocus.yml
index d777e015aae..712429409f5 100644
--- a/src/gallium/drivers/crocus/ci/traces-crocus.yml
+++ b/src/gallium/drivers/crocus/ci/traces-crocus.yml
@@ -8,7 +8,7 @@ traces:
     crocus-g41:
       checksum: f4f723a73fde41b8a00a2a6518190adf
     crocus-hsw:
-      checksum: 6567807570543c2875fc6912f00687e5
+      checksum: 3ba17078e281e3d73a0e2d5d72ebf869
   behdad-glyphy/glyphy-v2.trace:
     crocus-g41:
       label: [skip, flakes, broken]
@@ -115,7 +115,7 @@ traces:
       label: [skip, flakes]
   supertuxkart/supertuxkart-mansion-egl-gles-v2.trace:
     crocus-hsw:
-      checksum: 8f1224abf2fab07f7dc31ae26312c948
+      checksum: c219d20ed5f701c4d4194e762501d4fd
   valve/counterstrike-v2.trace:
     crocus-g41:
       checksum: 90c01e73b3544cb477ac6109bc61bef1
@@ -167,7 +167,9 @@ traces:
     crocus-g41:
       label: [unsupported]
     crocus-hsw:
+      label: [skip, crash]
       checksum: 997ec70d945fdbda8a98efe831000338
+      text: "abort() called"
   unvanquished/unvanquished-lowest.trace:
     crocus-g41:
       label: [unsupported]