diff --git a/lib/MLDataDevices/.buildkite/pipeline.yml b/lib/MLDataDevices/.buildkite/pipeline.yml
index 1e9319d66..ab47ede27 100644
--- a/lib/MLDataDevices/.buildkite/pipeline.yml
+++ b/lib/MLDataDevices/.buildkite/pipeline.yml
@@ -16,7 +16,7 @@ steps:
           queue: "juliagpu"
           cuda: "*"
         env:
-          GROUP: "CUDA"
+          BACKEND_GROUP: "CUDA"
         if: build.message !~ /\[skip tests\]/
         timeout_in_minutes: 60
         matrix:
@@ -61,7 +61,7 @@ steps:
           queue: "juliagpu"
           cuda: "*"
         env:
-          GROUP: "CUDA"
+          BACKEND_GROUP: "CUDA"
           DOWNSTREAM_TEST_REPO: "{{matrix.repo}}"
         if: build.message !~ /\[skip tests\]/ || build.message !~ /\[skip downstream\]/
         timeout_in_minutes: 240
@@ -90,7 +90,7 @@ steps:
           JULIA_AMDGPU_CORE_MUST_LOAD: "1"
           JULIA_AMDGPU_HIP_MUST_LOAD: "1"
           JULIA_AMDGPU_DISABLE_ARTIFACTS: "1"
-          GROUP: "AMDGPU"
+          BACKEND_GROUP: "AMDGPU"
         agents:
           queue: "juliagpu"
           rocm: "*"
@@ -140,7 +140,7 @@ steps:
           rocm: "*"
           rocmgpu: "*"
         env:
-          GROUP: "AMDGPU"
+          BACKEND_GROUP: "AMDGPU"
           JULIA_AMDGPU_CORE_MUST_LOAD: "1"
           JULIA_AMDGPU_HIP_MUST_LOAD: "1"
           JULIA_AMDGPU_DISABLE_ARTIFACTS: "1"
@@ -173,7 +173,7 @@ steps:
           os: "macos"
           arch: "aarch64"
         env:
-          GROUP: "Metal"
+          BACKEND_GROUP: "Metal"
         if: build.message !~ /\[skip tests\]/
         timeout_in_minutes: 60
         matrix:
@@ -195,7 +195,7 @@ steps:
                 - src
                 - ext
         env:
-          GROUP: "oneAPI"
+          BACKEND_GROUP: "oneAPI"
         agents:
           queue: "juliagpu"
           intel: "*"
diff --git a/lib/MLDataDevices/.github/workflows/CI.yml b/lib/MLDataDevices/.github/workflows/CI.yml
index 16b0c1b43..8d4a0031e 100644
--- a/lib/MLDataDevices/.github/workflows/CI.yml
+++ b/lib/MLDataDevices/.github/workflows/CI.yml
@@ -73,7 +73,7 @@ jobs:
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
         env:
-          GROUP: Metal
+          BACKEND_GROUP: Metal
       - uses: julia-actions/julia-processcoverage@v1
         with:
           directories: src,ext
diff --git a/lib/MLDataDevices/.github/workflows/Downgrade.yml b/lib/MLDataDevices/.github/workflows/Downgrade.yml
index 269275ed5..c13009878 100644
--- a/lib/MLDataDevices/.github/workflows/Downgrade.yml
+++ b/lib/MLDataDevices/.github/workflows/Downgrade.yml
@@ -27,7 +27,6 @@ jobs:
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
         env:
-          GROUP: "CPU"
           RETESTITEMS_NWORKERS: 4
           RETESTITEMS_NWORKER_THREADS: 2
       - uses: julia-actions/julia-processcoverage@v1
diff --git a/lib/MLDataDevices/.github/workflows/Downstream.yml b/lib/MLDataDevices/.github/workflows/Downstream.yml
index 3c424d6a7..a3256eae0 100644
--- a/lib/MLDataDevices/.github/workflows/Downstream.yml
+++ b/lib/MLDataDevices/.github/workflows/Downstream.yml
@@ -16,16 +16,16 @@ jobs:
     name: ${{ matrix.package.repo }}/${{ matrix.package.group }}
     runs-on: ${{ matrix.os }}
     env:
-      GROUP: ${{ matrix.package.group }}
+      BACKEND_GROUP: ${{ matrix.package.group }}
     strategy:
       fail-fast: false
       matrix:
         julia-version: ["1"]
         os: [ubuntu-latest]
         package:
-          - { user: LuxDL, repo: Lux.jl, group: All }
-          - { user: LuxDL, repo: Boltz.jl, group: All }
-          - { user: LuxDL, repo: LuxTestUtils.jl, group: All }
+          - { user: LuxDL, repo: Lux.jl, group: CPU }
+          - { user: LuxDL, repo: Boltz.jl, group: CPU }
+          - { user: LuxDL, repo: LuxTestUtils.jl, group: CPU }
     steps:
       - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@v2
diff --git a/lib/MLDataDevices/test/runtests.jl b/lib/MLDataDevices/test/runtests.jl
index d63a17cb8..d73d63ae3 100644
--- a/lib/MLDataDevices/test/runtests.jl
+++ b/lib/MLDataDevices/test/runtests.jl
@@ -1,25 +1,25 @@
 import Pkg
 using Aqua, SafeTestsets, Test, LuxDeviceUtils, TestSetExtensions
 
-const GROUP = get(ENV, "GROUP", "NONE")
+const BACKEND_GROUP = get(ENV, "BACKEND_GROUP", "NONE")
 
 @testset ExtendedTestSet "LuxDeviceUtils Tests" begin
-    if GROUP == "CUDA" || GROUP == "ALL"
+    if BACKEND_GROUP == "CUDA" || BACKEND_GROUP == "ALL"
         Pkg.add("LuxCUDA")
         @safetestset "CUDA" include("cuda.jl")
     end
 
-    if GROUP == "AMDGPU" || GROUP == "ALL"
+    if BACKEND_GROUP == "AMDGPU" || BACKEND_GROUP == "ALL"
         Pkg.add("AMDGPU")
         @safetestset "AMDGPU" include("amdgpu.jl")
     end
 
-    if GROUP == "Metal" || GROUP == "ALL"
+    if BACKEND_GROUP == "Metal" || BACKEND_GROUP == "ALL"
         Pkg.add("Metal")
         @safetestset "Metal" include("metal.jl")
     end
 
-    if GROUP == "oneAPI" || GROUP == "ALL"
+    if BACKEND_GROUP == "oneAPI" || BACKEND_GROUP == "ALL"
         Pkg.add("oneAPI")
         @safetestset "oneAPI" include("oneapi.jl")
     end