diff --git a/DataFormats/DetId/test/BuildFile.xml b/DataFormats/DetId/test/BuildFile.xml
index 0cccd9fb0d26b..376a8bdc397ad 100644
--- a/DataFormats/DetId/test/BuildFile.xml
+++ b/DataFormats/DetId/test/BuildFile.xml
@@ -1,6 +1,7 @@
 <iftool name="cuda-gcc-support">
 <bin name="test_detid" file="test_detid.cu">
-    <use name="DataFormats/DetId"/>
     <use name="cuda"/>
+    <use name="DataFormats/DetId"/>
+    <use name="HeterogeneousCore/CUDAUtilities"/>
 </bin>
 </iftool>
diff --git a/DataFormats/DetId/test/test_detid.cu b/DataFormats/DetId/test/test_detid.cu
index 1c0d4ec13b89e..ed3960b652fc2 100644
--- a/DataFormats/DetId/test/test_detid.cu
+++ b/DataFormats/DetId/test/test_detid.cu
@@ -1,10 +1,12 @@
-#include <cuda_runtime.h>
+#include <cassert>
+#include <iostream>
+
 #include <cuda.h>
+#include <cuda_runtime.h>
 
-#include <iostream>
-#include <assert.h>
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "HeterogeneousCore/CUDAUtilities/interface/requireDevices.h"
 
 __global__ void test_gen_detid(DetId* id, uint32_t const rawid) {
   DetId did{rawid};
@@ -27,11 +29,8 @@ void test_detid() {
 }
 
 int main(int argc, char** argv) {
-  int nDevices;
-  cudaGetDeviceCount(&nDevices);
-  std::cout << "nDevices = " << nDevices << std::endl;
+  cms::cudatest::requireDevices();
 
   // test det id functionality
-  if (nDevices > 0)
-    test_detid();
+  test_detid();
 }
diff --git a/HeterogeneousCore/CUDACore/interface/ESProduct.h b/HeterogeneousCore/CUDACore/interface/ESProduct.h
index 7fc7c103d8c8b..d4cf515abdc89 100644
--- a/HeterogeneousCore/CUDACore/interface/ESProduct.h
+++ b/HeterogeneousCore/CUDACore/interface/ESProduct.h
@@ -1,5 +1,5 @@
-#ifndef HeterogeneousCore_CUDACore_CUDAESProduct_h
-#define HeterogeneousCore_CUDACore_CUDAESProduct_h
+#ifndef HeterogeneousCore_CUDACore_ESProduct_h
+#define HeterogeneousCore_CUDACore_ESProduct_h
 
 #include <atomic>
 #include <cassert>
diff --git a/HeterogeneousCore/CUDAServices/scripts/cmsCudaRebuild.sh b/HeterogeneousCore/CUDAServices/scripts/cmsCudaRebuild.sh
old mode 100644
new mode 100755
diff --git a/HeterogeneousCore/CUDAServices/scripts/cmsCudaSetup.sh b/HeterogeneousCore/CUDAServices/scripts/cmsCudaSetup.sh
old mode 100644
new mode 100755
diff --git a/HeterogeneousCore/CUDAServices/scripts/cudaPreallocate.py b/HeterogeneousCore/CUDAServices/scripts/cudaPreallocate.py
old mode 100644
new mode 100755
diff --git a/HeterogeneousCore/CUDAServices/scripts/nvprof-remote b/HeterogeneousCore/CUDAServices/scripts/nvprof-remote
old mode 100644
new mode 100755