diff --git a/elasticsearch-api/spec/yaml-test-runner/run.rb b/elasticsearch-api/spec/yaml-test-runner/run.rb
index 79bdea8cf3..0f66ba00f9 100644
--- a/elasticsearch-api/spec/yaml-test-runner/run.rb
+++ b/elasticsearch-api/spec/yaml-test-runner/run.rb
@@ -68,6 +68,12 @@ def serverless?
       request_timeout: 60
     }
   )
+else
+  options.merge!(
+    retry_on_status: [409, 400],
+    retry_on_failure: 5,
+    delay_on_retry: 1_000
+  )
 end
 CLIENT = Elasticsearch::Client.new(options)