diff --git a/hipify-clang/CMakeLists.txt b/hipify-clang/CMakeLists.txt
index 3394b98dce..470d42c6a5 100644
--- a/hipify-clang/CMakeLists.txt
+++ b/hipify-clang/CMakeLists.txt
@@ -155,30 +155,31 @@ if (HIPIFY_CLANG_TESTS)
     require_program(lit)
     require_program(FileCheck)
 
-    # Populates CUDA_TOOLKIT_ROOT_DIR, which is then applied to the lit config to give the
-    # value of --cuda-path for the test runs.
     find_package(CUDA REQUIRED)
     if ((CUDA_VERSION VERSION_LESS "7.0") OR (LLVM_PACKAGE_VERSION VERSION_LESS "3.8") OR
         (CUDA_VERSION VERSION_GREATER "7.5" AND LLVM_PACKAGE_VERSION VERSION_LESS "4.0") OR
         (CUDA_VERSION VERSION_GREATER "8.0" AND LLVM_PACKAGE_VERSION VERSION_LESS "6.0") OR
         (CUDA_VERSION VERSION_GREATER "9.0" AND LLVM_PACKAGE_VERSION VERSION_LESS "7.0") OR
         (CUDA_VERSION VERSION_GREATER "9.2" AND LLVM_PACKAGE_VERSION VERSION_LESS "8.0") OR
-        (CUDA_VERSION VERSION_GREATER "10.0" AND LLVM_PACKAGE_VERSION VERSION_LESS "9.0"))
-        message(SEND_ERROR "CUDA ${CUDA_VERSION} is not supported by clang ${LLVM_PACKAGE_VERSION}.")
+        (CUDA_VERSION VERSION_GREATER "10.0" AND LLVM_PACKAGE_VERSION VERSION_LESS "9.0") OR
+        (CUDA_VERSION VERSION_GREATER "10.1"))
+        message(SEND_ERROR "CUDA ${CUDA_VERSION} is not supported by LLVM ${LLVM_PACKAGE_VERSION}.")
         if (CUDA_VERSION_MAJOR VERSION_LESS "7")
             message(STATUS "Please install CUDA 7.0 or higher.")
         elseif (CUDA_VERSION_MAJOR VERSION_LESS "8")
-            message(STATUS "Please install clang 3.8 or higher.")
+            message(STATUS "Please install LLVM + clang 3.8 or higher.")
         elseif (CUDA_VERSION_MAJOR VERSION_LESS "9")
-            message(STATUS "Please install clang 4.0 or higher.")
+            message(STATUS "Please install LLVM + clang 4.0 or higher.")
         elseif (CUDA_VERSION VERSION_EQUAL "9.0")
-            message(STATUS "Please install clang 6.0 or higher.")
+            message(STATUS "Please install LLVM + clang 6.0 or higher.")
         elseif (CUDA_VERSION_MAJOR VERSION_LESS "10")
-            message(STATUS "Please install clang 7.0 or higher.")
+            message(STATUS "Please install LLVM + clang 7.0 or higher.")
         elseif (CUDA_VERSION VERSION_EQUAL "10.0")
-            message(STATUS "Please install clang 8.0 or higher.")
+            message(STATUS "Please install LLVM + clang 8.0 or higher.")
         elseif (CUDA_VERSION VERSION_EQUAL "10.1")
-            message(STATUS "Please install clang 9.0 or higher.")
+            message(STATUS "Please install LLVM + clang 9.0 or higher.")
+        elseif (CUDA_VERSION VERSION_GREATER "10.1")
+            message(STATUS "Please install CUDA 10.1 or lesser.")
         endif()
     endif()