diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index ed6d7889a..044bc0354 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -169,11 +169,20 @@ steps:
       - GOOS=linux GOARCH=mips go build $$PACKAGES
 
   # GPU workflow.
+  - <<: *common
+    <<: *source_test
+    label: ":firefighter: GPU Smoke Test"
+    commands:
+      - make sudo TARGETS=//tools/gpu:main ARGS="install --latest" || cat /var/log/nvidia-installer.log
+      - make gpu-tests
+    agents:
+      queue: gpu
   - <<: *common
     <<: *source_test
     label: ":screwdriver: All GPU Drivers Test"
     commands:
       - tools/gpu/all_drivers_test.sh
+    if: build.branch == "master"
     agents:
       queue: gpu
   # Release workflow.