diff --git a/.buildkite/test-template.j2 b/.buildkite/test-template.j2
index cc5f206482621..fb1086db77823 100644
--- a/.buildkite/test-template.j2
+++ b/.buildkite/test-template.j2
@@ -4,11 +4,6 @@
 
 steps:
 
-  - label: "Neuron Test"
-    agents:
-      queue: neuron
-    command: bash .buildkite/run-neuron-test.sh
-
   - label: ":docker: build image"
     commands:
       - "docker build --build-arg max_jobs=16 --tag {{ docker_image }} --target test --progress plain ."
@@ -26,6 +21,11 @@ steps:
       queue: amd
     command: bash .buildkite/run-amd-test.sh
 
+  - label: "Neuron Test"
+    agents:
+      queue: neuron
+    command: bash .buildkite/run-neuron-test.sh
+
   - label: "CPU Test"
     command: bash .buildkite/run-cpu-test.sh