diff --git a/projects/amdsmi/CMakeLists.txt b/projects/amdsmi/CMakeLists.txt
index 629b2ae00d..a880988b2c 100755
--- a/projects/amdsmi/CMakeLists.txt
+++ b/projects/amdsmi/CMakeLists.txt
@@ -170,6 +170,7 @@ add_subdirectory("rocm_smi")
 
 if(BUILD_TESTS)
     add_subdirectory("tests/rocm_smi_test")
+    add_subdirectory("tests/amd_smi_test")
 endif()
 
 # Examples and docs
diff --git a/projects/amdsmi/tests/amd_smi_test/CMakeLists.txt b/projects/amdsmi/tests/amd_smi_test/CMakeLists.txt
index 18f953e387..e7406ab02c 100644
--- a/projects/amdsmi/tests/amd_smi_test/CMakeLists.txt
+++ b/projects/amdsmi/tests/amd_smi_test/CMakeLists.txt
@@ -1,93 +1,26 @@
-#
-# Minimum version of cmake required
-#
-cmake_minimum_required(VERSION 2.8.0)
-
-#
-#   Required Defines on cmake command line
-#
-#   1) Set location of AMDSMI header files
-#
-#      ROCM_DIR="Root for ROCM install"
-#
-#   2) Set AMDSMITST_BLD_TYPE to either "Debug" or "Release".
-#      If not set, the default value is "Debug" is bound.
-#
-#      AMDSMITST_BLD_TYPE=Debug or AMDSMITST_BLD_TYPE=Release
-#
-#   3) Set AMDSMITST_BLD_BITS to either "32" or "64"
-#      If not set, the default value of "64" is bound.
-#
-#       AMDSMITST_BLD_BITS=32 or AMDSMITST_BLD_BITS=64
-#
-#   Building rocrtst Suite
-#
-#
-#   1) Create build folder e.g. "rocrtst/build" - any name will do
-#   2) Cd into build folder
-#   3) Run "cmake .."
-#   4) Run "make"
-#
-
-#
-# Currently support for Windows platform is not present
-#
-
-#############################
-# COMMON AREA
-#############################
-if(WIN32)
-  message("amdsmi library test suite is not supported on Windows platform")
-  return()
-endif()
-
-#
-# Process input variables
-#
-
 # Required Defines first:
+option(INSTALL_GTEST "Install GTest (only useful if GTest is not already installed)" OFF)
 
-if(NOT DEFINED AMDSMI_INC_DIR)
-  set(AMDSMI_INC_DIR ${ROCM_DIR}/include)
+# Try to find googletest
+find_package(GTest 1.12.0)
+
+# GTest_FOUND is set to TRUE if ANY version is found
+# GTest_VERSION is set if 1.11.0 or newer version is found
+if(NOT GTest_FOUND STREQUAL "TRUE" OR NOT DEFINED GTest_VERSION)
+    # Google Test wasn't found. Download and compile ourselves
+    include(FetchContent)
+    FetchContent_Declare(
+        googletest
+        GIT_REPOSITORY https://github.com/google/googletest.git
+        GIT_TAG release-1.12.0)
+    FetchContent_MakeAvailable(googletest)
 endif()
 
-if(NOT DEFINED AMDSMI_LIB_DIR)
-  set(AMDSMI_LIB_DIR ${ROCM_DIR}/lib)
-endif()
-#
-# Determine AMDSMI Header files are present
-#  (no external source dependencies)
+enable_testing()
 
-# Determine AMDSMI Library file is present
-#
-if("${AMDSMITST_BLD_BITS}" STREQUAL 32)
-  set (ONLY64STR "")
-  set (IS64BIT 0)
-else()
-  set (ONLY64STR "64")
-  set (IS64BIT 1)
-endif()
-#
-if (${IS64BIT} EQUAL 0)
-  if(NOT EXISTS ${AMDSMI_LIB_DIR}/libamd_smi32.so)
-    message("ERROR: ${AMDSMI_LIB_DIR}/libamd_smi32.so doesn't exist. Check value of ROCM_DIR define")
+if(WIN32)
+    message("amd_smi library test suite is not supported on Windows platform")
     return()
-  endif()
-else()
-  if(NOT EXISTS ${AMDSMI_LIB_DIR}/libamd_smi64.so)
-    message("ERROR: Define AMDSMI_LIB_DIR pointing to AMDSMI library is not set")
-    message(" missing: ${AMDSMI_LIB_DIR}/libamd_smi64.so")
-    return()
-  endif()
-endif()
-
-string(TOLOWER "${AMDSMITST_BLD_TYPE}" tmp)
-if("${tmp}" STREQUAL release)
-  set(BUILD_TYPE "Release")
-  set(ISDEBUG 0)
-else()
-  set(BUILD_TYPE "Debug")
-  set(ISDEBUG 1)
 endif()
 
 #
@@ -108,129 +41,30 @@ message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
 message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
 message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
 message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
-message("--------AMDSMI Lib Dir: " ${AMDSMI_LIB_DIR})
+message("--------RSMI Lib Dir: " ${AMDSMI_LIB_DIR})
 message("")
 
-#
-# Set the build type based on user input
-#
-set(CMAKE_BUILD_TYPE ${BUILD_TYPE})
-#
-# Flag to enable / disable verbose output.
-#
-set(CMAKE_VERBOSE_MAKEFILE on)
-#
-# Compiler pre-processor definitions.
-#
-# Define MACRO "DEBUG" if build type is "Debug"
-if(${BUILD_TYPE} STREQUAL "Debug")
-add_definitions(-DDEBUG)
-endif()
 
-add_definitions(-D__linux__)
-add_definitions(-DLITTLEENDIAN_CPU=1)
-
-#
-# Linux Compiler options
-#
-set(CMAKE_CXX_FLAGS "-std=c++11 ")
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-math-errno")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-threadsafe-statics")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmerge-all-constants")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fms-extensions")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
-
-## Address Sanitize Flag
-if (${ADDRESS_SANITIZER})
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -g")
-    set(CMAKE_EXE_LINKER_FLAGS -fsanitize=address)
-
-    if (BUILD_SHARED_LIBS})
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -shared-libsan" )
-    else ()
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libsan" )
-    endif ()
-endif()
-
-
-#
-# Extend the compiler flags for 64-bit builds
-#
-if (IS64BIT)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64  -msse -msse2")
-else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-endif()
-
-#
-# Add compiler flags to include symbol information for debug builds
-#
-if(ISDEBUG)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -O0")
-endif()
-MESSAGE("ISDEBUG STEP:Done")
-
-
-set(AMDSMITST_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
-
-# Set Name for Google Test Framework and build it as a
-# static library to be linked with user test programs
-#
-set(GOOGLE_TEST_FRWK_NAME "gtest")
-add_subdirectory(${AMDSMITST_ROOT}/../rocm_smi_test/gtest "${PROJECT_BINARY_DIR}/gtest")
-set (AMDSMITST_LIBS ${AMDSMITST_LIBS} ${GOOGLE_TEST_FRWK_NAME})
-
-#
-#
 # Other source directories
-aux_source_directory(${AMDSMITST_ROOT}/functional functionalSources)
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/functional functionalSources)
 
-#
-# Specify the directory containing various libraries of ROCR
-# to be linked against for building ROC Perf applications
-#
-LINK_DIRECTORIES(${AMDSMI_LIB_DIR} ${GTEST_LIB_DIR})
+link_directories(${AMDSMI_LIB_DIR})
 
