diff --git a/HeterogeneousCore/CUDAServices/bin/BuildFile.xml b/HeterogeneousCore/CUDAServices/bin/BuildFile.xml
deleted file mode 100644
index ae3d37a5f6b4f..0000000000000
--- a/HeterogeneousCore/CUDAServices/bin/BuildFile.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<iftool name="cuda-gcc-support">
-  <bin name="cudaComputeCapabilities" file="cudaComputeCapabilities.cpp isCudaDeviceSupported.cu">
-    <use name="cuda"/>
-  </bin>
-
-  <bin name="cudaIsEnabled" file="cudaIsEnabled.cpp isCudaDeviceSupported.cu">
-    <use name="cuda"/>
-  </bin>
-</iftool>
diff --git a/HeterogeneousCore/CUDAUtilities/bin/BuildFile.xml b/HeterogeneousCore/CUDAUtilities/bin/BuildFile.xml
new file mode 100644
index 0000000000000..fa33a5a6280f0
--- /dev/null
+++ b/HeterogeneousCore/CUDAUtilities/bin/BuildFile.xml
@@ -0,0 +1,8 @@
+<iftool name="cuda-gcc-support">
+  <use name="cuda"/>
+  <bin name="cudaComputeCapabilities" file="cudaComputeCapabilities.cpp isCudaDeviceSupported.cu"/>
+  <bin name="cudaIsEnabled" file="cudaIsEnabled.cpp isCudaDeviceSupported.cu"/>
+<else/>
+  <bin name="cudaComputeCapabilities" file="cudaComputeCapabilities_fallback.cpp"/>
+  <bin name="cudaIsEnabled" file="cudaIsEnabled_fallback.cpp"/>
+</iftool>
diff --git a/HeterogeneousCore/CUDAServices/bin/cudaComputeCapabilities.cpp b/HeterogeneousCore/CUDAUtilities/bin/cudaComputeCapabilities.cpp
similarity index 100%
rename from HeterogeneousCore/CUDAServices/bin/cudaComputeCapabilities.cpp
rename to HeterogeneousCore/CUDAUtilities/bin/cudaComputeCapabilities.cpp
diff --git a/HeterogeneousCore/CUDAUtilities/bin/cudaComputeCapabilities_fallback.cpp b/HeterogeneousCore/CUDAUtilities/bin/cudaComputeCapabilities_fallback.cpp
new file mode 100644
index 0000000000000..dc3861a53bd49
--- /dev/null
+++ b/HeterogeneousCore/CUDAUtilities/bin/cudaComputeCapabilities_fallback.cpp
@@ -0,0 +1,9 @@
+// C/C++ headers
+#include <cstdlib>
+#include <iostream>
+
+// always returns EXIT_FAILURE
+int main() {
+  std::cerr << "cudaComputeCapabilities: CUDA is not supported on this architecture" << std::endl;
+  return EXIT_FAILURE;
+}
diff --git a/HeterogeneousCore/CUDAServices/bin/cudaIsEnabled.cpp b/HeterogeneousCore/CUDAUtilities/bin/cudaIsEnabled.cpp
similarity index 100%
rename from HeterogeneousCore/CUDAServices/bin/cudaIsEnabled.cpp
rename to HeterogeneousCore/CUDAUtilities/bin/cudaIsEnabled.cpp
diff --git a/HeterogeneousCore/CUDAUtilities/bin/cudaIsEnabled_fallback.cpp b/HeterogeneousCore/CUDAUtilities/bin/cudaIsEnabled_fallback.cpp
new file mode 100644
index 0000000000000..92785c12af592
--- /dev/null
+++ b/HeterogeneousCore/CUDAUtilities/bin/cudaIsEnabled_fallback.cpp
@@ -0,0 +1,5 @@
+// C/C++ headers
+#include <cstdlib>
+
+// always returns EXIT_FAILURE
+int main() { return EXIT_FAILURE; }
diff --git a/HeterogeneousCore/CUDAServices/bin/isCudaDeviceSupported.cu b/HeterogeneousCore/CUDAUtilities/bin/isCudaDeviceSupported.cu
similarity index 100%
rename from HeterogeneousCore/CUDAServices/bin/isCudaDeviceSupported.cu
rename to HeterogeneousCore/CUDAUtilities/bin/isCudaDeviceSupported.cu
diff --git a/HeterogeneousCore/CUDAServices/bin/isCudaDeviceSupported.h b/HeterogeneousCore/CUDAUtilities/bin/isCudaDeviceSupported.h
similarity index 100%
rename from HeterogeneousCore/CUDAServices/bin/isCudaDeviceSupported.h
rename to HeterogeneousCore/CUDAUtilities/bin/isCudaDeviceSupported.h