diff --git a/runtime/src/iree/hal/drivers/hip/cts/CMakeLists.txt b/runtime/src/iree/hal/drivers/hip/cts/CMakeLists.txt
index 3520a96c0c9c..c7995d754b73 100644
--- a/runtime/src/iree/hal/drivers/hip/cts/CMakeLists.txt
+++ b/runtime/src/iree/hal/drivers/hip/cts/CMakeLists.txt
@@ -78,7 +78,7 @@ iree_hal_cts_test_suite(
   DRIVER_REGISTRATION_FN
     "iree_hal_hip_driver_module_register"
   DEVICE_CREATION_HDR
-    "runtime/src/iree/hal/drivers/hip/registration/device_group_creation.h"
+    "runtime/src/iree/hal/drivers/hip/cts/device_group_creation.h"
   DEFAULT_DEVICE_CREATION_FN
     "iree_hal_drivers_hip_cts_default_device_group_device_create"
   COMPILER_TARGET_BACKEND
@@ -109,7 +109,7 @@ iree_hal_cts_test_suite(
   DRIVER_REGISTRATION_FN
     "iree_hal_hip_driver_module_register"
   DEVICE_CREATION_HDR
-    "runtime/src/iree/hal/drivers/hip/registration/device_group_creation.h"
+    "runtime/src/iree/hal/drivers/hip/cts/device_group_creation.h"
   DEFAULT_DEVICE_CREATION_FN
     "iree_hal_drivers_hip_cts_default_device_group_device_create"
   COMPILER_TARGET_BACKEND
@@ -139,7 +139,7 @@ iree_hal_cts_test_suite(
   DRIVER_REGISTRATION_FN
     "iree_hal_hip_driver_module_register"
   DEVICE_CREATION_HDR
-    "runtime/src/iree/hal/drivers/hip/registration/device_group_creation.h"
+    "runtime/src/iree/hal/drivers/hip/cts/device_group_creation.h"
   DEFAULT_DEVICE_CREATION_FN
     "iree_hal_drivers_hip_cts_default_device_group_device_create"
   COMPILER_TARGET_BACKEND
@@ -173,7 +173,7 @@ iree_hal_cts_test_suite(
   DRIVER_REGISTRATION_FN
     "iree_hal_hip_driver_module_register"
   DEVICE_CREATION_HDR
-    "runtime/src/iree/hal/drivers/hip/registration/device_group_creation.h"
+    "runtime/src/iree/hal/drivers/hip/cts/device_group_creation.h"
   DEFAULT_DEVICE_CREATION_FN
     "iree_hal_drivers_hip_cts_default_device_group_device_create"
   DEFAULT_SUBMIT_QUEUE_AFFINITY
diff --git a/runtime/src/iree/hal/drivers/hip/registration/device_group_creation.h b/runtime/src/iree/hal/drivers/hip/cts/device_group_creation.h
similarity index 100%
rename from runtime/src/iree/hal/drivers/hip/registration/device_group_creation.h
rename to runtime/src/iree/hal/drivers/hip/cts/device_group_creation.h