-#
-# Extend the list of libraries to be used for linking amdsmi apps
-#
-if (IS64BIT)
-  set(AMDSMITST_LIBS ${AMDSMITST_LIBS} amd_smi64)
-  set(AMDSMITST "amdsmitst64")
-else()
-  set(AMDSMITST_LIBS ${AMDSMITST_LIBS} amd_smi32)
-  set(AMDSMITST "amdsmitst")
-endif()
+set(TEST "amdsmitst64")
 
-
-#
-# Source files for building rocrtst
-#
-aux_source_directory(${AMDSMITST_ROOT} amdsmitstSources)
+# Source files
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} tstSources)
 
 # Header file include path
-
-include_directories(${AMDSMI_INC_DIR})
-include_directories(${AMDSMITST_ROOT}/..)
-include_directories(${AMDSMITST_ROOT}/../../amd_smi/include)
-include_directories(${AMDSMITST_ROOT}/../../include)
-include_directories(${AMDSMITST_ROOT}/gtest/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 # Build rules
-message("--------AMDSMITST: " ${AMDSMITST} )
-message("--------amdsmitstSources: " ${amdsmitstSources} )
-message("--------functionalSources: " ${functionalSources} )
-add_executable(${AMDSMITST} ${amdsmitstSources} ${functionalSources})
+add_executable(${TEST} ${tstSources} ${functionalSources})
 
-target_link_libraries(${AMDSMITST} ${AMDSMITST_LIBS} c stdc++ pthread)
-
-install(TARGETS ${AMDSMITST}
-        ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib
-        LIBRARY DESTINATION ${PROJECT_BINARY_DIR}/lib
-        RUNTIME DESTINATION ${PROJECT_BINARY_DIR}/bin)
+target_link_libraries(${TEST} amd_smi64 c stdc++ pthread GTest::gtest_main)
 
+install(
+    TARGETS ${TEST}
+    ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib
+    LIBRARY DESTINATION ${PROJECT_BINARY_DIR}/lib
+    RUNTIME DESTINATION ${PROJECT_BINARY_DIR}/bin)
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.cc
index 4b46024736..161ef4a0a1 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.cc
@@ -49,11 +49,11 @@
 #include <iostream>
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/api_support_read.h"
-#include "amd_smi_test/test_common.h"
-#include "amd_smi_test/test_utils.h"
+#include "api_support_read.h"
+#include "../test_common.h"
+#include "../test_utils.h"
 
 TestAPISupportRead::TestAPISupportRead() : TestBase() {
   set_title("AMDSMI API Support Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.h b/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.h
index dc68df3995..10d1674733 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_API_SUPPORT_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_API_SUPPORT_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestAPISupportRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/err_cnt_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/err_cnt_read.cc
index 4852a87927..65da0a689b 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/err_cnt_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/err_cnt_read.cc
@@ -46,10 +46,10 @@
 
 #include <iostream>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/err_cnt_read.h"
-#include "amd_smi_test/test_common.h"
+#include "err_cnt_read.h"
+#include "../test_common.h"
 
 TestErrCntRead::TestErrCntRead() : TestBase() {
   set_title("AMDSMI Error Count Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/err_cnt_read.h b/projects/amdsmi/tests/amd_smi_test/functional/err_cnt_read.h
index 798f840f6c..57126d167a 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/err_cnt_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/err_cnt_read.h
@@ -43,7 +43,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_ERR_CNT_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_ERR_CNT_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestErrCntRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.cc
index c7393c92a9..7c5df286b2 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.cc
@@ -48,11 +48,11 @@
 
 #include <iostream>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/evt_notif_read_write.h"
-#include "amd_smi_test/test_common.h"
-#include "amd_smi_test/test_utils.h"
+#include "evt_notif_read_write.h"
+#include "../test_common.h"
+#include "../test_utils.h"
 
 TestEvtNotifReadWrite::TestEvtNotifReadWrite() : TestBase() {
   set_title("AMDSMI Event Notification Read/Write Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.h b/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.h
index 1238e7c777..d60dd63ff6 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_EVT_NOTIF_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_EVT_NOTIF_READ_WRITE_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestEvtNotifReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/fan_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/fan_read.cc
index c0b6772003..fbca38495d 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/fan_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/fan_read.cc
@@ -48,10 +48,10 @@
 
 #include <iostream>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/fan_read.h"
-#include "amd_smi_test/test_common.h"
+#include "fan_read.h"
+#include "../test_common.h"
 
 TestFanRead::TestFanRead() : TestBase() {
   set_title("AMDSMI Fan Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/fan_read.h b/projects/amdsmi/tests/amd_smi_test/functional/fan_read.h
index bcdafd01cc..ac5156f6dc 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/fan_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/fan_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMDSMI_TEST_FUNCTIONAL_FAN_READ_H_
 #define TESTS_AMDSMI_TEST_FUNCTIONAL_FAN_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestFanRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/fan_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/fan_read_write.cc
index 24b6bb0ff7..17f2c4c710 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/fan_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/fan_read_write.cc
@@ -48,10 +48,10 @@
 
 #include <iostream>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/fan_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "fan_read_write.h"
+#include "../test_common.h"
 
 TestFanReadWrite::TestFanReadWrite() : TestBase() {
   set_title("AMDSMI Fan Read/Write Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/fan_read_write.h b/projects/amdsmi/tests/amd_smi_test/functional/fan_read_write.h
index 4aea248d12..07fe17f8a5 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/fan_read_write.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/fan_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMDSMI_TEST_FUNCTIONAL_FAN_READ_WRITE_H_
 #define TESTS_AMDSMI_TEST_FUNCTIONAL_FAN_READ_WRITE_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestFanReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc
index e5ac6c955e..6afd01df95 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/frequencies_read.h"
-#include "amd_smi_test/test_common.h"
+#include "frequencies_read.h"
+#include "../test_common.h"
 
 TestFrequenciesRead::TestFrequenciesRead() : TestBase() {
   set_title("AMDSMI Frequencies Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.h b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.h
index 40bf0f3a2b..07329338a7 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestFrequenciesRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc
index 745e2d2a0c..ab4ee8f754 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc
@@ -52,10 +52,10 @@
 #include <string>
 #include <algorithm>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/frequencies_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "frequencies_read_write.h"
+#include "../test_common.h"
 
 
 TestFrequenciesReadWrite::TestFrequenciesReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.h b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.h
index 5ad35078c7..03322396e6 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_WRITE_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestFrequenciesReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/gpu_busy_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/gpu_busy_read.cc
index cb65121e90..391977645e 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/gpu_busy_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/gpu_busy_read.cc
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/gpu_busy_read.h"
-#include "amd_smi_test/test_common.h"
+#include "gpu_busy_read.h"
+#include "../test_common.h"
 
 TestGPUBusyRead::TestGPUBusyRead() : TestBase() {
   set_title("AMDSMI GPU Busy Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/gpu_busy_read.h b/projects/amdsmi/tests/amd_smi_test/functional/gpu_busy_read.h
index 8b4d8605a3..1f94059a2e 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/gpu_busy_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/gpu_busy_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_GPU_BUSY_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_GPU_BUSY_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestGPUBusyRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.cc
index 8d915fd708..a901d37b7e 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.cc
@@ -50,10 +50,10 @@
 #include <string>
 #include <map>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/gpu_metrics_read.h"
-#include "amd_smi_test/test_common.h"
+#include "gpu_metrics_read.h"
+#include "../test_common.h"
 
 
 TestGpuMetricsRead::TestGpuMetricsRead() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.h b/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.h
index 8406ef90af..60a3b77afd 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_GPU_METRICS_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_GPU_METRICS_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestGpuMetricsRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.cc
index ae4447420c..eef78d646a 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.cc
@@ -50,10 +50,10 @@
 #include <string>
 #include <vector>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/hw_topology_read.h"
-#include "amd_smi_test/test_common.h"
+#include "hw_topology_read.h"
+#include "../test_common.h"
 
 typedef struct {
   std::string type;
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.h b/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.h
index d629e56aa9..94868b0c5a 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_HW_TOPOLOGY_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_HW_TOPOLOGY_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestHWTopologyRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/id_info_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/id_info_read.cc
index 8439dde8d8..a9a4527e75 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/id_info_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/id_info_read.cc
@@ -47,10 +47,10 @@
 #include <iostream>
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/id_info_read.h"
-#include "amd_smi_test/test_common.h"
+#include "id_info_read.h"
+#include "../test_common.h"
 
 TestIdInfoRead::TestIdInfoRead() : TestBase() {
   set_title("AMDSMI ID Info Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/id_info_read.h b/projects/amdsmi/tests/amd_smi_test/functional/id_info_read.h
index e4e8a609e6..4f7e8903d2 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/id_info_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/id_info_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_ID_INFO_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_ID_INFO_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestIdInfoRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/init_shutdown_refcount.cc b/projects/amdsmi/tests/amd_smi_test/functional/init_shutdown_refcount.cc
index c1acc3fa3b..8e2393dfe9 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/init_shutdown_refcount.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/init_shutdown_refcount.cc
@@ -51,10 +51,10 @@
 #include <random>
 #include <chrono>  // NOLINT
 
-#include "amd_smi_test/functional/init_shutdown_refcount.h"
-#include "gtest/gtest.h"
+#include "init_shutdown_refcount.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/test_common.h"
+#include "../test_common.h"
 
 extern int32_t
 rsmi_test_refcount(uint64_t refcnt_type);
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/init_shutdown_refcount.h b/projects/amdsmi/tests/amd_smi_test/functional/init_shutdown_refcount.h
index 5369ee633f..be0058a779 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/init_shutdown_refcount.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/init_shutdown_refcount.h
@@ -46,7 +46,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_INIT_SHUTDOWN_REFCOUNT_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_INIT_SHUTDOWN_REFCOUNT_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestConcurrentInit : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mem_page_info_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/mem_page_info_read.cc
index 22824e02ab..f9fa27a135 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/mem_page_info_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/mem_page_info_read.cc
@@ -47,10 +47,10 @@
 #include <iostream>
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/mem_page_info_read.h"
-#include "amd_smi_test/test_common.h"
+#include "mem_page_info_read.h"
+#include "../test_common.h"
 
 TestMemPageInfoRead::TestMemPageInfoRead() : TestBase() {
   set_title("AMDSMI Memory Page Info Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mem_page_info_read.h b/projects/amdsmi/tests/amd_smi_test/functional/mem_page_info_read.h
index 1b11dd268c..823d915fef 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/mem_page_info_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/mem_page_info_read.h
@@ -43,7 +43,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_MEM_PAGE_INFO_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_MEM_PAGE_INFO_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestMemPageInfoRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.cc
index 4c8cc45908..67a7d14aa7 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.cc
@@ -48,10 +48,10 @@
 #include <string>
 #include <map>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/mem_util_read.h"
-#include "amd_smi_test/test_common.h"
+#include "mem_util_read.h"
+#include "../test_common.h"
 
 TestMemUtilRead::TestMemUtilRead() : TestBase() {
   set_title("Memory Utilization Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.h b/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.h
index c8501e7085..9317fdf265 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.h
@@ -43,7 +43,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_MEM_UTIL_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_MEM_UTIL_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestMemUtilRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/metrics_counter_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/metrics_counter_read.cc
index 6389277bdf..9cd838673a 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/metrics_counter_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/metrics_counter_read.cc
@@ -50,10 +50,10 @@
 #include <string>
 #include <map>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/metrics_counter_read.h"
-#include "amd_smi_test/test_common.h"
+#include "metrics_counter_read.h"
+#include "../test_common.h"
 
 
 TestMetricsCounterRead::TestMetricsCounterRead() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/metrics_counter_read.h b/projects/amdsmi/tests/amd_smi_test/functional/metrics_counter_read.h
index ae5002a413..ccf824f96d 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/metrics_counter_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/metrics_counter_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_METRICS_COUNTER_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_METRICS_COUNTER_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestMetricsCounterRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc
index b1f83e8b15..9ef1e7c662 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc
@@ -50,10 +50,10 @@
 #include <string>
 #include <map>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/mutual_exclusion.h"
-#include "amd_smi_test/test_common.h"
+#include "mutual_exclusion.h"
+#include "../test_common.h"
 
 #define  AMD_SMI_INIT_FLAG_RESRV_TEST1 0x800000000000000  //!< Reserved for test
 
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.h b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.h
index eacacf0c40..648367c23d 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_MUTUAL_EXCLUSION_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_MUTUAL_EXCLUSION_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestMutualExclusion : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.cc
index 4af1e845ee..d1b301252a 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.cc
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/overdrive_read.h"
-#include "amd_smi_test/test_common.h"
+#include "overdrive_read.h"
+#include "../test_common.h"
 
 TestOverdriveRead::TestOverdriveRead() : TestBase() {
   set_title("AMDSMI Overdrive Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.h b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.h
index d2502886b3..40818155ad 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_OVERDRIVE_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_OVERDRIVE_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestOverdriveRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.cc
index c54e8c2cab..8453305f72 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.cc
@@ -48,10 +48,10 @@
 
 #include <iostream>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/overdrive_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "overdrive_read_write.h"
+#include "../test_common.h"
 
 TestOverdriveReadWrite::TestOverdriveReadWrite() : TestBase() {
   set_title("AMDSMI Overdrive Read/Write Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.h b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.h
index aa5adb3876..009f7bec9d 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_OVERDRIVE_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_OVERDRIVE_READ_WRITE_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestOverdriveReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc
index 9c46b52dec..e663a003fe 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc
@@ -48,10 +48,10 @@
 #include <string>
 #include <algorithm>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/pci_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "pci_read_write.h"
+#include "../test_common.h"
 
 
 TestPciReadWrite::TestPciReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.h b/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.h
index ecb0b2acea..9b0b13a849 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_PCI_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_PCI_READ_WRITE_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPciReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.cc
index 3bad6718dc..9b8a6c4870 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.cc
@@ -53,10 +53,10 @@
 #include <vector>
 #include <memory>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/perf_cntr_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "perf_cntr_read_write.h"
+#include "../test_common.h"
 
 PerfCntrEvtGrp::PerfCntrEvtGrp(amdsmi_event_group_t grp, uint32_t first,
         uint32_t last, std::string name) : grp_(grp), first_evt_(first),
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.h b/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.h
index 771430f11e..96e29199dd 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.h
@@ -47,7 +47,7 @@
 
 #include <string>
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPerfCntrReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc b/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc
index 1ab3bd6c73..62c0215cbc 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc
@@ -52,10 +52,10 @@
 #include <bitset>
 #include <algorithm>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/perf_determinism.h"
-#include "amd_smi_test/test_common.h"
+#include "perf_determinism.h"
+#include "../test_common.h"
 
 
 TestPerfDeterminism::TestPerfDeterminism() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.h b/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.h
index 30e4851910..2803d23db3 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_PERF_DETERMINISM_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_PERF_DETERMINISM_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPerfDeterminism : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.cc
index 77b6354639..49ba6cfc28 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.cc
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/perf_level_read.h"
-#include "amd_smi_test/test_common.h"
+#include "perf_level_read.h"
+#include "../test_common.h"
 
 TestPerfLevelRead::TestPerfLevelRead() : TestBase() {
   set_title("AMDSMI Performance Level Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.h b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.h
index 8c40ccd9d5..ea4f91e651 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_PERF_LEVEL_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_PERF_LEVEL_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPerfLevelRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read_write.cc
index 0f5eb5e02e..e4a39c0d9a 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read_write.cc
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <map>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/perf_level_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "perf_level_read_write.h"
+#include "../test_common.h"
 
 
 TestPerfLevelReadWrite::TestPerfLevelReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read_write.h b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read_write.h
index e14cf4c940..9032f0afe9 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read_write.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_PERF_LEVEL_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_PERF_LEVEL_READ_WRITE_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPerfLevelReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/power_cap_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/power_cap_read_write.cc
index 9e0428baf6..e5e9649d6b 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/power_cap_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/power_cap_read_write.cc
@@ -51,10 +51,10 @@
 #include <string>
 #include <algorithm>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/power_cap_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "power_cap_read_write.h"
+#include "../test_common.h"
 
 
 TestPowerCapReadWrite::TestPowerCapReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/power_cap_read_write.h b/projects/amdsmi/tests/amd_smi_test/functional/power_cap_read_write.h
index 0cc541bb19..8fd44c93af 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/power_cap_read_write.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/power_cap_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_POWER_CAP_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_POWER_CAP_READ_WRITE_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPowerCapReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/power_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/power_read.cc
index b4091b7c23..11b3149347 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/power_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/power_read.cc
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/power_read.h"
-#include "amd_smi_test/test_common.h"
+#include "power_read.h"
+#include "../test_common.h"
 
 TestPowerRead::TestPowerRead() : TestBase() {
   set_title("AMDSMI Power Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/power_read.h b/projects/amdsmi/tests/amd_smi_test/functional/power_read.h
index c3285e1f31..7a7047b591 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/power_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/power_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_POWER_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_POWER_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPowerRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc
index 8c2ee46180..01408d0825 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc
@@ -51,10 +51,10 @@
 #include <string>
 #include <algorithm>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/power_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "power_read_write.h"
+#include "../test_common.h"
 
 
 TestPowerReadWrite::TestPowerReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.h b/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.h
index 4a455f9182..6c9168021a 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_POWER_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_POWER_READ_WRITE_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPowerReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.cc
index aa7a5420b6..56733bb6d7 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.cc
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/process_info_read.h"
-#include "amd_smi_test/test_common.h"
+#include "process_info_read.h"
+#include "../test_common.h"
 
 TestProcInfoRead::TestProcInfoRead() : TestBase() {
   set_title("AMDSMI Process Info Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.h b/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.h
index 97b3afb239..f71992706a 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_PROCESS_INFO_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_PROCESS_INFO_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestProcInfoRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.cc
index 6e3b9da375..da40d37395 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.cc
@@ -49,11 +49,11 @@
 #include <iostream>
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/sys_info_read.h"
-#include "amd_smi_test/test_common.h"
-#include "amd_smi_test/test_utils.h"
+#include "sys_info_read.h"
+#include "../test_common.h"
+#include "../test_utils.h"
 
 TestSysInfoRead::TestSysInfoRead() : TestBase() {
   set_title("AMDSMI System Info Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.h b/projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.h
index 10e5f2411d..a165c81b9e 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_SYS_INFO_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_SYS_INFO_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestSysInfoRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/temp_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/temp_read.cc
index 9947d11134..7575fcb70e 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/temp_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/temp_read.cc
@@ -50,10 +50,10 @@
 #include <string>
 #include <map>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/temp_read.h"
-#include "amd_smi_test/test_common.h"
+#include "temp_read.h"
+#include "../test_common.h"
 
 
 static const std::map<uint32_t, std::string> kTempSensorNameMap = {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/temp_read.h b/projects/amdsmi/tests/amd_smi_test/functional/temp_read.h
index 12ec8d8c65..21a20ea563 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/temp_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/temp_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_TEMP_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_TEMP_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestTempRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/version_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/version_read.cc
index 196ec0527a..e22d811fb9 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/version_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/version_read.cc
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <map>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/version_read.h"
-#include "amd_smi_test/test_common.h"
+#include "version_read.h"
+#include "../test_common.h"
 
 TestVersionRead::TestVersionRead() : TestBase() {
   set_title("AMDSMI Version Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/version_read.h b/projects/amdsmi/tests/amd_smi_test/functional/version_read.h
index d39107165a..ff9948db1f 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/version_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/version_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_VERSION_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_VERSION_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestVersionRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc
index 8c7ed96a72..7c59cb972a 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/volt_freq_curv_read.h"
-#include "amd_smi_test/test_common.h"
+#include "volt_freq_curv_read.h"
+#include "../test_common.h"
 
 TestVoltCurvRead::TestVoltCurvRead() : TestBase() {
   set_title("AMDSMI Voltage-Frequency Curve Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.h b/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.h
index 05ccba3661..dadd26b999 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_VOLT_FREQ_CURV_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_VOLT_FREQ_CURV_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestVoltCurvRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/volt_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/volt_read.cc
index ca63e9bbe4..ec89d9f57a 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/volt_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/volt_read.cc
@@ -50,10 +50,10 @@
 #include <string>
 #include <map>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/volt_read.h"
-#include "amd_smi_test/test_common.h"
+#include "volt_read.h"
+#include "../test_common.h"
 
 
 TestVoltRead::TestVoltRead() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/volt_read.h b/projects/amdsmi/tests/amd_smi_test/functional/volt_read.h
index 224df4e634..83c1b4cd7e 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/volt_read.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/volt_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_VOLT_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_VOLT_READ_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestVoltRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/xgmi_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/xgmi_read_write.cc
index f888935ab4..bd110bbfee 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/xgmi_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/xgmi_read_write.cc
@@ -48,10 +48,10 @@
 
 #include <iostream>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/xgmi_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "xgmi_read_write.h"
+#include "../test_common.h"
 
 TestXGMIReadWrite::TestXGMIReadWrite() : TestBase() {
   set_title("AMDSMI XGMI Read/Write Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/xgmi_read_write.h b/projects/amdsmi/tests/amd_smi_test/functional/xgmi_read_write.h
index d54ad0988f..496c48baf3 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/xgmi_read_write.h
+++ b/projects/amdsmi/tests/amd_smi_test/functional/xgmi_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_XGMI_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_XGMI_READ_WRITE_H_
 
-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestXGMIReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/amd_smi_test/main.cc b/projects/amdsmi/tests/amd_smi_test/main.cc
index 6d674faca7..0c0d51be46 100644
--- a/projects/amdsmi/tests/amd_smi_test/main.cc
+++ b/projects/amdsmi/tests/amd_smi_test/main.cc
@@ -49,20 +49,20 @@
 #include <iostream>
 
 #include "amd_smi/amd_smi.h"
-#include "gtest/gtest.h"
-#include "amd_smi_test/test_common.h"
-#include "amd_smi_test/test_base.h"
+#include <gtest/gtest.h>
+#include "test_common.h"
+#include "test_base.h"
 
 #include "functional/fan_read.h"
 #include "functional/fan_read_write.h"
 #include "functional/evt_notif_read_write.h"
 #include "functional/perf_cntr_read_write.h"
-#include "amd_smi_test/functional/hw_topology_read.h"
+#include "functional/hw_topology_read.h"
 #include "functional/xgmi_read_write.h"
 #include "functional/api_support_read.h"
 #include "functional/process_info_read.h"
 #include "functional/gpu_busy_read.h"
-#include "amd_smi_test/functional/gpu_metrics_read.h"
+#include "functional/gpu_metrics_read.h"
 #include "functional/err_cnt_read.h"
 #include "functional/power_read.h"
 #include "functional/power_read_write.h"
@@ -79,10 +79,10 @@
 #include "functional/perf_level_read.h"
 #include "functional/perf_level_read_write.h"
 #include "functional/pci_read_write.h"
-#include "amd_smi_test/functional/perf_determinism.h"
+#include "functional/perf_determinism.h"
 #include "functional/sys_info_read.h"
 #include "functional/id_info_read.h"
-#include "amd_smi_test/functional/metrics_counter_read.h"
+#include "functional/metrics_counter_read.h"
 #include "functional/version_read.h"
 #include "functional/mutual_exclusion.h"
 #include "functional/init_shutdown_refcount.h"
diff --git a/projects/amdsmi/tests/amd_smi_test/test_base.cc b/projects/amdsmi/tests/amd_smi_test/test_base.cc
index 5fcb513f1c..e0d96c6448 100644
--- a/projects/amdsmi/tests/amd_smi_test/test_base.cc
+++ b/projects/amdsmi/tests/amd_smi_test/test_base.cc
@@ -46,9 +46,9 @@
 #include <assert.h>
 
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/test_base.h"
-#include "amd_smi_test/test_common.h"
-#include "gtest/gtest.h"
+#include "test_base.h"
+#include "test_common.h"
+#include <gtest/gtest.h>
 
 static const int kOutputLineLength = 80;
 static const char kLabelDelimiter[] = "####";
diff --git a/projects/amdsmi/tests/amd_smi_test/test_common.cc b/projects/amdsmi/tests/amd_smi_test/test_common.cc
index d1f890caa3..1177e90caa 100644
--- a/projects/amdsmi/tests/amd_smi_test/test_common.cc
+++ b/projects/amdsmi/tests/amd_smi_test/test_common.cc
@@ -51,8 +51,8 @@
 #include <string>
 #include <map>
 
-#include "amd_smi_test/test_base.h"
-#include "amd_smi_test/test_common.h"
+#include "test_base.h"
+#include "test_common.h"
 #include "amd_smi/amd_smi.h"
 
 static const std::map<amdsmi_dev_perf_level_t, const char *>
diff --git a/projects/amdsmi/tests/amd_smi_test/test_utils.cc b/projects/amdsmi/tests/amd_smi_test/test_utils.cc
index 18a614f358..f902eb2477 100644
--- a/projects/amdsmi/tests/amd_smi_test/test_utils.cc
+++ b/projects/amdsmi/tests/amd_smi_test/test_utils.cc
@@ -46,7 +46,7 @@
 #include <map>
 
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/test_utils.h"
+#include "test_utils.h"
 
 static const std::map<amdsmi_fw_block_t, const char *> kDevFWNameMap = {
     {FW_ID_ASD, "asd"},
diff --git a/projects/amdsmi/tests/rocm_smi_test/CMakeLists.txt b/projects/amdsmi/tests/rocm_smi_test/CMakeLists.txt
index e6e8ba9b3f..233f40647f 100755
--- a/projects/amdsmi/tests/rocm_smi_test/CMakeLists.txt
+++ b/projects/amdsmi/tests/rocm_smi_test/CMakeLists.txt
@@ -50,22 +50,21 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/functional functionalSources)
 
 link_directories(${RSMI_LIB_DIR})
 
-set(RSMITST "rsmitst64")
+set(TEST "rsmitst64")
 
 # Source files
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} rsmitstSources)
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} tstSources)
 
 # Header file include path
-include_directories(${RSMI_INC_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 # Build rules
-add_executable(${RSMITST} ${rsmitstSources} ${functionalSources})
+add_executable(${TEST} ${tstSources} ${functionalSources})
 
-target_link_libraries(${RSMITST} amd_smi64 c stdc++ pthread GTest::gtest_main)
+target_link_libraries(${TEST} amd_smi64 c stdc++ pthread GTest::gtest_main)
 
 install(
-    TARGETS ${RSMITST}
+    TARGETS ${TEST}
     ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib
     LIBRARY DESTINATION ${PROJECT_BINARY_DIR}/lib
     RUNTIME DESTINATION ${PROJECT_BINARY_DIR}/bin)
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/api_support_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/api_support_read.cc
index 997de85db0..693e978432 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/api_support_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/api_support_read.cc
@@ -51,9 +51,9 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/api_support_read.h"
-#include "rocm_smi_test/test_common.h"
-#include "rocm_smi_test/test_utils.h"
+#include "api_support_read.h"
+#include "../test_common.h"
+#include "../test_utils.h"
 
 TestAPISupportRead::TestAPISupportRead() : TestBase() {
   set_title("RSMI API Support Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/api_support_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/api_support_read.h
index 08a6f0bf56..86ff546a8b 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/api_support_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/api_support_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_API_SUPPORT_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_API_SUPPORT_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestAPISupportRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/err_cnt_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/err_cnt_read.cc
index b5c76e4ee6..1ff1c66df4 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/err_cnt_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/err_cnt_read.cc
@@ -48,8 +48,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/err_cnt_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "err_cnt_read.h"
+#include "../test_common.h"
 
 TestErrCntRead::TestErrCntRead() : TestBase() {
   set_title("RSMI Error Count Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/err_cnt_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/err_cnt_read.h
index 3653ebebe0..046796c381 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/err_cnt_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/err_cnt_read.h
@@ -43,7 +43,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_ERR_CNT_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_ERR_CNT_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestErrCntRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/evt_notif_read_write.cc b/projects/amdsmi/tests/rocm_smi_test/functional/evt_notif_read_write.cc
index 7721e34222..f070466160 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/evt_notif_read_write.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/evt_notif_read_write.cc
@@ -50,9 +50,9 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/evt_notif_read_write.h"
-#include "rocm_smi_test/test_common.h"
-#include "rocm_smi_test/test_utils.h"
+#include "evt_notif_read_write.h"
+#include "../test_common.h"
+#include "../test_utils.h"
 
 TestEvtNotifReadWrite::TestEvtNotifReadWrite() : TestBase() {
   set_title("RSMI Event Notification Read/Write Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/evt_notif_read_write.h b/projects/amdsmi/tests/rocm_smi_test/functional/evt_notif_read_write.h
index 3e3e142271..604bb4f9ea 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/evt_notif_read_write.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/evt_notif_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_EVT_NOTIF_READ_WRITE_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_EVT_NOTIF_READ_WRITE_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestEvtNotifReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/fan_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/fan_read.cc
index acb0cfb857..b467538ea2 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/fan_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/fan_read.cc
@@ -50,8 +50,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/fan_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "fan_read.h"
+#include "../test_common.h"
 
 TestFanRead::TestFanRead() : TestBase() {
   set_title("RSMI Fan Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/fan_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/fan_read.h
index 13f5886203..20e4bba120 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/fan_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/fan_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_FAN_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_FAN_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestFanRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/fan_read_write.cc b/projects/amdsmi/tests/rocm_smi_test/functional/fan_read_write.cc
index 4388a3e68e..ae9f79e676 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/fan_read_write.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/fan_read_write.cc
@@ -50,8 +50,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/fan_read_write.h"
-#include "rocm_smi_test/test_common.h"
+#include "fan_read_write.h"
+#include "../test_common.h"
 
 TestFanReadWrite::TestFanReadWrite() : TestBase() {
   set_title("RSMI Fan Read/Write Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/fan_read_write.h b/projects/amdsmi/tests/rocm_smi_test/functional/fan_read_write.h
index ef1b44abc9..3964a15e4f 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/fan_read_write.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/fan_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_FAN_READ_WRITE_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_FAN_READ_WRITE_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestFanReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read.cc
index 10901eea9e..79226fa7b0 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read.cc
@@ -51,8 +51,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/frequencies_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "frequencies_read.h"
+#include "../test_common.h"
 
 TestFrequenciesRead::TestFrequenciesRead() : TestBase() {
   set_title("RSMI Frequencies Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read.h
index ff39a8aa2d..3fadc96db2 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestFrequenciesRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read_write.cc b/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read_write.cc
index 8315171d60..81a1357b8c 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read_write.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read_write.cc
@@ -54,8 +54,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/frequencies_read_write.h"
-#include "rocm_smi_test/test_common.h"
+#include "frequencies_read_write.h"
+#include "../test_common.h"
 
 
 TestFrequenciesReadWrite::TestFrequenciesReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read_write.h b/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read_write.h
index feca897463..c9cce23093 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read_write.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/frequencies_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_WRITE_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_WRITE_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestFrequenciesReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/gpu_busy_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/gpu_busy_read.cc
index e47ccec740..298b8ea17f 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/gpu_busy_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/gpu_busy_read.cc
@@ -51,8 +51,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/gpu_busy_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "gpu_busy_read.h"
+#include "../test_common.h"
 
 TestGPUBusyRead::TestGPUBusyRead() : TestBase() {
   set_title("RSMI GPU Busy Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/gpu_busy_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/gpu_busy_read.h
index c341d0ebc5..7da865c474 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/gpu_busy_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/gpu_busy_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_GPU_BUSY_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_GPU_BUSY_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestGPUBusyRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/gpu_metrics_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/gpu_metrics_read.cc
index 186808d224..80efe7018a 100644
--- a/projects/amdsmi/tests/rocm_smi_test/functional/gpu_metrics_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/gpu_metrics_read.cc
@@ -52,8 +52,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/gpu_metrics_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "gpu_metrics_read.h"
+#include "../test_common.h"
 
 
 TestGpuMetricsRead::TestGpuMetricsRead() : TestBase() {
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/gpu_metrics_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/gpu_metrics_read.h
index a732a403a0..84139b8647 100644
--- a/projects/amdsmi/tests/rocm_smi_test/functional/gpu_metrics_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/gpu_metrics_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_GPU_METRICS_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_GPU_METRICS_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestGpuMetricsRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/hw_topology_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/hw_topology_read.cc
index ce50b7d7f4..880dd8d11d 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/hw_topology_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/hw_topology_read.cc
@@ -52,8 +52,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/hw_topology_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "hw_topology_read.h"
+#include "../test_common.h"
 
 typedef struct {
   std::string type;
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/hw_topology_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/hw_topology_read.h
index a311d2680e..7291a38f9f 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/hw_topology_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/hw_topology_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_HW_TOPOLOGY_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_HW_TOPOLOGY_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestHWTopologyRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.cc
index cb74494709..04982c7743 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.cc
@@ -49,8 +49,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/id_info_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "id_info_read.h"
+#include "../test_common.h"
 
 TestIdInfoRead::TestIdInfoRead() : TestBase() {
   set_title("RSMI ID Info Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.h
index b3abe32840..28dd028155 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_ID_INFO_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_ID_INFO_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestIdInfoRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/init_shutdown_refcount.cc b/projects/amdsmi/tests/rocm_smi_test/functional/init_shutdown_refcount.cc
index 8beef24637..698c028f64 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/init_shutdown_refcount.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/init_shutdown_refcount.cc
@@ -51,10 +51,10 @@
 #include <random>
 #include <chrono>  // NOLINT
 
-#include "rocm_smi_test/functional/init_shutdown_refcount.h"
+#include "init_shutdown_refcount.h"
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/test_common.h"
+#include "../test_common.h"
 
 extern int32_t
 rsmi_test_refcount(uint64_t refcnt_type);
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/init_shutdown_refcount.h b/projects/amdsmi/tests/rocm_smi_test/functional/init_shutdown_refcount.h
index 50bc5cf7f3..4fe5cc0dd5 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/init_shutdown_refcount.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/init_shutdown_refcount.h
@@ -46,7 +46,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_INIT_SHUTDOWN_REFCOUNT_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_INIT_SHUTDOWN_REFCOUNT_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestConcurrentInit : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/mem_page_info_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/mem_page_info_read.cc
index 4fc351036a..46d677f53b 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/mem_page_info_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/mem_page_info_read.cc
@@ -49,8 +49,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/mem_page_info_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "mem_page_info_read.h"
+#include "../test_common.h"
 
 TestMemPageInfoRead::TestMemPageInfoRead() : TestBase() {
   set_title("RSMI Memory Page Info Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/mem_page_info_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/mem_page_info_read.h
index 76a25c349b..926fc907cf 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/mem_page_info_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/mem_page_info_read.h
@@ -43,7 +43,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_MEM_PAGE_INFO_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_MEM_PAGE_INFO_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestMemPageInfoRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/mem_util_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/mem_util_read.cc
index f1a7b85c91..e304a98abe 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/mem_util_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/mem_util_read.cc
@@ -50,8 +50,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/mem_util_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "mem_util_read.h"
+#include "../test_common.h"
 
 TestMemUtilRead::TestMemUtilRead() : TestBase() {
   set_title("Memory Utilization Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/mem_util_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/mem_util_read.h
index 2ed92b3711..854e3cebef 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/mem_util_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/mem_util_read.h
@@ -43,7 +43,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_MEM_UTIL_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_MEM_UTIL_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestMemUtilRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/metrics_counter_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/metrics_counter_read.cc
index 5ec82e9ea5..62cafee870 100644
--- a/projects/amdsmi/tests/rocm_smi_test/functional/metrics_counter_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/metrics_counter_read.cc
@@ -52,8 +52,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/metrics_counter_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "metrics_counter_read.h"
+#include "../test_common.h"
 
 
 TestMetricsCounterRead::TestMetricsCounterRead() : TestBase() {
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/metrics_counter_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/metrics_counter_read.h
index 3c15ce62a8..4e0187e6d4 100644
--- a/projects/amdsmi/tests/rocm_smi_test/functional/metrics_counter_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/metrics_counter_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_METRICS_COUNTER_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_METRICS_COUNTER_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestMetricsCounterRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/mutual_exclusion.cc b/projects/amdsmi/tests/rocm_smi_test/functional/mutual_exclusion.cc
index bb1554295a..8e7330cd1c 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/mutual_exclusion.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/mutual_exclusion.cc
@@ -52,8 +52,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/mutual_exclusion.h"
-#include "rocm_smi_test/test_common.h"
+#include "mutual_exclusion.h"
+#include "../test_common.h"
 
 
 TestMutualExclusion::TestMutualExclusion() : TestBase() {
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/mutual_exclusion.h b/projects/amdsmi/tests/rocm_smi_test/functional/mutual_exclusion.h
index d37355c71c..5a79d5cda7 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/mutual_exclusion.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/mutual_exclusion.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_MUTUAL_EXCLUSION_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_MUTUAL_EXCLUSION_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestMutualExclusion : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read.cc
index 19d60903cc..12469af927 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read.cc
@@ -51,8 +51,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/overdrive_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "overdrive_read.h"
+#include "../test_common.h"
 
 TestOverdriveRead::TestOverdriveRead() : TestBase() {
   set_title("RSMI Overdrive Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read.h
index a9e02826a8..d143ae7e28 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_OVERDRIVE_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_OVERDRIVE_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestOverdriveRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read_write.cc b/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read_write.cc
index 7dc96698b2..830dcc03e9 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read_write.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read_write.cc
@@ -50,8 +50,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/overdrive_read_write.h"
-#include "rocm_smi_test/test_common.h"
+#include "overdrive_read_write.h"
+#include "../test_common.h"
 
 TestOverdriveReadWrite::TestOverdriveReadWrite() : TestBase() {
   set_title("RSMI Overdrive Read/Write Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read_write.h b/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read_write.h
index 8530f93203..2e128963dd 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read_write.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/overdrive_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_OVERDRIVE_READ_WRITE_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_OVERDRIVE_READ_WRITE_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestOverdriveReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/pci_read_write.cc b/projects/amdsmi/tests/rocm_smi_test/functional/pci_read_write.cc
index ccb4262c3d..b01b67681f 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/pci_read_write.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/pci_read_write.cc
@@ -50,8 +50,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/pci_read_write.h"
-#include "rocm_smi_test/test_common.h"
+#include "pci_read_write.h"
+#include "../test_common.h"
 
 
 TestPciReadWrite::TestPciReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/pci_read_write.h b/projects/amdsmi/tests/rocm_smi_test/functional/pci_read_write.h
index 7785d919ec..5691424ba4 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/pci_read_write.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/pci_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_PCI_READ_WRITE_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_PCI_READ_WRITE_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPciReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/perf_cntr_read_write.cc b/projects/amdsmi/tests/rocm_smi_test/functional/perf_cntr_read_write.cc
index 46fc68d8d7..d8c51a7e19 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/perf_cntr_read_write.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/perf_cntr_read_write.cc
@@ -55,8 +55,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/perf_cntr_read_write.h"
-#include "rocm_smi_test/test_common.h"
+#include "perf_cntr_read_write.h"
+#include "../test_common.h"
 
 PerfCntrEvtGrp::PerfCntrEvtGrp(rsmi_event_group_t grp, uint32_t first,
         uint32_t last, std::string name) : grp_(grp), first_evt_(first),
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/perf_cntr_read_write.h b/projects/amdsmi/tests/rocm_smi_test/functional/perf_cntr_read_write.h
index 337fca3ba6..bfb3334210 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/perf_cntr_read_write.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/perf_cntr_read_write.h
@@ -47,7 +47,7 @@
 
 #include <string>
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPerfCntrReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/perf_determinism.cc b/projects/amdsmi/tests/rocm_smi_test/functional/perf_determinism.cc
index b620de7971..9488d59a44 100644
--- a/projects/amdsmi/tests/rocm_smi_test/functional/perf_determinism.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/perf_determinism.cc
@@ -54,8 +54,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/perf_determinism.h"
-#include "rocm_smi_test/test_common.h"
+#include "perf_determinism.h"
+#include "../test_common.h"
 
 
 TestPerfDeterminism::TestPerfDeterminism() : TestBase() {
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/perf_determinism.h b/projects/amdsmi/tests/rocm_smi_test/functional/perf_determinism.h
index 64d460aa19..77c77923c2 100644
--- a/projects/amdsmi/tests/rocm_smi_test/functional/perf_determinism.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/perf_determinism.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_PERF_DETERMINISM_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_PERF_DETERMINISM_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPerfDeterminism : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read.cc
index b3d0ae04da..6ffc297ab3 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read.cc
@@ -51,8 +51,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/perf_level_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "perf_level_read.h"
+#include "../test_common.h"
 
 TestPerfLevelRead::TestPerfLevelRead() : TestBase() {
   set_title("RSMI Performance Level Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read.h
index 78c11dcc40..ee84f3616f 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_PERF_LEVEL_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_PERF_LEVEL_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPerfLevelRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read_write.cc b/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read_write.cc
index 083d6114fa..2107f46c8e 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read_write.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read_write.cc
@@ -51,8 +51,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/perf_level_read_write.h"
-#include "rocm_smi_test/test_common.h"
+#include "perf_level_read_write.h"
+#include "../test_common.h"
 
 
 TestPerfLevelReadWrite::TestPerfLevelReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read_write.h b/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read_write.h
index 7d082fa9f1..06a3651da9 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read_write.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/perf_level_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_PERF_LEVEL_READ_WRITE_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_PERF_LEVEL_READ_WRITE_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPerfLevelReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/power_cap_read_write.cc b/projects/amdsmi/tests/rocm_smi_test/functional/power_cap_read_write.cc
index 59dab17e0e..98e91c9790 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/power_cap_read_write.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/power_cap_read_write.cc
@@ -53,8 +53,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/power_cap_read_write.h"
-#include "rocm_smi_test/test_common.h"
+#include "power_cap_read_write.h"
+#include "../test_common.h"
 
 
 TestPowerCapReadWrite::TestPowerCapReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/power_cap_read_write.h b/projects/amdsmi/tests/rocm_smi_test/functional/power_cap_read_write.h
index 1a8e02ccbf..7ed911b508 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/power_cap_read_write.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/power_cap_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_POWER_CAP_READ_WRITE_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_POWER_CAP_READ_WRITE_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPowerCapReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/power_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/power_read.cc
index 6e370a6772..07f4ba405f 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/power_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/power_read.cc
@@ -51,8 +51,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/power_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "power_read.h"
+#include "../test_common.h"
 
 TestPowerRead::TestPowerRead() : TestBase() {
   set_title("RSMI Power Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/power_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/power_read.h
index f9d5b83e33..647cfa1881 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/power_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/power_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_POWER_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_POWER_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPowerRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/power_read_write.cc b/projects/amdsmi/tests/rocm_smi_test/functional/power_read_write.cc
index 7815db7b45..c714ed7fb0 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/power_read_write.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/power_read_write.cc
@@ -53,8 +53,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/power_read_write.h"
-#include "rocm_smi_test/test_common.h"
+#include "power_read_write.h"
+#include "../test_common.h"
 
 
 TestPowerReadWrite::TestPowerReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/power_read_write.h b/projects/amdsmi/tests/rocm_smi_test/functional/power_read_write.h
index 55dc13b035..c54b09854d 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/power_read_write.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/power_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_POWER_READ_WRITE_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_POWER_READ_WRITE_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestPowerReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/process_info_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/process_info_read.cc
index 42061fbc5e..28e905e332 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/process_info_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/process_info_read.cc
@@ -51,8 +51,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/process_info_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "process_info_read.h"
+#include "../test_common.h"
 
 TestProcInfoRead::TestProcInfoRead() : TestBase() {
   set_title("RSMI Process Info Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/process_info_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/process_info_read.h
index 9640fa5cd0..78b20213ed 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/process_info_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/process_info_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_PROCESS_INFO_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_PROCESS_INFO_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestProcInfoRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/sys_info_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/sys_info_read.cc
index df2a162606..7a08abd4b8 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/sys_info_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/sys_info_read.cc
@@ -51,9 +51,9 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/sys_info_read.h"
-#include "rocm_smi_test/test_common.h"
-#include "rocm_smi_test/test_utils.h"
+#include "sys_info_read.h"
+#include "../test_common.h"
+#include "../test_utils.h"
 
 TestSysInfoRead::TestSysInfoRead() : TestBase() {
   set_title("RSMI System Info Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/sys_info_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/sys_info_read.h
index e033962df6..847256a333 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/sys_info_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/sys_info_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_SYS_INFO_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_SYS_INFO_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestSysInfoRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/temp_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/temp_read.cc
index e000cebe1f..ce1d25d9ef 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/temp_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/temp_read.cc
@@ -52,8 +52,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/temp_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "temp_read.h"
+#include "../test_common.h"
 
 
 static const std::map<uint32_t, std::string> kTempSensorNameMap = {
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/temp_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/temp_read.h
index c97a8246d4..7dd4d9945c 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/temp_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/temp_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_TEMP_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_TEMP_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestTempRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/version_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/version_read.cc
index e597a120d8..938b8c41e2 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/version_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/version_read.cc
@@ -51,8 +51,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/version_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "version_read.h"
+#include "../test_common.h"
 
 TestVersionRead::TestVersionRead() : TestBase() {
   set_title("RSMI Version Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/version_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/version_read.h
index e98cd75137..26f9d7f724 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/version_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/version_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_VERSION_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_VERSION_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestVersionRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/volt_freq_curv_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/volt_freq_curv_read.cc
index 0ec9b1368d..18cd44d13d 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/volt_freq_curv_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/volt_freq_curv_read.cc
@@ -51,8 +51,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/volt_freq_curv_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "volt_freq_curv_read.h"
+#include "../test_common.h"
 
 TestVoltCurvRead::TestVoltCurvRead() : TestBase() {
   set_title("RSMI Voltage-Frequency Curve Read Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/volt_freq_curv_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/volt_freq_curv_read.h
index 5227ae70b9..34f917dd33 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/volt_freq_curv_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/volt_freq_curv_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_VOLT_FREQ_CURV_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_VOLT_FREQ_CURV_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestVoltCurvRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/volt_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/volt_read.cc
index fae8a34db9..ccb6c43a8e 100644
--- a/projects/amdsmi/tests/rocm_smi_test/functional/volt_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/volt_read.cc
@@ -52,8 +52,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/volt_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "volt_read.h"
+#include "../test_common.h"
 
 
 TestVoltRead::TestVoltRead() : TestBase() {
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/volt_read.h b/projects/amdsmi/tests/rocm_smi_test/functional/volt_read.h
index fbfccff3ae..342e95dd81 100644
--- a/projects/amdsmi/tests/rocm_smi_test/functional/volt_read.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/volt_read.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_VOLT_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_VOLT_READ_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestVoltRead : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/xgmi_read_write.cc b/projects/amdsmi/tests/rocm_smi_test/functional/xgmi_read_write.cc
index 2ae4908253..b9002b0112 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/xgmi_read_write.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/xgmi_read_write.cc
@@ -50,8 +50,8 @@
 
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/xgmi_read_write.h"
-#include "rocm_smi_test/test_common.h"
+#include "xgmi_read_write.h"
+#include "../test_common.h"
 
 TestXGMIReadWrite::TestXGMIReadWrite() : TestBase() {
   set_title("RSMI XGMI Read/Write Test");
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/xgmi_read_write.h b/projects/amdsmi/tests/rocm_smi_test/functional/xgmi_read_write.h
index 4541f7a346..0aca5496ee 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/xgmi_read_write.h
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/xgmi_read_write.h
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_XGMI_READ_WRITE_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_XGMI_READ_WRITE_H_
 
-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"
 
 class TestXGMIReadWrite : public TestBase {
  public:
diff --git a/projects/amdsmi/tests/rocm_smi_test/main.cc b/projects/amdsmi/tests/rocm_smi_test/main.cc
index 0c10c31254..4203d573f1 100755
--- a/projects/amdsmi/tests/rocm_smi_test/main.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/main.cc
@@ -50,8 +50,8 @@
 
 #include "rocm_smi/rocm_smi.h"
 #include <gtest/gtest.h>
-#include "rocm_smi_test/test_common.h"
-#include "rocm_smi_test/test_base.h"
+#include "test_common.h"
+#include "test_base.h"
 #include "functional/fan_read.h"
 #include "functional/fan_read_write.h"
 #include "functional/temp_read.h"
@@ -81,10 +81,10 @@
 #include "functional/mutual_exclusion.h"
 #include "functional/evt_notif_read_write.h"
 #include "functional/init_shutdown_refcount.h"
-#include "rocm_smi_test/functional/hw_topology_read.h"
-#include "rocm_smi_test/functional/gpu_metrics_read.h"
-#include "rocm_smi_test/functional/metrics_counter_read.h"
-#include "rocm_smi_test/functional/perf_determinism.h"
+#include "functional/hw_topology_read.h"
+#include "functional/gpu_metrics_read.h"
+#include "functional/metrics_counter_read.h"
+#include "functional/perf_determinism.h"
 
 static RSMITstGlobals *sRSMIGlvalues = nullptr;
 
diff --git a/projects/amdsmi/tests/rocm_smi_test/test_base.cc b/projects/amdsmi/tests/rocm_smi_test/test_base.cc
index 44d6b48964..e96e2a7dbf 100755
--- a/projects/amdsmi/tests/rocm_smi_test/test_base.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/test_base.cc
@@ -46,8 +46,8 @@
 #include <assert.h>
 
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/test_base.h"
-#include "rocm_smi_test/test_common.h"
+#include "test_base.h"
+#include "test_common.h"
 #include <gtest/gtest.h>
 
 static const int kOutputLineLength = 80;
diff --git a/projects/amdsmi/tests/rocm_smi_test/test_common.cc b/projects/amdsmi/tests/rocm_smi_test/test_common.cc
index eabc6125b5..c489b70d41 100755
--- a/projects/amdsmi/tests/rocm_smi_test/test_common.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/test_common.cc
@@ -51,8 +51,8 @@
 #include <string>
 #include <map>
 
-#include "rocm_smi_test/test_base.h"
-#include "rocm_smi_test/test_common.h"
+#include "test_base.h"
+#include "test_common.h"
 #include "rocm_smi/rocm_smi.h"
 
 static const std::map<rsmi_dev_perf_level_t, const char *>
diff --git a/projects/amdsmi/tests/rocm_smi_test/test_utils.cc b/projects/amdsmi/tests/rocm_smi_test/test_utils.cc
index c1b9a8de86..aeda744dd9 100755
--- a/projects/amdsmi/tests/rocm_smi_test/test_utils.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/test_utils.cc
@@ -46,7 +46,7 @@
 #include <map>
 
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/test_utils.h"
+#include "test_utils.h"
 
 static const std::map<rsmi_fw_block_t, const char *> kDevFWNameMap = {
     {RSMI_FW_BLOCK_ASD, "asd"},