diff --git a/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt b/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt
index 5ab9bd2..275404d 100755
--- a/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt
+++ b/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt
@@ -100,8 +100,8 @@ target_link_directories(${MODULE_NAME} PUBLIC ${CMAKE_INSTALL_PREFIX}/lib ${CMAK
 target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins gtest_main gmock gtest)
 
 set(ENTSERVICES_INC ../../../../entservices-deviceanddisplay/helpers ../../../../entservices-infra/helpers ../../../../entservices-mediaanddrm/helpers ../../../../entservices-softwareupdate/helpers ../../../../entservices-inputoutput/helpers ../../../../entservices-peripherals/helpers ../../../../entservices-connectivity/helpers)
+set(ENTSERVICES_INC ../../../../entservices-helpers/helpers)
 
-target_include_directories(${MODULE_NAME} PRIVATE ../../../helpers)
 target_include_directories(${MODULE_NAME} PRIVATE ./)
 target_include_directories(${MODULE_NAME} PRIVATE ../../mocks)
 target_include_directories(${MODULE_NAME} PRIVATE ../../mocks/thunder)
diff --git a/Tests/mocks/CMakeLists.txt b/Tests/mocks/CMakeLists.txt
index c87c0c5..3d38ceb 100755
--- a/Tests/mocks/CMakeLists.txt
+++ b/Tests/mocks/CMakeLists.txt
@@ -26,7 +26,7 @@ if(L2_TEST_OOP_RPC)
         target_include_directories(MockAccessor PRIVATE
             ${CMAKE_CURRENT_SOURCE_DIR}
             ${CMAKE_INSTALL_PREFIX}/include/WPEFramework/core
-            ${CMAKE_SOURCE_DIR}/helpers
+            ${CMAKE_SOURCE_DIR}/entservices-helpers/helpers
             ${CMAKE_SOURCE_DIR}/Tests/mocks
             ${CMAKE_SOURCE_DIR}/Tests/mocks/thunder
             ${CMAKE_INSTALL_PREFIX}/include
diff --git a/Tests/mocks/MockPlugin/CMakeLists.txt b/Tests/mocks/MockPlugin/CMakeLists.txt
index 2344a2c..78f1c0e 100755
--- a/Tests/mocks/MockPlugin/CMakeLists.txt
+++ b/Tests/mocks/MockPlugin/CMakeLists.txt
@@ -33,7 +33,7 @@ add_library(${MODULE_NAME} SHARED
 )
 
 # Include directories
-target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../../../helpers ../../mocks)
+target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../../../entservices-helpers/helpers ../../mocks)
 
 # Link libraries
 target_link_libraries(${MODULE_NAME}