diff --git a/cmake/KokkosKernels_config.h.in b/cmake/KokkosKernels_config.h.in
index 9326edc47a..db9719c3f9 100644
--- a/cmake/KokkosKernels_config.h.in
+++ b/cmake/KokkosKernels_config.h.in
@@ -119,6 +119,13 @@
 #endif
 #endif
 
+#if !defined(KOKKOS_ENABLE_CUDA) \
+  && !defined(KOKKOS_ENABLE_HIP) \
+  && !defined(KOKKOS_ENABLE_SYCL) \
+  && !defined(KOKKOS_ENABLE_OPENMPTARGET)
+#define KOKKOSKERNELS_ENABLE_HOST_ONLY
+#endif
+
 
 /*
  * "Optimization level" for computational kernels in this subpackage.
diff --git a/unit_test/cuda/Test_Cuda_Batched.cpp b/unit_test/cuda/Test_Cuda_Batched.cpp
index 6408957eff..517843a020 100644
--- a/unit_test/cuda/Test_Cuda_Batched.cpp
+++ b/unit_test/cuda/Test_Cuda_Batched.cpp
@@ -1,9 +1,7 @@
 #ifndef TEST_CUDA_BATCHED_CPP
 #define TEST_CUDA_BATCHED_CPP
-#define KOKKOSKERNELS_CUDA_BATCHED_TESTS
 
 #include<Test_Cuda.hpp>
 #include<Test_Batched.hpp>
 
-#undef KOKKOSKERNELS_CUDA_BATCHED_TESTS
 #endif // TEST_CUDA_BATCHED_CPP