diff --git a/projects/hip-tests/catch/multiproc/CMakeLists.txt b/projects/hip-tests/catch/multiproc/CMakeLists.txt
index 3890bc0bda..629f37372c 100644
--- a/projects/hip-tests/catch/multiproc/CMakeLists.txt
+++ b/projects/hip-tests/catch/multiproc/CMakeLists.txt
@@ -22,7 +22,8 @@ if(UNIX)
                       COMMAND ${CMAKE_CXX_COMPILER}
                       --genco ${CMAKE_CURRENT_SOURCE_DIR}/dummy_kernel.cpp
                       -o ${CMAKE_CURRENT_BINARY_DIR}/../multiproc/dummy_kernel.code
-                      -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include)
+                      -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include
+                      --rocm-path=${ROCM_PATH})
     set_property(GLOBAL APPEND PROPERTY
                  G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/dummy_kernel.code)
 endif()
diff --git a/projects/hip-tests/catch/unit/c_compilation/CMakeLists.txt b/projects/hip-tests/catch/unit/c_compilation/CMakeLists.txt
index 3d2e208e57..af28bf6a46 100644
--- a/projects/hip-tests/catch/unit/c_compilation/CMakeLists.txt
+++ b/projects/hip-tests/catch/unit/c_compilation/CMakeLists.txt
@@ -33,6 +33,7 @@ add_custom_target(devprop_c_custom
             -c ${CMAKE_CURRENT_SOURCE_DIR}/hipGetDeviceProp.c
             -I${HIP_PATH}/include
             -D${PLATFORM_DEFINE}
+            --rocm-path=${ROCM_PATH}
             -o hipGetDeviceProp.o
     BYPRODUCTS hipGetDeviceProp.o
 )
diff --git a/projects/hip-tests/catch/unit/callback/CMakeLists.txt b/projects/hip-tests/catch/unit/callback/CMakeLists.txt
index efb35fc796..64aa871a18 100644
--- a/projects/hip-tests/catch/unit/callback/CMakeLists.txt
+++ b/projects/hip-tests/catch/unit/callback/CMakeLists.txt
@@ -32,7 +32,8 @@ if(UNIX)
     add_custom_target(SimpleKernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR}
                       ${CMAKE_CURRENT_SOURCE_DIR}/SimpleKernel.cc
                       -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/callback/SimpleKernel.code
-                      -I${HIP_PATH}/include -I${CMAKE_CURRENT_SOURCE_DIR}/../../include)
+                      -I${HIP_PATH}/include -I${CMAKE_CURRENT_SOURCE_DIR}/../../include
+                      --rocm-path=${ROCM_PATH})
     set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/SimpleKernel.code)
 endif()
 
diff --git a/projects/hip-tests/catch/unit/dynamicLoading/CMakeLists.txt b/projects/hip-tests/catch/unit/dynamicLoading/CMakeLists.txt
index df12d2e05e..1820732fe3 100644
--- a/projects/hip-tests/catch/unit/dynamicLoading/CMakeLists.txt
+++ b/projects/hip-tests/catch/unit/dynamicLoading/CMakeLists.txt
@@ -32,12 +32,12 @@ hip_add_exe_to_target(NAME dynamicLoading
                       TEST_TARGET_NAME build_tests)
 
 if(HIP_PLATFORM MATCHES "amd")
-add_custom_target(libLazyLoad.so COMMAND ${CMAKE_CXX_COMPILER} -fPIC -lpthread -shared ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/liblazyLoad.cc -I${CMAKE_CURRENT_SOURCE_DIR}/../../include -I${CMAKE_CURRENT_SOURCE_DIR}/../../external/Catch2 -L${HIP_PATH}/${CMAKE_INSTALL_LIBDIR} -o libLazyLoad.so)
+add_custom_target(libLazyLoad.so COMMAND ${CMAKE_CXX_COMPILER} -fPIC -lpthread -shared ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/liblazyLoad.cc -I${CMAKE_CURRENT_SOURCE_DIR}/../../include -I${CMAKE_CURRENT_SOURCE_DIR}/../../external/Catch2 -L${HIP_PATH}/${CMAKE_INSTALL_LIBDIR} --rocm-path=${ROCM_PATH} -o libLazyLoad.so)
 elseif(HIP_PLATFORM MATCHES "nvidia")
 add_custom_target(libLazyLoad.so COMMAND ${CMAKE_CXX_COMPILER} -Xcompiler -fPIC -lpthread -shared ${CMAKE_CURRENT_SOURCE_DIR}/liblazyLoad.cc -I${CMAKE_CURRENT_SOURCE_DIR}/../../include -I${CMAKE_CURRENT_SOURCE_DIR}/../../external/Catch2 -I${HIP_PATH}/include/ -o libLazyLoad.so)
 endif()
 
-add_custom_target(bit_extract_kernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/bit_extract_kernel.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../dynamicLoading/bit_extract_kernel.code -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include -L${HIP_PATH}/${CMAKE_INSTALL_LIBDIR})
+add_custom_target(bit_extract_kernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/bit_extract_kernel.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../dynamicLoading/bit_extract_kernel.code -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH} -L${HIP_PATH}/${CMAKE_INSTALL_LIBDIR})
 
 add_custom_target(vecadd.cc COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/vecadd.cc ${CMAKE_CURRENT_BINARY_DIR}/../dynamicLoading/)
 set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS