diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd75ce3181..941910620b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -402,7 +402,9 @@ if(PLUGIN_SHAREDSTORAGE)
 endif()
 
 if(PLUGIN_NETWORKMANAGER)
+    include(l1networkmanager.cmake)
     add_subdirectory(NetworkManager)
+    add_subdirectory(Tests/L1Tests)
 endif()
 
 if(WPEFRAMEWORK_CREATE_IPKG_TARGETS)
diff --git a/NetworkManager/CMakeLists.txt b/NetworkManager/CMakeLists.txt
index d4b493788b..9aef165fc1 100644
--- a/NetworkManager/CMakeLists.txt
+++ b/NetworkManager/CMakeLists.txt
@@ -14,10 +14,6 @@ add_compile_definitions(NETWORKMANAGER_PATCH_VERSION=${VERSION_PATCH})
 
 set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
-if(RDK_SERVICES_L1_TEST)
-    include(l1networkmanager.cmake)
-    add_subdirectory(../Tests/L1Tests)
-endif()
 
 include(CmakeHelperFunctions)
 
diff --git a/NetworkManager/l1networkmanager.cmake b/l1networkmanager.cmake
similarity index 95%
rename from NetworkManager/l1networkmanager.cmake
rename to l1networkmanager.cmake
index 47bfb440c1..4466647ace 100644
--- a/NetworkManager/l1networkmanager.cmake
+++ b/l1networkmanager.cmake
@@ -2,7 +2,7 @@ message("Building for unit tests...")
 
 message("Generating empty headers to suppress compiler errors")
 
-file(GLOB BASEDIR ../Tests)
+file(GLOB BASEDIR Tests)
 set(BASEDIR ${BASEDIR}/headers)
 set(EMPTY_HEADERS_DIRS
         ${BASEDIR}
@@ -33,7 +33,7 @@ include_directories(${EMPTY_HEADERS_DIRS})
 
 message("Adding compiler and linker options for all targets")
 
-file(GLOB BASEDIR ../Tests/mocks)
+file(GLOB BASEDIR Tests/mocks)
 set(FAKE_HEADERS
         ${BASEDIR}/Iarm.h
         )