diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 22b9048e0f586e80aaea116a9e8a3a3a5b8a5822..9202310090400c24b0f9773acd6476eb39da6466 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -53,4 +53,8 @@ if(NOT BUILDNAME)
     set(BUILDNAME "${BUILDNAME}-CUDA")
   endif(CHAMELEON_USE_CUDA)
 
+  if(CHAMELEON_USE_HIP)
+    set(BUILDNAME "${BUILDNAME}-HIP")
+  endif(CHAMELEON_USE_HIP)
+
 endif()
diff --git a/testing/CTestLists.cmake b/testing/CTestLists.cmake
index 7c979a91710167fff8c41bd92d58a62804f7e5ec..9dcacf75e7ed0f0ff4699ab38e7d7497f471f227 100644
--- a/testing/CTestLists.cmake
+++ b/testing/CTestLists.cmake
@@ -11,6 +11,9 @@ endif()
 if (CHAMELEON_USE_CUDA AND CUDA_FOUND)
   set(N_GPUS 0 1)
 endif()
+if (CHAMELEON_USE_HIP AND HIP_FOUND)
+  set(N_GPUS 0 1)
+endif()
 if (CHAMELEON_SIMULATION)
   set(TEST_CATEGORIES simushm)
   if (CHAMELEON_USE_CUDA)