diff --git a/.buildkite/test-template.j2 b/.buildkite/test-template.j2
index ce448836a82..2904944cf57 100644
--- a/.buildkite/test-template.j2
+++ b/.buildkite/test-template.j2
@@ -29,7 +29,7 @@ steps:
     agents:
       queue: amd_gpu
     commands: 
-      - bash .buildkite/run-amd-test.sh "cd {{ (step.working_dir or default_working_dir) | safe  }} ; {{ step.command  or (step.commands | join(" && ")) | safe }}"
+      - bash .buildkite/run-amd-test.sh "cd {{ (default_working_dir) | safe  }} ; {{ step.command  or (step.commands | join(" && ")) | safe }}"
     env:
       DOCKER_BUILDKIT: "1"
     priority: 100