diff --git a/src/gallium/drivers/zink/ci/zink-nv-fails.txt b/src/gallium/drivers/zink/ci/zink-nv-fails.txt
new file mode 100644
index 00000000000..7eeaf324889
--- /dev/null
+++ b/src/gallium/drivers/zink/ci/zink-nv-fails.txt
@@ -0,0 +1,194 @@
+GTF-GL46.gtf21.GL.atan.atan_vec2_frag_xvary,Fail
+GTF-GL46.gtf21.GL.atan.atan_vec2_frag_xvaryyvary,Fail
+GTF-GL46.gtf21.GL.atan.atan_vec3_frag_xvary,Fail
+GTF-GL46.gtf21.GL.atan.atan_vec3_frag_xvaryyvary,Fail
+GTF-GL46.gtf21.GL.mat3.mat3arrayindirect0_frag,Fail
+GTF-GL46.gtf21.GL.mat3.mat3arrayindirect1_frag,Fail
+GTF-GL46.gtf21.GL.mat3.mat3arraysimple_frag,Fail
+GTF-GL46.gtf21.GL2Tests.glGetUniform.glGetUniform,Fail
+GTF-GL46.gtf30.GL3Tests.conditional_render.conditional_render_test1,Fail
+GTF-GL46.gtf30.GL3Tests.conditional_render.conditional_render_test2,Fail
+GTF-GL46.gtf30.GL3Tests.conditional_render.conditional_render_test5,Fail
+GTF-GL46.gtf30.GL3Tests.conditional_render.conditional_render_test7,Fail
+GTF-GL46.gtf30.GL3Tests.conditional_render.conditional_render_test8,Fail
+GTF-GL46.gtf30.GL3Tests.conditional_render.conditional_render_test9,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_all_buffer_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_color_and_depth_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_color_and_stencil_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_linear_filter_color_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_magnifying_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_minifying_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_missing_buffers_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_multisampled_to_singlesampled_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_nearest_filter_color_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_negative_dimensions_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_negative_height_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_negative_width_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_scissor_blit,Fail
+GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_stencil_blit,Fail
+GTF-GL46.gtf30.GL3Tests.packed_depth_stencil.packed_depth_stencil_blit,Fail
+GTF-GL46.gtf30.GL3Tests.transform_feedback.transform_feedback_basic_outline,Fail
+GTF-GL46.gtf30.GL3Tests.transform_feedback.transform_feedback_builtins,Fail
+GTF-GL46.gtf30.GL3Tests.transform_feedback.transform_feedback_geometry,Fail
+GTF-GL46.gtf30.GL3Tests.transform_feedback.transform_feedback_interleaved,Fail
+GTF-GL46.gtf30.GL3Tests.transform_feedback.transform_feedback_max_interleaved,Fail
+GTF-GL46.gtf30.GL3Tests.transform_feedback.transform_feedback_max_separate,Fail
+GTF-GL46.gtf30.GL3Tests.transform_feedback.transform_feedback_overflow,Fail
+GTF-GL46.gtf30.GL3Tests.transform_feedback.transform_feedback_query_objects,Fail
+GTF-GL46.gtf30.GL3Tests.transform_feedback.transform_feedback_vertex_id,Fail
+GTF-GL46.gtf32.GL3Tests.draw_elements_base_vertex.draw_elements_base_vertex_count,Fail
+GTF-GL46.gtf32.GL3Tests.draw_elements_base_vertex.draw_elements_base_vertex_mode,Fail
+GTF-GL46.gtf33.GL3Tests.vertex_type_2_10_10_10_rev.vertex_type_2_10_10_10_rev_attrib,Fail
+GTF-GL46.gtf33.GL3Tests.vertex_type_2_10_10_10_rev.vertex_type_2_10_10_10_rev_bgra,Fail
+GTF-GL46.gtf33.GL3Tests.vertex_type_2_10_10_10_rev.vertex_type_2_10_10_10_rev_conversion,Fail
+GTF-GL46.gtf33.GL3Tests.vertex_type_2_10_10_10_rev.vertex_type_2_10_10_10_rev_divisor,Fail
+GTF-GL46.gtf33.GL3Tests.vertex_type_2_10_10_10_rev.vertex_type_2_10_10_10_rev_stride_pointer,Fail
+GTF-GL46.gtf40.GL3Tests.transform_feedback2.transform_feedback2_basic,Fail
+GTF-GL46.gtf40.GL3Tests.transform_feedback2.transform_feedback2_framebuffer,Fail
+GTF-GL46.gtf40.GL3Tests.transform_feedback2.transform_feedback2_pause_resume,Fail
+GTF-GL46.gtf40.GL3Tests.transform_feedback2.transform_feedback2_states,Fail
+GTF-GL46.gtf40.GL3Tests.transform_feedback2.transform_feedback2_two_buffers,Fail
+GTF-GL46.gtf40.GL3Tests.transform_feedback3.transform_feedback3_basic_outline,Fail
+GTF-GL46.gtf40.GL3Tests.transform_feedback3.transform_feedback3_geometry_instanced,Fail
+GTF-GL46.gtf40.GL3Tests.transform_feedback3.transform_feedback3_streams_overflow,Crash
+GTF-GL46.gtf40.GL3Tests.transform_feedback3.transform_feedback3_streams_queried,Fail
+GTF-GL46.gtf42.GL3Tests.transform_feedback_instanced.transform_feedback_instanced_conditional_render,Fail
+GTF-GL46.gtf42.GL3Tests.transform_feedback_instanced.transform_feedback_instanced_streams,Fail
+GTF-GL46.gtf43.GL3Tests.multi_draw_indirect.multi_draw_indirect_params,Fail
+GTF-GL46.gtf43.GL3Tests.multi_draw_indirect.multi_draw_indirect_stride,Timeout
+GTF-GL46.gtf44.GL31Tests.texture_stencil8.texture_stencil8_gl44,Fail
+KHR-GL46.compute_shader.conditional-dispatching,Fail
+KHR-GL46.conditional_render_inverted.functional,Fail
+KHR-GL46.copy_image.functional,Fail
+KHR-GL46.cull_distance.functional,Fail
+KHR-GL46.direct_state_access.queries_functional,Fail
+KHR-GL46.direct_state_access.renderbuffers_storage_multisample,Fail
+KHR-GL46.direct_state_access.vertex_arrays_attribute_format,Fail
+KHR-GL46.geometry_shader.primitive_counter.lines_to_line_strip,Timeout
+KHR-GL46.geometry_shader.primitive_counter.lines_to_line_strip_rp,Timeout
+KHR-GL46.geometry_shader.primitive_counter.lines_to_points,Timeout
+KHR-GL46.geometry_shader.primitive_counter.lines_to_points_rp,Timeout
+KHR-GL46.geometry_shader.primitive_counter.lines_to_triangle_strip,Timeout
+KHR-GL46.geometry_shader.primitive_counter.lines_to_triangle_strip_rp,Timeout
+KHR-GL46.geometry_shader.primitive_counter.point_to_point,Timeout
+KHR-GL46.geometry_shader.primitive_counter.points_to_line_strip,Timeout
+KHR-GL46.geometry_shader.primitive_counter.points_to_line_strip_rp,Timeout
+KHR-GL46.geometry_shader.primitive_counter.points_to_points_rp,Timeout
+KHR-GL46.geometry_shader.primitive_counter.points_to_triangle_strip,Timeout
+KHR-GL46.geometry_shader.primitive_counter.points_to_triangle_strip_rp,Timeout
+KHR-GL46.geometry_shader.primitive_counter.triangles_to_line_strip,Timeout
+KHR-GL46.geometry_shader.primitive_counter.triangles_to_line_strip_rp,Timeout
+KHR-GL46.geometry_shader.primitive_counter.triangles_to_points,Timeout
+KHR-GL46.geometry_shader.primitive_counter.triangles_to_points_rp,Timeout
+KHR-GL46.geometry_shader.primitive_counter.triangles_to_triangle_strip,Timeout
+KHR-GL46.geometry_shader.primitive_counter.triangles_to_triangle_strip_rp,Timeout
+KHR-GL46.geometry_shader.primitive_queries.primitive_queries_lines,Fail
+KHR-GL46.geometry_shader.primitive_queries.primitive_queries_points,Fail
+KHR-GL46.geometry_shader.primitive_queries.primitive_queries_triangles,Fail
+KHR-GL46.geometry_shader.rendering.rendering.lines_input_points_output_line_loop_drawcall,Fail
+KHR-GL46.geometry_shader.rendering.rendering.lines_input_points_output_line_strip_drawcall,Fail
+KHR-GL46.geometry_shader.rendering.rendering.lines_input_points_output_lines_drawcall,Fail
+KHR-GL46.geometry_shader.rendering.rendering.lines_with_adjacency_input_points_output_line_strip_drawcall,Fail
+KHR-GL46.geometry_shader.rendering.rendering.lines_with_adjacency_input_points_output_lines_adjacency_drawcall,Fail
+KHR-GL46.geometry_shader.rendering.rendering.points_input_points_output,Fail
+KHR-GL46.geometry_shader.rendering.rendering.triangles_input_points_output_triangle_fan_drawcall,Fail
+KHR-GL46.geometry_shader.rendering.rendering.triangles_input_points_output_triangle_strip_drawcall,Fail
+KHR-GL46.geometry_shader.rendering.rendering.triangles_input_points_output_triangles_drawcall,Fail
+KHR-GL46.geometry_shader.rendering.rendering.triangles_with_adjacency_input_points_output_triangle_strip_adjacency_drawcall,Fail
+KHR-GL46.geometry_shader.rendering.rendering.triangles_with_adjacency_input_points_output_triangles_adjacency_drawcall,Fail
+KHR-GL46.gpu_shader_fp64.fp64.max_uniform_components,Timeout
+KHR-GL46.packed_depth_stencil.blit.depth24_stencil8,Fail
+KHR-GL46.packed_depth_stencil.blit.depth32f_stencil8,Fail
+KHR-GL46.pipeline_statistics_query_tests_ARB.functional_compute_shader_invocations,Fail
+KHR-GL46.pipeline_statistics_query_tests_ARB.functional_default_qo_values,Fail
+KHR-GL46.pipeline_statistics_query_tests_ARB.functional_fragment_shader_invocations,Fail
+KHR-GL46.pipeline_statistics_query_tests_ARB.functional_geometry_shader_queries,Fail
+KHR-GL46.pipeline_statistics_query_tests_ARB.functional_non_rendering_commands_do_not_affect_queries,Fail
+KHR-GL46.pipeline_statistics_query_tests_ARB.functional_primitives_vertices_submitted_and_clipping_input_output_primitives,Fail
+KHR-GL46.pipeline_statistics_query_tests_ARB.functional_tess_queries,Fail
+KHR-GL46.pipeline_statistics_query_tests_ARB.functional_vertex_shader_invocations,Fail
+KHR-GL46.separable_programs_tf.geometry_active,Fail
+KHR-GL46.separable_programs_tf.tessellation_active,Fail
+KHR-GL46.shader_bitfield_operation.bitCount.ivec4_2,Crash
+KHR-GL46.shader_bitfield_operation.bitfieldExtract.int_1,Crash
+KHR-GL46.shader_bitfield_operation.bitfieldExtract.ivec2_1,Crash
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.ivec3_0,Crash
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.ivec3_3,Crash
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.ivec4_0,Crash
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.uvec4_2,Crash
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.uvec4_3,Crash
+KHR-GL46.shader_bitfield_operation.bitfieldReverse.ivec3_1,Crash
+KHR-GL46.shader_bitfield_operation.bitfieldReverse.ivec4_3,Crash
+KHR-GL46.shader_bitfield_operation.bitfieldReverse.uvec4_1,Crash
+KHR-GL46.shader_bitfield_operation.findLSB.ivec2_1,Crash
+KHR-GL46.shader_bitfield_operation.findLSB.uvec2_2,Crash
+KHR-GL46.shader_image_load_store.non-layered_binding,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset.rgba32f.samples_2,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset.rgba32f.samples_4,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset.rgba8.samples_2,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset.rgba8.samples_4,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset.rgba8i.samples_2,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset.rgba8i.samples_4,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset.rgba8ui.samples_2,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset.rgba8ui.samples_4,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba32f.samples_1,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba32f.samples_2,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba32f.samples_4,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba8.samples_1,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba8.samples_2,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba8.samples_4,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba8i.samples_1,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba8i.samples_2,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba8i.samples_4,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba8ui.samples_1,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba8ui.samples_2,Fail
+KHR-GL46.shader_multisample_interpolation.render.interpolate_at_offset_check.rgba8ui.samples_4,Fail
+KHR-GL46.sparse_buffer_tests.BufferStorageTest,Crash
+KHR-GL46.sparse_texture2_tests.SparseTexture2Commitment,Fail
+KHR-GL46.sparse_texture2_tests.SparseTexture2Lookup,Fail
+KHR-GL46.sparse_texture2_tests.StandardPageSizesTestCase,Fail
+KHR-GL46.sparse_texture2_tests.UncommittedRegionsAccess,Fail
+KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.data_pass_through,Fail
+KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize,Fail
+KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_PatchVerticesIn,Fail
+KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_tessLevel,Fail
+KHR-GL46.tessellation_shader.tessellation_invariance.invariance_rule1,Crash
+KHR-GL46.tessellation_shader.tessellation_invariance.invariance_rule2,Crash
+KHR-GL46.tessellation_shader.tessellation_invariance.invariance_rule3,Crash
+KHR-GL46.tessellation_shader.tessellation_invariance.invariance_rule4,Crash
+KHR-GL46.tessellation_shader.tessellation_invariance.invariance_rule5,Crash
+KHR-GL46.tessellation_shader.tessellation_invariance.invariance_rule6,Crash
+KHR-GL46.tessellation_shader.tessellation_invariance.invariance_rule7,Crash
+KHR-GL46.tessellation_shader.tessellation_shader_point_mode.points_verification,Fail
+KHR-GL46.tessellation_shader.tessellation_shader_quads_tessellation.degenerate_case,Fail
+KHR-GL46.tessellation_shader.tessellation_shader_quads_tessellation.inner_tessellation_level_rounding,Fail
+KHR-GL46.tessellation_shader.tessellation_shader_tc_barriers.barrier_guarded_write_calls,Fail
+KHR-GL46.tessellation_shader.tessellation_shader_tessellation.TCS_TES,Fail
+KHR-GL46.tessellation_shader.tessellation_shader_tessellation.TES,Fail
+KHR-GL46.tessellation_shader.tessellation_shader_tessellation.gl_InvocationID_PatchVerticesIn_PrimitiveID,Fail
+KHR-GL46.tessellation_shader.tessellation_shader_triangles_tessellation.identical_triangles,Fail
+KHR-GL46.tessellation_shader.tessellation_shader_triangles_tessellation.inner_tessellation_level_rounding,Fail
+KHR-GL46.tessellation_shader.vertex.vertex_ordering,Fail
+KHR-GL46.tessellation_shader.vertex.vertex_spacing,Fail
+KHR-GL46.texture_swizzle.smoke,Timeout
+KHR-GL46.texture_view.reference_counting,Fail
+KHR-GL46.texture_view.view_classes,Fail
+KHR-GL46.texture_view.view_sampling,Fail
+KHR-GL46.transform_feedback.capture_geometry_interleaved_test,Fail
+KHR-GL46.transform_feedback.capture_geometry_separate_test,Fail
+KHR-GL46.transform_feedback.capture_vertex_separate_test,Fail
+KHR-GL46.transform_feedback.draw_xfb_feedbackk_test,Fail
+KHR-GL46.transform_feedback.draw_xfb_instanced_test,Fail
+KHR-GL46.transform_feedback.draw_xfb_stream_instanced_test,Fail
+KHR-GL46.transform_feedback.draw_xfb_stream_test,Fail
+KHR-GL46.transform_feedback.draw_xfb_test,Fail
+KHR-GL46.transform_feedback.query_geometry_interleaved_test,Fail
+KHR-GL46.transform_feedback.query_geometry_separate_test,Fail
+KHR-GL46.transform_feedback.query_vertex_interleaved_test,Fail
+KHR-GL46.transform_feedback.query_vertex_separate_test,Fail
+KHR-GL46.transform_feedback_overflow_query_ARB.advanced-single-stream-interleaved-attribs,Fail
+KHR-GL46.transform_feedback_overflow_query_ARB.advanced-single-stream-separate-attribs,Fail
+KHR-GL46.transform_feedback_overflow_query_ARB.basic-single-stream-interleaved-attribs,Fail
+KHR-GL46.transform_feedback_overflow_query_ARB.basic-single-stream-separate-attribs,Fail
+KHR-GL46.transform_feedback_overflow_query_ARB.multiple-streams-multiple-buffers-per-stream,Fail
+KHR-GL46.transform_feedback_overflow_query_ARB.multiple-streams-one-buffer-per-stream,Fail
diff --git a/src/gallium/drivers/zink/ci/zink-nv-flakes.txt b/src/gallium/drivers/zink/ci/zink-nv-flakes.txt
new file mode 100644
index 00000000000..0e2b7f1c3f0
--- /dev/null
+++ b/src/gallium/drivers/zink/ci/zink-nv-flakes.txt
@@ -0,0 +1,23 @@
+GTF-GL46.gtf30.GL3Tests.conditional_render.conditional_render_test3
+GTF-GL46.gtf30.GL3Tests.conditional_render.conditional_render_test4
+GTF-GL46.gtf42.GL3Tests.transform_feedback_instanced.transform_feedback_instanced_basic
+KHR-GL46.geometry_shader.limits.max_invocations
+KHR-GL46.shader_bitfield_operation.bitCount.ivec2_3
+KHR-GL46.shader_bitfield_operation.bitCount.ivec4_0
+KHR-GL46.shader_bitfield_operation.bitCount.uvec3_0
+KHR-GL46.shader_bitfield_operation.bitCount.uvec4_2
+KHR-GL46.shader_bitfield_operation.bitfieldExtract.ivec2_2
+KHR-GL46.shader_bitfield_operation.bitfieldExtract.uvec2_0
+KHR-GL46.shader_bitfield_operation.bitfieldExtract.uvec3_2
+KHR-GL46.shader_bitfield_operation.bitfieldExtract.uvec4_0
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.int_0
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.ivec4_1
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.ivec4_3
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.uvec2_1
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.uvec2_3
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.uvec3_3
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.uvec4_0
+KHR-GL46.shader_bitfield_operation.bitfieldInsert.uvec4_1
+KHR-GL46.shader_bitfield_operation.bitfieldReverse.uvec2_2
+KHR-GL46.shader_bitfield_operation.findLSB.int_2
+KHR-GL46.texture_swizzle.functional