diff --git a/test/lq.jl b/test/lq.jl
index 6829e935..f9eedd5f 100644
--- a/test/lq.jl
+++ b/test/lq.jl
@@ -18,7 +18,7 @@ for T in (BLASFloats..., GenericFloats...), n in (37, m, 63)
     TestSuite.seed_rng!(123)
     if T ∈ BLASFloats
         if CUDA.functional()
-            CUDA_LQ_ALGS = LQViaTransposedQR.(CUSOLVER_HouseholderLQ(; positive = false), CUSOLVER_HouseholderLQ(; positive = true))
+            CUDA_LQ_ALGS = LQViaTransposedQR.((CUSOLVER_HouseholderQR(; positive = false), CUSOLVER_HouseholderQR(; positive = true)))
             TestSuite.test_lq(CuMatrix{T}, (m, n); test_pivoted = false, test_blocksize = false)
             TestSuite.test_lq_algs(CuMatrix{T}, (m, n), CUDA_LQ_ALGS)
             if n == m
@@ -27,9 +27,9 @@ for T in (BLASFloats..., GenericFloats...), n in (37, m, 63)
             end
         end
         if AMDGPU.functional()
-            ROC_LQ_ALGS = LQViaTransposedQR.(ROCSOLVER_HouseholderLQ(; positive = false), ROCSOLVER_HouseholderLQ(; positive = true))
+            ROC_LQ_ALGS = LQViaTransposedQR.((ROCSOLVER_HouseholderQR(; positive = false), ROCSOLVER_HouseholderQR(; positive = true)))
             TestSuite.test_lq(ROCMatrix{T}, (m, n); test_pivoted = false, test_blocksize = false)
-            TestSuite.test_lq_algs(ROCMatrix{T}, (m, n), CUDA_LQ_ALGS)
+            TestSuite.test_lq_algs(ROCMatrix{T}, (m, n), ROC_LQ_ALGS)
             if n == m
                 TestSuite.test_lq(Diagonal{T, ROCVector{T}}, m; test_pivoted = false, test_blocksize = false)
                 TestSuite.test_lq_algs(Diagonal{T, ROCVector{T}}, m, (DiagonalAlgorithm(),))
diff --git a/test/runtests.jl b/test/runtests.jl
index 392bd490..37796e2a 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,8 +1,8 @@
 using SafeTestsets
 
+is_buildkite = get(ENV, "BUILDKITE", "false") == "true"
 # don't run all tests on GPU, only the GPU
 # specific ones
-is_buildkite = get(ENV, "BUILDKITE", "false") == "true"
 if !is_buildkite
     @safetestset "Algorithms" begin
         include("algorithms.jl")
@@ -13,10 +13,6 @@ if !is_buildkite
     @safetestset "Truncate" begin
         include("truncate.jl")
     end
-    @safetestset "QR / LQ Decomposition" begin
-        include("qr.jl")
-        include("lq.jl")
-    end
     @safetestset "Singular Value Decomposition" begin
         include("svd.jl")
     end
@@ -71,6 +67,11 @@ if !is_buildkite
     end
 end
 
+@safetestset "QR / LQ Decomposition" begin
+    include("qr.jl")
+    include("lq.jl")
+end
+
 using CUDA
 if CUDA.functional()
     @safetestset "CUDA Projections" begin