diff --git a/.buildkite/test-template.j2 b/.buildkite/test-template.j2
index e94538bc996a..a050319920fa 100644
--- a/.buildkite/test-template.j2
+++ b/.buildkite/test-template.j2
@@ -16,6 +16,10 @@ steps:
     agents:
       queue: kubernetes
     soft_fail: {{ step.soft_fail or false }}
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 5
     plugins:
       - kubernetes:
           podSpec: