diff --git a/unit_test/sparse/Test_Sparse_spmv_blockcrs.hpp b/unit_test/sparse/Test_Sparse_spmv_blockcrs.hpp
index c30923a5bf..a96af6973e 100644
--- a/unit_test/sparse/Test_Sparse_spmv_blockcrs.hpp
+++ b/unit_test/sparse/Test_Sparse_spmv_blockcrs.hpp
@@ -500,229 +500,28 @@ void testBlockCrsMatrix_SpM_MV() {
                               DEVICE>();                                                        \
   }
 
-#if (defined(KOKKOSKERNELS_INST_DOUBLE) &&      \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&        \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
 #if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(double, int, int, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(double, int, int, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_DOUBLE) &&          \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) ||     \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&            \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(double, int64_t, int, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(double, int64_t, int, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_DOUBLE) &&         \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) &&    \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&           \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(double, int, size_t, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(double, int, size_t, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_DOUBLE) &&          \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) ||  \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&            \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(double, int64_t, size_t, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(double, int64_t, size_t, LayoutRight,
-                             TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_FLOAT) &&       \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&        \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(float, int, int, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(float, int, int, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_FLOAT) &&           \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) ||     \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&            \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(float, int64_t, int, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(float, int64_t, int, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_FLOAT) &&          \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) &&    \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&           \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(float, int, size_t, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(float, int, size_t, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_FLOAT) &&           \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) ||  \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&            \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(float, int64_t, size_t, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(float, int64_t, size_t, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) &&            \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) ||            \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                   \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_double, int, int, LayoutLeft,
-                             TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_double, int, int, LayoutRight,
-                             TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) &&        \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) ||            \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                   \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_double, int64_t, int, LayoutLeft,
-                             TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_double, int64_t, int, LayoutRight,
-                             TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) &&            \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) ||         \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                   \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_double, int, size_t, LayoutLeft,
-                             TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_double, int, size_t, LayoutRight,
-                             TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) &&        \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) ||         \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                   \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_double, int64_t, size_t, LayoutLeft,
-                             TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_double, int64_t, size_t,
-                             LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) &&           \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) ||           \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                  \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_float, int, int, LayoutLeft,
-                             TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_float, int, int, LayoutRight,
-                             TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) &&       \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) ||           \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                  \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_float, int64_t, int, LayoutLeft,
-                             TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_float, int64_t, int, LayoutRight,
-                             TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) &&           \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) ||        \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                  \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_float, int, size_t, LayoutLeft,
-                             TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_float, int, size_t, LayoutRight,
-                             TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) &&       \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) ||        \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                  \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_float, int64_t, size_t, LayoutLeft,
-                             TestExecSpace)
-#endif
+
+#define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE) \
+  EXECUTE_BCRS_TIMES_MVEC_TEST(SCALAR, ORDINAL, OFFSET, LayoutLeft, \
+                               TestExecSpace)
+
+#include <Test_Common_Test_All_Type_Combos.hpp>
+
+#undef KOKKOSKERNELS_EXECUTE_TEST
+
+#endif  // KOKKOSKERNELS_INST_LAYOUTLEFT
+
 #if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BCRS_TIMES_MVEC_TEST(kokkos_complex_float, int64_t, size_t, LayoutRight,
-                             TestExecSpace)
-#endif
-#endif
+
+#define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE)  \
+  EXECUTE_BCRS_TIMES_MVEC_TEST(SCALAR, ORDINAL, OFFSET, LayoutRight, \
+                               TestExecSpace)
+
+#include <Test_Common_Test_All_Type_Combos.hpp>
+
+#undef KOKKOSKERNELS_EXECUTE_TEST
+
+#endif  // KOKKOSKERNELS_INST_LAYOUTRIGHT
 
 #undef EXECUTE_BCRS_TIMES_MVEC_TEST
diff --git a/unit_test/sparse/Test_Sparse_spmv_bsr.hpp b/unit_test/sparse/Test_Sparse_spmv_bsr.hpp
index 25b44b4e7e..344a203567 100644
--- a/unit_test/sparse/Test_Sparse_spmv_bsr.hpp
+++ b/unit_test/sparse/Test_Sparse_spmv_bsr.hpp
@@ -609,228 +609,28 @@ void testBsrMatrix_SpM_MV() {
     testBsrMatrix_SpM_MV<SCALAR, ORDINAL, OFFSET, Kokkos::LAYOUT, DEVICE>();                      \
   }
 
-#if (defined(KOKKOSKERNELS_INST_DOUBLE) &&      \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&        \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
 #if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(double, int, int, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(double, int, int, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_DOUBLE) &&          \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) ||     \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&            \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(double, int64_t, int, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(double, int64_t, int, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_DOUBLE) &&         \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) &&    \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&           \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(double, int, size_t, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(double, int, size_t, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_DOUBLE) &&          \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) ||  \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&            \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(double, int64_t, size_t, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(double, int64_t, size_t, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_FLOAT) &&       \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&        \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(float, int, int, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(float, int, int, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_FLOAT) &&           \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) ||     \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&            \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(float, int64_t, int, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(float, int64_t, int, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_FLOAT) &&          \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) &&    \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&           \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(float, int, size_t, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(float, int, size_t, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_FLOAT) &&           \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) ||  \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&            \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(float, int64_t, size_t, LayoutLeft, TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(float, int64_t, size_t, LayoutRight, TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) &&            \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) ||            \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                   \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_double, int, int, LayoutLeft,
-                            TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_double, int, int, LayoutRight,
-                            TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) &&        \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) ||            \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                   \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_double, int64_t, int, LayoutLeft,
-                            TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_double, int64_t, int, LayoutRight,
-                            TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) &&            \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) ||         \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                   \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_double, int, size_t, LayoutLeft,
-                            TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_double, int, size_t, LayoutRight,
-                            TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) &&        \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) ||         \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                   \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_double, int64_t, size_t, LayoutLeft,
-                            TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_double, int64_t, size_t, LayoutRight,
-                            TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) &&           \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) ||           \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                  \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_float, int, int, LayoutLeft,
-                            TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_float, int, int, LayoutRight,
-                            TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) &&       \
-     defined(KOKKOSKERNELS_INST_OFFSET_INT)) ||           \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                  \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_float, int64_t, int, LayoutLeft,
-                            TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_float, int64_t, int, LayoutRight,
-                            TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT) &&           \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) ||        \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                  \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_float, int, size_t, LayoutLeft,
-                            TestExecSpace)
-#endif
-#if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_float, int, size_t, LayoutRight,
-                            TestExecSpace)
-#endif
-#endif
-
-#if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) && \
-     defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) &&       \
-     defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) ||        \
-    (!defined(KOKKOSKERNELS_ETI_ONLY) &&                  \
-     !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
-#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_float, int64_t, size_t, LayoutLeft,
-                            TestExecSpace)
-#endif
+
+#define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE) \
+  EXECUTE_BSR_TIMES_MVEC_TEST(SCALAR, ORDINAL, OFFSET, LayoutLeft,  \
+                              TestExecSpace)
+
+#include <Test_Common_Test_All_Type_Combos.hpp>
+
+#undef KOKKOSKERNELS_EXECUTE_TEST
+
+#endif  // KOKKOSKERNELS_INST_LAYOUTLEFT
+
 #if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
-EXECUTE_BSR_TIMES_MVEC_TEST(kokkos_complex_float, int64_t, size_t, LayoutRight,
-                            TestExecSpace)
-#endif
-#endif
+
+#define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE) \
+  EXECUTE_BSR_TIMES_MVEC_TEST(SCALAR, ORDINAL, OFFSET, LayoutRight, \
+                              TestExecSpace)
+
+#include <Test_Common_Test_All_Type_Combos.hpp>
+
+#undef KOKKOSKERNELS_EXECUTE_TEST
+
+#endif  // KOKKOSKERNELS_INST_LAYOUTRIGHT
 
 #undef EXECUTE_BSR_TIMES_MVEC_TEST