diff --git a/tests/unit_tests/include/test_helper.hpp b/tests/unit_tests/include/test_helper.hpp
index cdeceec1e..5457079e0 100644
--- a/tests/unit_tests/include/test_helper.hpp
+++ b/tests/unit_tests/include/test_helper.hpp
@@ -210,7 +210,7 @@
         TEST_RUN_PORTFFT_SELECT_NO_ARGS(q, func);                          \
     } while (0);
 
-#define TEST_RUN_CT_SELECT(q, func, ...)                                   \
+#define TEST_RUN_BLAS_CT_SELECT(q, func, ...)                              \
     do {                                                                   \
         if (CHECK_HOST_OR_CPU(q))                                          \
             TEST_RUN_INTELCPU_SELECT(q, func, __VA_ARGS__);                \
@@ -221,22 +221,15 @@
                 TEST_RUN_INTELGPU_SELECT(q, func, __VA_ARGS__);            \
             else if (vendor_id == NVIDIA_ID) {                             \
                 TEST_RUN_NVIDIAGPU_CUBLAS_SELECT(q, func, __VA_ARGS__);    \
-                TEST_RUN_NVIDIAGPU_CUSOLVER_SELECT(q, func, __VA_ARGS__);  \
-                TEST_RUN_NVIDIAGPU_CURAND_SELECT(q, func, __VA_ARGS__);    \
-                TEST_RUN_NVIDIAGPU_CUSPARSE_SELECT(q, func, __VA_ARGS__);  \
             }                                                              \
             else if (vendor_id == AMD_ID) {                                \
                 TEST_RUN_AMDGPU_ROCBLAS_SELECT(q, func, __VA_ARGS__);      \
-                TEST_RUN_AMDGPU_ROCRAND_SELECT(q, func, __VA_ARGS__);      \
-                TEST_RUN_AMDGPU_ROCSOLVER_SELECT(q, func, __VA_ARGS__);    \
-                TEST_RUN_AMDGPU_ROCFFT_SELECT(q, func, __VA_ARGS__);       \
             }                                                              \
         }                                                                  \
         TEST_RUN_PORTBLAS_SELECT(q, func, __VA_ARGS__);                    \
-        TEST_RUN_PORTFFT_SELECT(q, func, __VA_ARGS__);                     \
     } while (0);
 
-#define TEST_RUN_BLAS_CT_SELECT(q, func, ...)                              \
+#define TEST_RUN_RNG_CT_SELECT(q, func, ...)                               \
     do {                                                                   \
         if (CHECK_HOST_OR_CPU(q))                                          \
             TEST_RUN_INTELCPU_SELECT(q, func, __VA_ARGS__);                \
@@ -246,16 +239,15 @@
             if (vendor_id == INTEL_ID)                                     \
                 TEST_RUN_INTELGPU_SELECT(q, func, __VA_ARGS__);            \
             else if (vendor_id == NVIDIA_ID) {                             \
-                TEST_RUN_NVIDIAGPU_CUBLAS_SELECT(q, func, __VA_ARGS__);    \
+                TEST_RUN_NVIDIAGPU_CURAND_SELECT(q, func, __VA_ARGS__);    \
             }                                                              \
             else if (vendor_id == AMD_ID) {                                \
-                TEST_RUN_AMDGPU_ROCBLAS_SELECT(q, func, __VA_ARGS__);      \
+                TEST_RUN_AMDGPU_ROCRAND_SELECT(q, func, __VA_ARGS__);      \
             }                                                              \
         }                                                                  \
-        TEST_RUN_PORTBLAS_SELECT(q, func, __VA_ARGS__);                    \
     } while (0);
 
-#define TEST_RUN_RNG_CT_SELECT(q, func, ...)                               \
+#define TEST_RUN_LAPACK_CT_SELECT(q, func, ...)                            \
     do {                                                                   \
         if (CHECK_HOST_OR_CPU(q))                                          \
             TEST_RUN_INTELCPU_SELECT(q, func, __VA_ARGS__);                \
@@ -265,28 +257,26 @@
             if (vendor_id == INTEL_ID)                                     \
                 TEST_RUN_INTELGPU_SELECT(q, func, __VA_ARGS__);            \
             else if (vendor_id == NVIDIA_ID) {                             \
-                TEST_RUN_NVIDIAGPU_CURAND_SELECT(q, func, __VA_ARGS__);    \
+                TEST_RUN_NVIDIAGPU_CUSOLVER_SELECT(q, func, __VA_ARGS__);  \
             }                                                              \
             else if (vendor_id == AMD_ID) {                                \
-                TEST_RUN_AMDGPU_ROCRAND_SELECT(q, func, __VA_ARGS__);      \
+                TEST_RUN_AMDGPU_ROCSOLVER_SELECT(q, func, __VA_ARGS__);    \
             }                                                              \
         }                                                                  \
     } while (0);
 
-#define TEST_RUN_LAPACK_CT_SELECT(q, func, ...)                            \
+#define TEST_RUN_SPARSE_CT_SELECT(q, func, ...)                            \
     do {                                                                   \
         if (CHECK_HOST_OR_CPU(q))                                          \
             TEST_RUN_INTELCPU_SELECT(q, func, __VA_ARGS__);                \
         else if (q.get_device().is_gpu()) {                                \
             unsigned int vendor_id = static_cast<unsigned int>(            \
                 q.get_device().get_info<sycl::info::device::vendor_id>()); \
-            if (vendor_id == INTEL_ID)                                     \
+            if (vendor_id == INTEL_ID) {                                   \
                 TEST_RUN_INTELGPU_SELECT(q, func, __VA_ARGS__);            \
-            else if (vendor_id == NVIDIA_ID) {                             \
-                TEST_RUN_NVIDIAGPU_CUSOLVER_SELECT(q, func, __VA_ARGS__);  \
             }                                                              \
-            else if (vendor_id == AMD_ID) {                                \
-                TEST_RUN_AMDGPU_ROCSOLVER_SELECT(q, func, __VA_ARGS__);    \
+            else if (vendor_id == NVIDIA_ID) {                             \
+                TEST_RUN_NVIDIAGPU_CUSPARSE_SELECT(q, func, __VA_ARGS__);  \
             }                                                              \
         }                                                                  \
     } while (0);
diff --git a/tests/unit_tests/sparse_blas/include/test_common.hpp b/tests/unit_tests/sparse_blas/include/test_common.hpp
index 325930206..180c355cd 100644
--- a/tests/unit_tests/sparse_blas/include/test_common.hpp
+++ b/tests/unit_tests/sparse_blas/include/test_common.hpp
@@ -39,7 +39,7 @@
 #ifdef CALL_RT_API
 #define CALL_RT_OR_CT(FUNC, QUEUE, ...) FUNC(QUEUE, __VA_ARGS__)
 #else
-#define CALL_RT_OR_CT(FUNC, QUEUE, ...) TEST_RUN_CT_SELECT(QUEUE, FUNC, __VA_ARGS__);
+#define CALL_RT_OR_CT(FUNC, QUEUE, ...) TEST_RUN_SPARSE_CT_SELECT(QUEUE, FUNC, __VA_ARGS__);
 #endif
 
 template <typename T>