diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5c2a6e6750..6fc634597a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -262,6 +262,10 @@ if(BUILD_TESTING)
     unset(_sysctl_stdout)
   endif()
 
+  if(CMake_TEST_CUDA AND NOT CMake_TEST_CUDA MATCHES "^(NVIDIA|Clang)$")
+    message(FATAL_ERROR "CMake_TEST_CUDA should be \"NVIDIA\" or \"Clang\", got \"${CMake_TEST_CUDA}\"")
+  endif()
+
   #---------------------------------------------------------------------------
   # Add tests below here.
 
diff --git a/Tests/ExportImport/InitialCache.cmake.in b/Tests/ExportImport/InitialCache.cmake.in
index 55aef86b24..0494d40459 100644
--- a/Tests/ExportImport/InitialCache.cmake.in
+++ b/Tests/ExportImport/InitialCache.cmake.in
@@ -14,5 +14,5 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@" CACHE STRI
 set(CMAKE_INSTALL_PREFIX "@ExportImport_BINARY_DIR@/Root" CACHE STRING "Installation Prefix")
 set(CMAKE_SKIP_RPATH ON CACHE BOOL "No RPATH")
 set(CMAKE_GNUtoMS "@ExportImport_GNUtoMS@" CACHE BOOL "CMAKE_GNUtoMS")
-set(CMake_TEST_CUDA "@CMake_TEST_CUDA@" CACHE BOOL "CMake_TEST_CUDA")
+set(CMake_TEST_CUDA "@CMake_TEST_CUDA@" CACHE STRING "CMake_TEST_CUDA")
 set(Foo_DIR "@CMAKE_CURRENT_SOURCE_DIR@/External" CACHE PATH "Foo cmake package directory")
diff --git a/Tests/RunCMake/GenEx-TARGET_OBJECTS/SOURCE_FILES.cmake b/Tests/RunCMake/GenEx-TARGET_OBJECTS/SOURCE_FILES.cmake
index 4f39a40989..1727847ac0 100644
--- a/Tests/RunCMake/GenEx-TARGET_OBJECTS/SOURCE_FILES.cmake
+++ b/Tests/RunCMake/GenEx-TARGET_OBJECTS/SOURCE_FILES.cmake
@@ -26,13 +26,13 @@ check_target_objects(multi_duplicate
 
 add_subdirectory(SOURCE_FILES_subdir)
 
-if(CMake_TEST_CUDA)
+if(CMake_TEST_CUDA STREQUAL "NVIDIA")
   enable_language(CUDA)
 
   include(CheckIPOSupported)
   check_ipo_supported(RESULT ipo_supported LANGUAGES CUDA)
 
-  if(ipo_supported AND CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
+  if(ipo_supported)
     add_library(fatbin_objs OBJECT EXCLUDE_FROM_ALL empty1.cu empty2.cu)
     set_target_properties(fatbin_objs PROPERTIES
       CUDA_SEPARABLE_COMPILATION ON