diff --git a/include/hcc_detail/hip_hcc.h b/include/hcc_detail/hip_hcc.h
index e160a9f418..aacc63e1f2 100644
--- a/include/hcc_detail/hip_hcc.h
+++ b/include/hcc_detail/hip_hcc.h
@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include "hip/hcc_detail/staging_buffer.h"
 
 
-#if defined(__HCC__) && (__hcc_workweek__ < 1502)
+#if defined(__HCC__) && (__hcc_workweek__ < 16155)
 #error("This version of HIP requires a newer version of HCC.");
 #endif
 
@@ -41,7 +41,7 @@ THE SOFTWARE.
 
 
 // Use new am_memory_host_lock APIs:
-#define USE_HCC_LOCK_API 0
+#define USE_HCC_LOCK_API 1
 
 
 //---
diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt
index 0038314af0..4f461d6339 100644
--- a/tests/src/CMakeLists.txt
+++ b/tests/src/CMakeLists.txt
@@ -167,7 +167,6 @@ make_hip_executable (hipMultiThreadStreams2 hipMultiThreadStreams2.cpp)
 make_hip_executable (hipHostAlloc hipHostAlloc.cpp)
 make_hip_executable (hipStreamL5 hipStreamL5.cpp)
 make_hip_executable (hipHostGetFlags hipHostGetFlags.cpp)
-#TODO - re-enable.  This requires working hipHostRegister call, waiting on HCC feature.
 make_hip_executable (hipHostRegister hipHostRegister.cpp)
 make_hip_executable (hipRandomMemcpyAsync hipRandomMemcpyAsync.cpp)
 make_hip_executable (hipMemoryAllocate hipMemoryAllocate.cpp)
@@ -213,7 +212,7 @@ make_test(hipHostAlloc " ")
 # BS- comment out since test appears broken - asks for device pointer but pointer was never allocated.
 #make_test(hipHostGetFlags " ")
 make_test(hipHcc  " " )
-#make_test(hipHostRegister " ")
+make_test(hipHostRegister " ")
 make_test(hipStreamL5 " ")
 make_test(hipRandomMemcpyAsync " ")
 #make_test(hipAPIStreamEnable " ")