diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
index 99726182c74..7c9519ff8c4 100644
--- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
@@ -1,7 +1,3 @@
-multisample-dEQP-GLES3.functional.depth_stencil_clear.depth_scissored_masked,Fail
-multisample-dEQP-GLES3.functional.depth_stencil_clear.depth_scissored,Fail
-multisample-dEQP-GLES3.functional.depth_stencil_clear.depth_stencil_scissored,Fail
-
 # "Fail, buffer content is not well preserved when age > 0 (Fail)"
 dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_clear_clear_even_clear_clear,Fail
 dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_clear_clear_even_clear,Fail
diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c
index 1c8561974c6..ed5ed2e4a85 100644
--- a/src/intel/blorp/blorp_clear.c
+++ b/src/intel/blorp/blorp_clear.c
@@ -968,7 +968,7 @@ blorp_can_hiz_clear_depth(const struct intel_device_info *devinfo,
        */
       if (x0 % 8 || y0 % 4 || x1 % 8 || y1 % 4)
          return false;
-   } else if (aux_usage == ISL_AUX_USAGE_HIZ_CCS_WT) {
+   } else if (isl_aux_usage_has_ccs(aux_usage)) {
       /* We have to set the WM_HZ_OP::FullSurfaceDepthandStencilClear bit
        * whenever we clear an uninitialized HIZ buffer (as some drivers
        * currently do). However, this bit seems liable to clear 16x8 pixels in
diff --git a/src/intel/ci/angle-anv-tgl-fails.txt b/src/intel/ci/angle-anv-tgl-fails.txt
index 091ffd9e9df..edf9f4344d0 100644
--- a/src/intel/ci/angle-anv-tgl-fails.txt
+++ b/src/intel/ci/angle-anv-tgl-fails.txt
@@ -20,10 +20,3 @@ KHR-GLES3.packed_pixels.varied_rectangle.rgba8_snorm,Fail
 # https://bugs.chromium.org/p/angleproject/issues/detail?id=7877
 KHR-GLES31.core.texture_border_clamp.Texture2DDC16Linear,Fail
 KHR-GLES31.core.texture_border_clamp.Texture2DDC32FLinear,Fail
-
-# Regression in ANGLE 412dd36859d326204bd2d3f15f12ba94abf3b81e
-# ("Vulkan: Use vkCmdClearAttachments for unmasked scissored clears")
-# Fails the same, with no validation complaints on ADL.  Doesn't fail on CFL.
-multisample-dEQP-GLES3.functional.depth_stencil_clear.depth_scissored,Fail
-multisample-dEQP-GLES3.functional.depth_stencil_clear.depth_scissored_masked,Fail
-multisample-dEQP-GLES3.functional.depth_stencil_clear.depth_stencil_scissored,Fail