diff --git a/src/gallium/auxiliary/indices/u_primconvert.c b/src/gallium/auxiliary/indices/u_primconvert.c
index dcbc9052dac..526e7b64492 100644
--- a/src/gallium/auxiliary/indices/u_primconvert.c
+++ b/src/gallium/auxiliary/indices/u_primconvert.c
@@ -130,9 +130,15 @@ primconvert_init_draw(struct primconvert_context *pc,
       return false;
 
    util_draw_init_info(new_info);
-   new_info->index_bounds_valid = info->index_bounds_valid;
-   new_info->min_index = info->min_index;
-   new_info->max_index = info->max_index;
+
+   /* Because we've changed the index buffer, the original min_index/max_index
+    * for the draw are no longer valid. That's ok, but we need to tell drivers
+    * so they don't optimize incorrectly.
+    */
+   new_info->index_bounds_valid = false;
+   new_info->min_index = 0;
+   new_info->max_index = ~0;
+
    new_info->start_instance = info->start_instance;
    new_info->instance_count = info->instance_count;
    new_info->primitive_restart = info->primitive_restart;
diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt
index 9bf8ccceb4c..c4144a26140 100644
--- a/src/panfrost/ci/panfrost-g52-fails.txt
+++ b/src/panfrost/ci/panfrost-g52-fails.txt
@@ -495,8 +495,6 @@ spec@nv_copy_image@nv_copy_image-formats --samples=4@Source: GL_RGBA32I/Destinat
 spec@nv_copy_image@nv_copy_image-formats --samples=4@Source: GL_RGBA32UI/Destination: GL_RGBA32UI,Fail
 spec@nv_copy_image@nv_copy_image-formats --samples=4@Source: GL_RGBA8/Destination: GL_RGBA8,Fail
 spec@nv_copy_image@nv_copy_image-formats --samples=4@Source: GL_RGBA8_SNORM/Destination: GL_RGBA8_SNORM,Fail
-spec@nv_primitive_restart@primitive-restart-draw-mode-polygon,Crash
-spec@nv_primitive_restart@primitive-restart-draw-mode-quad_strip,Crash
 spec@oes_texture_view@rendering-formats,Crash
 spec@oes_texture_view@sampling-2d-array-as-cubemap,Crash
 spec@!opengl 1.0@gl-1.0-edgeflag-const,Fail