diff --git a/tests/lib/heap/CMakeLists.txt b/tests/lib/heap/CMakeLists.txt
index 7fbd555f16de5..cecd7226fbc29 100644
--- a/tests/lib/heap/CMakeLists.txt
+++ b/tests/lib/heap/CMakeLists.txt
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.13.1)
-include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
+find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(heap)
 
 FILE(GLOB app_sources src/*.c)
diff --git a/tests/lib/notify/CMakeLists.txt b/tests/lib/notify/CMakeLists.txt
index abd9e6e13baee..a82a3fce60f5b 100644
--- a/tests/lib/notify/CMakeLists.txt
+++ b/tests/lib/notify/CMakeLists.txt
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.13.1)
-include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
+find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(sys_notify)
 
 FILE(GLOB app_sources src/*.c)