diff --git a/tests/Tests.cmake b/tests/Tests.cmake
index ae659cd868..2b5d3b03b6 100644
--- a/tests/Tests.cmake
+++ b/tests/Tests.cmake
@@ -23,16 +23,17 @@
 ###############################################################################
 
 # Add tests
-include_directories(${HIP_SRC_PATH}/tests/src)
-hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/src "directed_tests")
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
+hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${CMAKE_CURRENT_LIST_DIR}/src "directed_tests")
 
 # Add unit tests
-include_directories(${HIP_SRC_PATH}/tests/unit)
-hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/unit "unit_tests")
+include_directories(${CMAKE_CURRENT_LIST_DIR}/unit)
+hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${CMAKE_CURRENT_LIST_DIR}/unit "unit_tests")
 
 # Add performance tests
-include_directories(${HIP_SRC_PATH}/tests/performance)
-hit_add_directory_recursive(${HIP_CTEST_CONFIG_PERFORMANCE} ${HIP_SRC_PATH}/tests/performance "performance_tests")
+include_directories(${CMAKE_CURRENT_LIST_DIR}/performance)
+hit_add_directory_recursive(${HIP_CTEST_CONFIG_PERFORMANCE} ${CMAKE_CURRENT_LIST_DIR}/performance "performance_tests")
 
 # Add top-level tests to build_tests
 add_custom_target(build_tests DEPENDS directed_tests unit_tests)
diff --git a/tests/catch/CMakeLists.txt b/tests/catch/CMakeLists.txt
index 0292f378dc..d5eee44edc 100644
--- a/tests/catch/CMakeLists.txt
+++ b/tests/catch/CMakeLists.txt
@@ -14,7 +14,7 @@ if(NOT DEFINED CATCH2_PATH)
     if(DEFINED ENV{CATCH2_PATH})
         set(CATCH2_PATH $ENV{CATCH2_PATH} CACHE STRING "Catch2 Path")
     else()
-        set(CATCH2_PATH "${CMAKE_CURRENT_SOURCE_DIR}/external/Catch2")
+        set(CATCH2_PATH "${CMAKE_CURRENT_LIST_DIR}/external/Catch2")
     endif()
 endif()
 message(STATUS "Catch2 Path: ${CATCH2_PATH}")
@@ -24,14 +24,14 @@ if(NOT DEFINED JSON_PARSER)
     if(DEFINED ENV{JSON_PARSER})
         set(JSON_PARSER $ENV{JSON_PARSER} CACHE STRING "JSON Parser Path")
     else()
-        set(JSON_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/external/picojson")
+        set(JSON_PARSER "${CMAKE_CURRENT_LIST_DIR}/external/picojson")
     endif()
 endif()
 
-message(STATUS "Searching Catch2 in: ${CMAKE_CURRENT_SOURCE_DIR}/external")
+message(STATUS "Searching Catch2 in: ${CMAKE_CURRENT_LIST_DIR}/external")
 find_package(Catch2 REQUIRED
     PATHS
-        ${CMAKE_CURRENT_SOURCE_DIR}/external
+        ${CMAKE_CURRENT_LIST_DIR}/external
     PATH_SUFFIXES
     Catch2/cmake/Catch2
 )
diff --git a/tests/hit/HIT.cmake b/tests/hit/HIT.cmake
index 0105c69866..e28c5b9df9 100755
--- a/tests/hit/HIT.cmake
+++ b/tests/hit/HIT.cmake
@@ -290,7 +290,7 @@ file(GLOB HIP_LIB_FILES ${HIP_PATH}/lib/*)
 macro(HIT_ADD_FILES _config _dir _label _parent)
     foreach (file ${ARGN})
         # Build tests
-        execute_process(COMMAND ${HIP_SRC_PATH}/tests/hit/parser --buildCMDs ${file}
+        execute_process(COMMAND ${CMAKE_CURRENT_LIST_DIR}/hit/parser --buildCMDs ${file}
             OUTPUT_VARIABLE _contents
             ERROR_QUIET
             WORKING_DIRECTORY ${_dir}
@@ -325,7 +325,7 @@ macro(HIT_ADD_FILES _config _dir _label _parent)
         endforeach()
 
         # Custom build commands
-        execute_process(COMMAND ${HIP_SRC_PATH}/tests/hit/parser --customBuildCMDs ${file}
+        execute_process(COMMAND ${CMAKE_CURRENT_LIST_DIR}/hit/parser --customBuildCMDs ${file}
             OUTPUT_VARIABLE _contents
             ERROR_QUIET
             WORKING_DIRECTORY ${_dir}
@@ -373,7 +373,7 @@ macro(HIT_ADD_FILES _config _dir _label _parent)
                         set_target_properties(${target} PROPERTIES OUTPUT_NAME ${_target_r} RUNTIME_OUTPUT_DIRECTORY "." LINK_DEPENDS "${HIP_LIB_FILES}" PREFIX "" SUFFIX "")
                 else()
                     # message(STATUS "add_custom_target*: target= ${target}  _buildcmd= ${_buildcmd}")
-                    add_custom_target(${target} COMMAND sh -c "${_buildcmd}")
+                    add_custom_target(${target} COMMAND sh -c "${_buildcmd} -L${CMAKE_CURRENT_SOURCE_DIR}/build/lib -isystem ${CMAKE_CURRENT_SOURCE_DIR}/include")
                 endif()
                 add_dependencies(${_parent} ${target})
                 foreach(_dependency ${_depends})
@@ -384,7 +384,7 @@ macro(HIT_ADD_FILES _config _dir _label _parent)
         endforeach()
 
         # Add tests
-        execute_process(COMMAND ${HIP_SRC_PATH}/tests/hit/parser --testCMDs ${file}
+        execute_process(COMMAND ${CMAKE_CURRENT_LIST_DIR}/hit/parser --testCMDs ${file}
             OUTPUT_VARIABLE _contents
             ERROR_QUIET
             WORKING_DIRECTORY ${_dir}
@@ -407,7 +407,7 @@ macro(HIT_ADD_FILES _config _dir _label _parent)
         endforeach()
 
         # Add named tests
-        execute_process(COMMAND ${HIP_SRC_PATH}/tests/hit/parser --testNamedCMDs ${file}
+        execute_process(COMMAND ${CMAKE_CURRENT_LIST_DIR}/hit/parser --testNamedCMDs ${file}
             OUTPUT_VARIABLE _contents
             ERROR_QUIET
             WORKING_DIRECTORY ${_dir}