diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index 47c78d5d9ed..b6266f21e83 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -869,7 +869,8 @@ static void get_texcoords(struct pipe_sampler_view *src,
 
    case PIPE_TEXTURE_2D_ARRAY:
       out->texcoord.z = layer;
-      out->texcoord.w = sample;
+      if (util_res_sample_count(src->texture) > 1)
+         out->texcoord.w = sample;
       break;
 
    case PIPE_TEXTURE_CUBE_ARRAY:
@@ -877,7 +878,8 @@ static void get_texcoords(struct pipe_sampler_view *src,
       break;
 
    case PIPE_TEXTURE_2D:
-      out->texcoord.w = sample;
+      if (util_res_sample_count(src->texture) > 1)
+         out->texcoord.w = sample;
       break;
 
    default:;
diff --git a/src/gallium/drivers/zink/ci/zink-nvk-ad106-fails.txt b/src/gallium/drivers/zink/ci/zink-nvk-ad106-fails.txt
index d96ee8e7956..e8483a89d0a 100644
--- a/src/gallium/drivers/zink/ci/zink-nvk-ad106-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-nvk-ad106-fails.txt
@@ -2,9 +2,6 @@ dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_sample.n
 dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_sample.non_multisample_buffer.sample_n_singlesample_rbo,Fail
 dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_sample.non_multisample_buffer.sample_n_singlesample_texture,Fail
 
-KHR-GL46.packed_depth_stencil.blit.depth24_stencil8,Fail
-KHR-GL46.packed_depth_stencil.blit.depth32f_stencil8,Fail
-
 glx@glx-multi-window-single-context,Fail
 glx@glx-swap-pixmap-bad,Fail
 glx@glx_arb_sync_control@swapbuffersmsc-divisor-zero,Fail
diff --git a/src/gallium/drivers/zink/ci/zink-nvk-ga106-fails.txt b/src/gallium/drivers/zink/ci/zink-nvk-ga106-fails.txt
index 9e5657c9ca0..c9060b3127f 100644
--- a/src/gallium/drivers/zink/ci/zink-nvk-ga106-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-nvk-ga106-fails.txt
@@ -2,9 +2,6 @@ dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_sample.n
 dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_sample.non_multisample_buffer.sample_n_singlesample_rbo,Fail
 dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_sample.non_multisample_buffer.sample_n_singlesample_texture,Fail
 
-KHR-GL46.packed_depth_stencil.blit.depth24_stencil8,Fail
-KHR-GL46.packed_depth_stencil.blit.depth32f_stencil8,Fail
-
 glx@glx-multi-window-single-context,Fail
 glx@glx-swap-pixmap-bad,Fail
 glx@glx_arb_sync_control@swapbuffersmsc-divisor-zero,Fail