diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ecabd3e0a..24e2a8083 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -2,58 +2,25 @@ env:
   SECRET_CODECOV_TOKEN: "ZJoKq7+gD0BKAkXuHUEodQYl492UA38uoOMs336yjV8yas4Zmk4I2LPDq9tc4Rf86xM8eDF5wCnYuWAz+HMHQRDVh3TNc6yeA47/XWBuvcwT3pPtACKVrPd4wsoHQWBdbu4K7ZirGyuOscdQuVfBNUAoHH6dpcZw6ycHqHP6T8kgi1wb04lnCon23RnpZjEmL+o2rTh150db5nW8aOCJmHgZbIlQD8MCeShGhn3hBSxgVmVKwentxIfKetdJRtxfLTirgY7geoON5NEJBGbRUHpAiB+H66XcbeeJBfqE39gRc9dnjw4ZXKXyeLLNdVxnIYmmDF/XoyEV8uO9bwJLAQ==;U2FsdGVkX1+fLOI1HLKI6tX4Owg4Z035yq6HUZVgjbR9LFZwMqkuxamG8j1ju97bx6q1cieWOpepTtScT1rGcQ=="
 
 steps:
-  - label: "Julia v1 -- CUDA"
+  - label: "Julia {{matrix.julia}} -- {{matrix.queue}}"
     plugins:
       - JuliaCI/julia#v1:
-          version: "1"
-      - JuliaCI/julia-test#v1: ~
+          version: "{{matrix.julia}}"
+      - JuliaCI/julia-test#v1:
+          test_args: "gpu/{{matrix.queue}}"
       - JuliaCI/julia-coverage#v1:
           dirs:
             - src
             - ext
     agents:
-      queue: "cuda"
-    if: build.message !~ /\[skip tests\]/
-    timeout_in_minutes: 60
-
-  - label: "Julia LTS -- CUDA"
-    plugins:
-      - JuliaCI/julia#v1:
-          version: "1.10" # "lts" isn't valid
-      - JuliaCI/julia-test#v1: ~
-      - JuliaCI/julia-coverage#v1:
-          dirs:
-            - src
-            - ext
-    agents:
-      queue: "cuda"
-    if: build.message !~ /\[skip tests\]/
-    timeout_in_minutes: 60
-
-  - label: "Julia v1 -- AMDGPU"
-    plugins:
-      - JuliaCI/julia#v1:
-          version: "1"
-      - JuliaCI/julia-test#v1: ~
-      - JuliaCI/julia-coverage#v1:
-          dirs:
-            - src
-            - ext
-    agents:
-      queue: "rocm"
-    if: build.message !~ /\[skip tests\]/
-    timeout_in_minutes: 90
-
-  - label: "Julia LTS -- AMDGPU"
-    plugins:
-      - JuliaCI/julia#v1:
-          version: "1.10" # "lts" isn't valid
-      - JuliaCI/julia-test#v1: ~
-      - JuliaCI/julia-coverage#v1:
-          dirs:
-            - src
-            - ext
-    agents:
-      queue: "rocm"
+      queue: "{{matrix.queue}}"
     if: build.message !~ /\[skip tests\]/
     timeout_in_minutes: 90
+    matrix:
+      setup:
+        julia:
+          - "1.10"
+          - "1.12"
+        queue:
+          - "cuda"
+          - "rocm"
diff --git a/test/gpu/amd/allocator.jl b/test/gpu/rocm/allocator.jl
similarity index 100%
rename from test/gpu/amd/allocator.jl
rename to test/gpu/rocm/allocator.jl
diff --git a/test/gpu/amd/operators.jl b/test/gpu/rocm/operators.jl
similarity index 100%
rename from test/gpu/amd/operators.jl
rename to test/gpu/rocm/operators.jl
diff --git a/test/gpu/amd/roc_adapt.jl b/test/gpu/rocm/roc_adapt.jl
similarity index 100%
rename from test/gpu/amd/roc_adapt.jl
rename to test/gpu/rocm/roc_adapt.jl
diff --git a/test/gpu/amd/states.jl b/test/gpu/rocm/states.jl
similarity index 100%
rename from test/gpu/amd/states.jl
rename to test/gpu/rocm/states.jl