diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt
index e328fa9790a..0cb7d77e110 100644
--- a/src/freedreno/ci/freedreno-a618-fails.txt
+++ b/src/freedreno/ci/freedreno-a618-fails.txt
@@ -39,10 +39,6 @@ KHR-GL45.direct_state_access.renderbuffers_storage_multisample,Fail
 
 KHR-GL45.multi_bind.dispatch_bind_image_textures,Fail
 
-# Unhandled intrinsic type: image_samples
-KHR-GL45.shader_texture_image_samples_tests.image_functional_test,Crash
-
-
 # rendering errors in ~4x4 blocks around the bottom side of the diagonal for the quad
 bypass-dEQP-GLES31.functional.blend_equation_advanced.msaa.colorburn,Fail
 bypass-dEQP-GLES31.functional.blend_equation_advanced.msaa.colordodge,Fail
diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt
index 0d42bade75b..b36e643c110 100644
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -38,10 +38,6 @@ KHR-GL45.direct_state_access.renderbuffers_storage_multisample,Fail
 
 KHR-GL45.multi_bind.dispatch_bind_image_textures,Fail
 
-# Unhandled intrinsic type: image_samples
-KHR-GL45.shader_texture_image_samples_tests.image_functional_test,Crash
-
-
 # rendering errors in ~4x4 blocks around the bottom side of the diagonal for the quad
 bypass-dEQP-GLES31.functional.blend_equation_advanced.msaa.colorburn,Fail
 bypass-dEQP-GLES31.functional.blend_equation_advanced.msaa.colordodge,Fail
diff --git a/src/freedreno/ir3/ir3_nir.c b/src/freedreno/ir3/ir3_nir.c
index dd9cc0885ad..6f685e84d05 100644
--- a/src/freedreno/ir3/ir3_nir.c
+++ b/src/freedreno/ir3/ir3_nir.c
@@ -582,6 +582,7 @@ ir3_nir_post_finalize(struct ir3_shader *shader)
 
    const nir_lower_image_options lower_image_opts = {
       .lower_cube_size = true,
+      .lower_image_samples_to_one = true
    };
    NIR_PASS_V(s, nir_lower_image, &lower_image_opts);