diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 726e42a5b..e8af6414a 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -170,8 +170,8 @@ steps:
 
   # GPU workflow.
   - <<: *common
-    <<: *source_test
-    label: ":firefighter: GPU Smoke Test"
+    <<: *source_test_presubmit
+    label: ":firefighter: GPU Smoke Tests"
     commands:
       - make sudo TARGETS=//tools/gpu:main ARGS="install --latest" || cat /var/log/nvidia-installer.log
       - make gpu-smoke-tests RUNTIME_ARGS="--strace --debug"
@@ -179,9 +179,17 @@ steps:
       queue: gpu
   - <<: *common
     <<: *source_test_continuous
-    label: ":female_supervillain: COS GPU Smoke Test"
+    label: ":screwdriver: GPU Tests"
     commands:
-      - make cos-gpu-smoke-tests RUNTIME_ARGS="--strace --debug"
+      - make sudo TARGETS=//tools/gpu:main ARGS="install --latest" || cat /var/log/nvidia-installer.log
+      - make gpu-all-tests RUNTIME_ARGS="--strace --debug"
+    agents:
+      queue: gpu
+  - <<: *common
+    <<: *source_test_continuous
+    label: ":female_supervillain: COS GPU Tests"
+    commands:
+      - make cos-gpu-all-tests RUNTIME_ARGS="--strace --debug"
     agents:
       queue: cos-canary-gpu
   - <<: *common
@@ -191,6 +199,7 @@ steps:
       - tools/gpu/all_drivers_test.sh
     agents:
       queue: gpu
+
   # Release workflow.
   - <<: *common
     <<: *source_test
diff --git a/.buildkite/release.yaml b/.buildkite/release.yaml
index 49a08c7e9..fe674873d 100644
--- a/.buildkite/release.yaml
+++ b/.buildkite/release.yaml
@@ -48,11 +48,18 @@ steps:
       # The built website image must be x86_64.
       - make BAZEL_OPTIONS=--config=x86_64 website-deploy
   - <<: *common
-    label: ":female_supervillain: COS GPU Smoke Test"
+    label: ":female_supervillain: COS GPU Tests"
     commands:
-      - make cos-gpu-smoke-tests RUNTIME_ARGS="--strace --debug"
+      - make cos-gpu-all-tests RUNTIME_ARGS="--strace --debug"
     agents:
       queue: cos-canary-gpu
+  - <<: *common
+    label: ":screwdriver: GPU Tests"
+    commands:
+      - make sudo TARGETS=//tools/gpu:main ARGS="install --latest" || cat /var/log/nvidia-installer.log
+      - make gpu-all-tests RUNTIME_ARGS="--strace --debug"
+    agents:
+      queue: gpu
   - <<: *common
     label: ":screwdriver: All GPU Drivers Test"
     commands: