diff --git a/doc/develop/test/mocking.c b/doc/develop/test/mocking.c
index 785423d5051..03458411011 100644
--- a/doc/develop/test/mocking.c
+++ b/doc/develop/test/mocking.c
@@ -1,4 +1,4 @@
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static void expect_two_parameters(int a, int b)
 {
diff --git a/modules/fff/include/c_test_framework.h b/modules/fff/include/c_test_framework.h
index 3c3f6d858f0..8a1d56395c1 100644
--- a/modules/fff/include/c_test_framework.h
+++ b/modules/fff/include/c_test_framework.h
@@ -6,7 +6,7 @@
 #ifndef MODULES_FFF_TEST_INCLUDE_C_TEST_FRAMEWORK_H_
 #define MODULES_FFF_TEST_INCLUDE_C_TEST_FRAMEWORK_H_
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/printk.h>
 
 void setup(void);
diff --git a/samples/subsys/testsuite/integration/src/main.c b/samples/subsys/testsuite/integration/src/main.c
index 60a15b4a10d..8f6a686b6f6 100644
--- a/samples/subsys/testsuite/integration/src/main.c
+++ b/samples/subsys/testsuite/integration/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 
 ZTEST_SUITE(framework_tests, NULL, NULL, NULL, NULL, NULL);
diff --git a/samples/subsys/testsuite/pytest/src/main.c b/samples/subsys/testsuite/pytest/src/main.c
index 4d4f396ff02..49fae9559a3 100644
--- a/samples/subsys/testsuite/pytest/src/main.c
+++ b/samples/subsys/testsuite/pytest/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(test_pytest, NULL, NULL, NULL, NULL, NULL);
 
diff --git a/subsys/testsuite/busy_sim/busy_sim.c b/subsys/testsuite/busy_sim/busy_sim.c
index c596fac37fb..314e41ef27e 100644
--- a/subsys/testsuite/busy_sim/busy_sim.c
+++ b/subsys/testsuite/busy_sim/busy_sim.c
@@ -6,7 +6,7 @@
 #include <zephyr/drivers/entropy.h>
 #include <zephyr/drivers/counter.h>
 #include <zephyr/drivers/gpio.h>
-#include "busy_sim.h"
+#include <zephyr/busy_sim.h>
 #include <zephyr/sys/ring_buffer.h>
 #include <zephyr/random/rand32.h>
 
diff --git a/subsys/testsuite/include/zephyr/test_utils.h b/subsys/testsuite/include/zephyr/test_utils.h
index 20ecff8207f..110d0306e31 100644
--- a/subsys/testsuite/include/zephyr/test_utils.h
+++ b/subsys/testsuite/include/zephyr/test_utils.h
@@ -32,7 +32,7 @@
 #ifndef __TEST_UTILS_H__
 #define __TEST_UTILS_H__
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <tinycrypt/constants.h>
 
 static inline void show_str(const char *label, const uint8_t *s, size_t len)
diff --git a/subsys/testsuite/include/zephyr/timestamp.h b/subsys/testsuite/include/zephyr/timestamp.h
index f38a635279f..673e9d822a3 100644
--- a/subsys/testsuite/include/zephyr/timestamp.h
+++ b/subsys/testsuite/include/zephyr/timestamp.h
@@ -17,9 +17,9 @@
 
 #include <limits.h>
 #if defined(__GNUC__)
-#include <test_asm_inline_gcc.h>
+#include <zephyr/test_asm_inline_gcc.h>
 #else
-#include <test_asm_inline_other.h>
+#include <zephyr/test_asm_inline_other.h>
 #endif
 
 
diff --git a/subsys/testsuite/ztest/include/zephyr/ztest.h b/subsys/testsuite/ztest/include/zephyr/ztest.h
index fd6ffa2f667..77038ae3fe0 100644
--- a/subsys/testsuite/ztest/include/zephyr/ztest.h
+++ b/subsys/testsuite/ztest/include/zephyr/ztest.h
@@ -58,10 +58,10 @@ typedef struct esf z_arch_esf_t;
 
 #include <zephyr/zephyr.h>
 
-#include <ztest_assert.h>
-#include <ztest_mock.h>
-#include <ztest_test.h>
-#include <tc_util.h>
+#include <zephyr/ztest_assert.h>
+#include <zephyr/ztest_mock.h>
+#include <zephyr/ztest_test.h>
+#include <zephyr/tc_util.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/testsuite/ztest/include/zephyr/ztest_assert.h b/subsys/testsuite/ztest/include/zephyr/ztest_assert.h
index f96d22526d1..63b782848a8 100644
--- a/subsys/testsuite/ztest/include/zephyr/ztest_assert.h
+++ b/subsys/testsuite/ztest/include/zephyr/ztest_assert.h
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/testsuite/ztest/include/zephyr/ztest_test.h b/subsys/testsuite/ztest/include/zephyr/ztest_test.h
index 90953425ae9..693d139dc92 100644
--- a/subsys/testsuite/ztest/include/zephyr/ztest_test.h
+++ b/subsys/testsuite/ztest/include/zephyr/ztest_test.h
@@ -9,9 +9,9 @@
 #define ZEPHYR_TESTSUITE_INCLUDE_ZTEST_TEST_H_
 
 #ifdef CONFIG_ZTEST_NEW_API
-#include <ztest_test_new.h>
+#include <zephyr/ztest_test_new.h>
 #else
-#include <ztest_test_deprecated.h>
+#include <zephyr/ztest_test_deprecated.h>
 #endif /* !CONFIG_ZTEST_NEW_API */
 
 #ifdef __cplusplus
diff --git a/subsys/testsuite/ztest/src/ztest_defaults.c b/subsys/testsuite/ztest/src/ztest_defaults.c
index 9aaa3bd05e8..cf8d626581e 100644
--- a/subsys/testsuite/ztest/src/ztest_defaults.c
+++ b/subsys/testsuite/ztest/src/ztest_defaults.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /**
  * @brief Try to shorten a filename by removing the current directory
diff --git a/subsys/testsuite/ztest/src/ztest_error_hook.c b/subsys/testsuite/ztest/src/ztest_error_hook.c
index 2fd448646ec..3fbc78cc702 100644
--- a/subsys/testsuite/ztest/src/ztest_error_hook.c
+++ b/subsys/testsuite/ztest/src/ztest_error_hook.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 
 #if defined(CONFIG_ZTEST_FATAL_HOOK)
diff --git a/subsys/testsuite/ztest/src/ztest_new.c b/subsys/testsuite/ztest/src/ztest_new.c
index 7934812c669..174e34ad18f 100644
--- a/subsys/testsuite/ztest/src/ztest_new.c
+++ b/subsys/testsuite/ztest/src/ztest_new.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/app_memory/app_memdomain.h>
 #ifdef CONFIG_USERSPACE
diff --git a/subsys/testsuite/ztest/src/ztest_posix.c b/subsys/testsuite/ztest/src/ztest_posix.c
index b64466764db..0912c4c08a0 100644
--- a/subsys/testsuite/ztest/src/ztest_posix.c
+++ b/subsys/testsuite/ztest/src/ztest_posix.c
@@ -9,8 +9,8 @@
 #include <unistd.h>
 #include "cmdline.h" /* native_posix command line options header */
 #include "soc.h"
-#include "tc_util.h"
-#include "ztest_test_new.h"
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest_test_new.h>
 
 static const char *test_args;
 static bool list_tests;
diff --git a/subsys/testsuite/ztest/src/ztest_rules.c b/subsys/testsuite/ztest/src/ztest_rules.c
index 90c5531e1e7..4cc130630d2 100644
--- a/subsys/testsuite/ztest/src/ztest_rules.c
+++ b/subsys/testsuite/ztest/src/ztest_rules.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #ifdef CONFIG_ZTEST_RULE_1CPU
 static void one_cpu_rule_before_each(const struct ztest_unit_test *test, void *data)
diff --git a/subsys/testsuite/ztest/src/ztress.c b/subsys/testsuite/ztest/src/ztress.c
index 584b6f8df5e..259a9d22844 100644
--- a/subsys/testsuite/ztest/src/ztress.c
+++ b/subsys/testsuite/ztest/src/ztress.c
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztress.h>
-#include <ztest_test.h>
+#include <zephyr/ztress.h>
+#include <zephyr/ztest_test.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/random/rand32.h>
 #include <string.h>
diff --git a/tests/application_development/code_relocation/src/main.c b/tests/application_development/code_relocation/src/main.c
index 826296356e7..6816938165c 100644
--- a/tests/application_development/code_relocation/src/main.c
+++ b/tests/application_development/code_relocation/src/main.c
@@ -7,7 +7,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* This function will allow execute from sram region.
  * This is needed only for this sample because by default all soc will
diff --git a/tests/application_development/code_relocation/src/test_file1.c b/tests/application_development/code_relocation/src/test_file1.c
index 574674d9902..a8641fd4d47 100644
--- a/tests/application_development/code_relocation/src/test_file1.c
+++ b/tests/application_development/code_relocation/src/test_file1.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 uint32_t var_sram2_data = 10U;
 uint32_t var_sram2_bss;
diff --git a/tests/application_development/code_relocation/src/test_file2.c b/tests/application_development/code_relocation/src/test_file2.c
index 073d953bd7d..877f9d9fd53 100644
--- a/tests/application_development/code_relocation/src/test_file2.c
+++ b/tests/application_development/code_relocation/src/test_file2.c
@@ -7,7 +7,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 void function_in_sram(int32_t value)
 {
diff --git a/tests/application_development/code_relocation/src/test_file3.c b/tests/application_development/code_relocation/src/test_file3.c
index d4bf9a72520..e7e141817da 100644
--- a/tests/application_development/code_relocation/src/test_file3.c
+++ b/tests/application_development/code_relocation/src/test_file3.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 uint32_t var_file3_sram_data = 10U;
 uint32_t var_file3_sram2_bss;
diff --git a/tests/application_development/gen_inc_file/src/main.c b/tests/application_development/gen_inc_file/src/main.c
index 875f5e24a9d..9f211c5347d 100644
--- a/tests/application_development/gen_inc_file/src/main.c
+++ b/tests/application_development/gen_inc_file/src/main.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <zephyr/types.h>
 #include <stdbool.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* Don't confuse doxygen with missing files */
 /**
diff --git a/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c b/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c
index afc08444a87..51f9bc4a8ec 100644
--- a/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c
+++ b/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c
@@ -8,8 +8,8 @@
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 
 static volatile int expected_reason = -1;
 
diff --git a/tests/arch/arm/arm_hardfault_validation/src/main.c b/tests/arch/arm/arm_hardfault_validation/src/main.c
index bd1e59cb487..85280ed4978 100644
--- a/tests/arch/arm/arm_hardfault_validation/src/main.c
+++ b/tests/arch/arm/arm_hardfault_validation/src/main.c
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(arm_hardfault_validation, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/arch/arm/arm_interrupt/src/arm_interrupt.c b/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
index 18290581ac0..d2e2b6cbf68 100644
--- a/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
+++ b/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
diff --git a/tests/arch/arm/arm_interrupt/src/main.c b/tests/arch/arm/arm_interrupt/src/main.c
index 2d209865d01..cda9cd7e169 100644
--- a/tests/arch/arm/arm_interrupt/src/main.c
+++ b/tests/arch/arm/arm_interrupt/src/main.c
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(arm_interrupt, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c b/tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c
index 0d6835bcfea..e3af3e63f55 100644
--- a/tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c
+++ b/tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
diff --git a/tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c b/tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c
index 782fdebd43f..0f0cb257345 100644
--- a/tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c
+++ b/tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
diff --git a/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c b/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c
index 893d6db4d36..6a21c8ac7da 100644
--- a/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c
+++ b/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
diff --git a/tests/arch/arm/arm_irq_advanced_features/src/main.c b/tests/arch/arm/arm_irq_advanced_features/src/main.c
index 5b76f072fa5..a6f56e6f7f6 100644
--- a/tests/arch/arm/arm_irq_advanced_features/src/main.c
+++ b/tests/arch/arm/arm_irq_advanced_features/src/main.c
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(arm_irq_advanced_features, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c b/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c
index eae308bcd82..0057491c0fa 100644
--- a/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c
+++ b/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <zephyr/linker/sections.h>
diff --git a/tests/arch/arm/arm_irq_vector_table/src/main.c b/tests/arch/arm/arm_irq_vector_table/src/main.c
index 249b9353046..ccb750f51cc 100644
--- a/tests/arch/arm/arm_irq_vector_table/src/main.c
+++ b/tests/arch/arm/arm_irq_vector_table/src/main.c
@@ -8,6 +8,6 @@
   #error project can only run on Cortex-M
 #endif
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(vector_table, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/arch/arm/arm_irq_zero_latency_levels/src/main.c b/tests/arch/arm/arm_irq_zero_latency_levels/src/main.c
index 42b4cd8bd12..af4f1107108 100644
--- a/tests/arch/arm/arm_irq_zero_latency_levels/src/main.c
+++ b/tests/arch/arm/arm_irq_zero_latency_levels/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
diff --git a/tests/arch/arm/arm_mem_protect/src/main.c b/tests/arch/arm/arm_mem_protect/src/main.c
index 76ef853081a..25b4d7198e9 100644
--- a/tests/arch/arm/arm_mem_protect/src/main.c
+++ b/tests/arch/arm/arm_mem_protect/src/main.c
@@ -5,7 +5,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/syscall_handler.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_BMEM char user_stack[256];
 
diff --git a/tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c b/tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c
index 4daa7cfd388..10790b556d0 100644
--- a/tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c
+++ b/tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/syscall_handler.h>
 
diff --git a/tests/arch/arm/arm_ramfunc/src/main.c b/tests/arch/arm/arm_ramfunc/src/main.c
index 82356031623..a75dc004b7e 100644
--- a/tests/arch/arm/arm_ramfunc/src/main.c
+++ b/tests/arch/arm/arm_ramfunc/src/main.c
@@ -8,6 +8,6 @@
   #error test can only run on Cortex-M MCUs
 #endif
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(arm_ramfunc, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c b/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c
index 502c5a5b43c..92b324c9740 100644
--- a/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c
+++ b/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c
@@ -8,8 +8,8 @@
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 
 /* on v8m arch the nmi pend bit is renamed to pend nmi map it to old name */
 #ifndef SCB_ICSR_NMIPENDSET_Msk
diff --git a/tests/arch/arm/arm_runtime_nmi/src/main.c b/tests/arch/arm/arm_runtime_nmi/src/main.c
index 45c289d5888..85aa85e8ab3 100644
--- a/tests/arch/arm/arm_runtime_nmi/src/main.c
+++ b/tests/arch/arm/arm_runtime_nmi/src/main.c
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(arm_runtime_nmi_fn, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/arch/arm/arm_sw_vector_relay/src/arm_sw_vector_relay.c b/tests/arch/arm/arm_sw_vector_relay/src/arm_sw_vector_relay.c
index ec711f4aa3b..80f722795e7 100644
--- a/tests/arch/arm/arm_sw_vector_relay/src/arm_sw_vector_relay.c
+++ b/tests/arch/arm/arm_sw_vector_relay/src/arm_sw_vector_relay.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/syscall_handler.h>
 #include <zephyr/toolchain.h>
diff --git a/tests/arch/arm/arm_sw_vector_relay/src/main.c b/tests/arch/arm/arm_sw_vector_relay/src/main.c
index 45f9cf9bd79..4cbaadb8e71 100644
--- a/tests/arch/arm/arm_sw_vector_relay/src/main.c
+++ b/tests/arch/arm/arm_sw_vector_relay/src/main.c
@@ -8,6 +8,6 @@
   #error test can only run on Cortex-M MCUs
 #endif
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(arm_sw_vector_relay, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
index 32035665ff1..8514f29053a 100644
--- a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
+++ b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <zephyr/kernel_structs.h>
diff --git a/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c b/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c
index eab49fa0c28..c13926e104a 100644
--- a/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c
+++ b/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <zephyr/kernel_structs.h>
diff --git a/tests/arch/arm/arm_thread_swap/src/main.c b/tests/arch/arm/arm_thread_swap/src/main.c
index b5b78ae98a1..d1e63219089 100644
--- a/tests/arch/arm/arm_thread_swap/src/main.c
+++ b/tests/arch/arm/arm_thread_swap/src/main.c
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(arm_thread_swap, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/arch/arm/arm_thread_swap_tz/src/main.c b/tests/arch/arm/arm_thread_swap_tz/src/main.c
index aab9e987864..c53655f69d4 100644
--- a/tests/arch/arm/arm_thread_swap_tz/src/main.c
+++ b/tests/arch/arm/arm_thread_swap_tz/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <psa/crypto.h>
 #include <zephyr/kernel.h>
 
diff --git a/tests/arch/arm/arm_tz_wrap_func/src/main.c b/tests/arch/arm/arm_tz_wrap_func/src/main.c
index 02aac031ca5..2ea11d0bae5 100644
--- a/tests/arch/arm/arm_tz_wrap_func/src/main.c
+++ b/tests/arch/arm/arm_tz_wrap_func/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <aarch32/cortex_m/tz_ns.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
diff --git a/tests/arch/arm64/arm64_gicv3_its/src/main.c b/tests/arch/arm64/arm64_gicv3_its/src/main.c
index d1aff4c3aab..a3e64d2df09 100644
--- a/tests/arch/arm64/arm64_gicv3_its/src/main.c
+++ b/tests/arch/arm64/arm64_gicv3_its/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/interrupt_controller/gicv3_its.h>
 
diff --git a/tests/arch/arm64/arm64_high_addresses/src/main.c b/tests/arch/arm64/arm64_high_addresses/src/main.c
index 68a26627528..97540eb6d82 100644
--- a/tests/arch/arm64/arm64_high_addresses/src/main.c
+++ b/tests/arch/arm64/arm64_high_addresses/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_USER(arm64_high_addresses, test_arm64_high_addresses)
 {
diff --git a/tests/arch/arm64/arm64_psci/src/main.c b/tests/arch/arm64/arm64_psci/src/main.c
index 76d74ad0950..d35df5c7da7 100644
--- a/tests/arch/arm64/arm64_psci/src/main.c
+++ b/tests/arch/arm64/arm64_psci/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/pm_cpu_ops/psci.h>
 #include <zephyr/drivers/pm_cpu_ops.h>
 
diff --git a/tests/arch/common/semihost/src/main.c b/tests/arch/common/semihost/src/main.c
index 5fbb2a63e1f..5e6ad5959a0 100644
--- a/tests/arch/common/semihost/src/main.c
+++ b/tests/arch/common/semihost/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/common/semihost.h>
 
 ZTEST(semihost, test_file_ops)
diff --git a/tests/arch/x86/cpu_scrubs_regs/src/main.c b/tests/arch/x86/cpu_scrubs_regs/src/main.c
index 141858bf8e1..7b0597ad9be 100644
--- a/tests/arch/x86/cpu_scrubs_regs/src/main.c
+++ b/tests/arch/x86/cpu_scrubs_regs/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/syscall_handler.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "test_syscalls.h"
 
 #define DB_VAL 0xDEADBEEF
diff --git a/tests/arch/x86/direct_isr/src/direct_isr.c b/tests/arch/x86/direct_isr/src/direct_isr.c
index 616da2eeded..a5e4894bda1 100644
--- a/tests/arch/x86/direct_isr/src/direct_isr.c
+++ b/tests/arch/x86/direct_isr/src/direct_isr.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include "interrupt_util.h"
+#include <zephyr/ztest.h>
+#include <zephyr/interrupt_util.h>
 
 /*
  * Other arch has already been tested in testcase of gen_isr_table,
diff --git a/tests/arch/x86/nmi/src/main.c b/tests/arch/x86/nmi/src/main.c
index 447b711965a..0bcb3b2e30d 100644
--- a/tests/arch/x86/nmi/src/main.c
+++ b/tests/arch/x86/nmi/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 
 #include <kernel_internal.h>
 #if defined(__GNUC__)
diff --git a/tests/arch/x86/pagetables/src/main.c b/tests/arch/x86/pagetables/src/main.c
index e2fe7cb3bb0..e546763ca2c 100644
--- a/tests/arch/x86/pagetables/src/main.c
+++ b/tests/arch/x86/pagetables/src/main.c
@@ -10,8 +10,8 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 #include <zephyr/arch/x86/mmustructs.h>
 #include <x86_mmu.h>
 #include <zephyr/linker/linker-defs.h>
diff --git a/tests/arch/x86/static_idt/src/main.c b/tests/arch/x86/static_idt/src/main.c
index cfda1c2cc3b..d307a70dca9 100644
--- a/tests/arch/x86/static_idt/src/main.c
+++ b/tests/arch/x86/static_idt/src/main.c
@@ -11,8 +11,8 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 #include <zephyr/arch/x86/ia32/segmentation.h>
 
 #include <kernel_internal.h>
diff --git a/tests/benchmarks/app_kernel/src/master.c b/tests/benchmarks/app_kernel/src/master.c
index 28a8df6d089..69cc44219a6 100644
--- a/tests/benchmarks/app_kernel/src/master.c
+++ b/tests/benchmarks/app_kernel/src/master.c
@@ -14,7 +14,7 @@
  *		_R : Is a file that contains the receiver task
  *			 of a benchmark function
  */
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include "master.h"
 
 char msg[MAX_MSG];
diff --git a/tests/benchmarks/app_kernel/src/master.h b/tests/benchmarks/app_kernel/src/master.h
index 8cff489398e..a4397efa4ec 100644
--- a/tests/benchmarks/app_kernel/src/master.h
+++ b/tests/benchmarks/app_kernel/src/master.h
@@ -15,7 +15,7 @@
 
 #include "receiver.h"
 
-#include <timestamp.h>
+#include <zephyr/timestamp.h>
 
 #include <string.h>
 
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c b/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c
index 5ba7373eb42..626f9e29ffa 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c b/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c
index c69d36cd196..d5eaee09e7d 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c b/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c
index 2e4929b2351..2488fb05292 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c b/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c
index ff83174bc27..27aadf609f1 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/benchmarks/cmsis_dsp/common/benchmark_common.h b/tests/benchmarks/cmsis_dsp/common/benchmark_common.h
index 7318c72914d..7efb4f9069f 100644
--- a/tests/benchmarks/cmsis_dsp/common/benchmark_common.h
+++ b/tests/benchmarks/cmsis_dsp/common/benchmark_common.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_BENCHMARK_CMSIS_DSP_COMMON_BENCHMARK_COMMON_H_
 #define ZEPHYR_BENCHMARK_CMSIS_DSP_COMMON_BENCHMARK_COMMON_H_
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 #if defined(CONFIG_CPU_CORTEX_M_HAS_DWT)
diff --git a/tests/benchmarks/data_structure_perf/dlist_perf/src/dlist_perf.c b/tests/benchmarks/data_structure_perf/dlist_perf/src/dlist_perf.c
index 1d54d187963..09defc78c38 100644
--- a/tests/benchmarks/data_structure_perf/dlist_perf/src/dlist_perf.c
+++ b/tests/benchmarks/data_structure_perf/dlist_perf/src/dlist_perf.c
@@ -10,7 +10,7 @@
  * @defgroup lib_dlist_tests Dlist
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/dlist.h>
 
 #define NODE_SIZE 5
diff --git a/tests/benchmarks/data_structure_perf/rbtree_perf/src/rbtree_perf.c b/tests/benchmarks/data_structure_perf/rbtree_perf/src/rbtree_perf.c
index 1c0727e6f75..741683d15ac 100644
--- a/tests/benchmarks/data_structure_perf/rbtree_perf/src/rbtree_perf.c
+++ b/tests/benchmarks/data_structure_perf/rbtree_perf/src/rbtree_perf.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/rb.h>
 
 #define TREE_SIZE 512
diff --git a/tests/benchmarks/latency_measure/src/main.c b/tests/benchmarks/latency_measure/src/main.c
index 06670dc5202..4bcc0420dcd 100644
--- a/tests/benchmarks/latency_measure/src/main.c
+++ b/tests/benchmarks/latency_measure/src/main.c
@@ -9,9 +9,9 @@
  * This file contains the main testing module that invokes all the tests.
  */
 
-#include <timestamp.h>
+#include <zephyr/timestamp.h>
 #include "utils.h"
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #define STACK_SIZE (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
 
diff --git a/tests/benchmarks/latency_measure/src/thread_switch_yield.c b/tests/benchmarks/latency_measure/src/thread_switch_yield.c
index 325762dd2df..ddb4db4d94b 100644
--- a/tests/benchmarks/latency_measure/src/thread_switch_yield.c
+++ b/tests/benchmarks/latency_measure/src/thread_switch_yield.c
@@ -14,7 +14,7 @@
 #include <zephyr/zephyr.h>
 #include <zephyr/timing/timing.h>
 #include <stdlib.h>
-#include "timestamp.h"
+#include <zephyr/timestamp.h>
 #include "utils.h" /* PRINT () and other macros */
 
 /* context switch enough time so our measurement is precise */
diff --git a/tests/benchmarks/latency_measure/src/utils.h b/tests/benchmarks/latency_measure/src/utils.h
index 9bff41e8f9c..e68ee3b7b81 100644
--- a/tests/benchmarks/latency_measure/src/utils.h
+++ b/tests/benchmarks/latency_measure/src/utils.h
@@ -14,7 +14,7 @@
 #include <zephyr/timing/timing.h>
 #include <zephyr/sys/printk.h>
 #include <stdio.h>
-#include "timestamp.h"
+#include <zephyr/timestamp.h>
 
 #define INT_IMM8_OFFSET   1
 #define IRQ_PRIORITY      3
diff --git a/tests/benchmarks/sys_kernel/src/syskernel.c b/tests/benchmarks/sys_kernel/src/syskernel.c
index cbd28c3fe5a..abb56c8faaf 100644
--- a/tests/benchmarks/sys_kernel/src/syskernel.c
+++ b/tests/benchmarks/sys_kernel/src/syskernel.c
@@ -7,7 +7,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include "syskernel.h"
 
diff --git a/tests/benchmarks/sys_kernel/src/syskernel.h b/tests/benchmarks/sys_kernel/src/syskernel.h
index aad8c180e0a..69fb0330933 100644
--- a/tests/benchmarks/sys_kernel/src/syskernel.h
+++ b/tests/benchmarks/sys_kernel/src/syskernel.h
@@ -9,7 +9,7 @@
 #ifndef SYSKERNEK_H
 #define SYSKERNEK_H
 
-#include <timestamp.h>
+#include <zephyr/timestamp.h>
 
 #include <stdio.h>
 #include <zephyr/toolchain.h>
diff --git a/tests/bluetooth/adv/src/main.c b/tests/bluetooth/adv/src/main.c
index 560217f901d..cd320424f73 100644
--- a/tests/bluetooth/adv/src/main.c
+++ b/tests/bluetooth/adv/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
 #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
diff --git a/tests/bluetooth/at/src/main.c b/tests/bluetooth/at/src/main.c
index 2687cb2c658..f043f4ff0a9 100644
--- a/tests/bluetooth/at/src/main.c
+++ b/tests/bluetooth/at/src/main.c
@@ -12,7 +12,7 @@
 
 #include "subsys/bluetooth/host/at.h"
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static struct at_client at;
 static char buffer[140];
diff --git a/tests/bluetooth/bluetooth/src/bluetooth.c b/tests/bluetooth/bluetooth/src/bluetooth.c
index 9099d1f4505..da7d2cf820b 100644
--- a/tests/bluetooth/bluetooth/src/bluetooth.c
+++ b/tests/bluetooth/bluetooth/src/bluetooth.c
@@ -9,8 +9,8 @@
 #include <zephyr/zephyr.h>
 
 #include <errno.h>
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/drivers/bluetooth/hci_driver.h>
diff --git a/tests/bluetooth/controller/ctrl_api/src/main.c b/tests/bluetooth/controller/ctrl_api/src/main.c
index bbe4c5b47a9..3845eb43fb5 100644
--- a/tests/bluetooth/controller/ctrl_api/src/main.c
+++ b/tests/bluetooth/controller/ctrl_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/controller/ctrl_chmu/src/main.c b/tests/bluetooth/controller/ctrl_chmu/src/main.c
index 99c60eea1a2..0de55bc00de 100644
--- a/tests/bluetooth/controller/ctrl_chmu/src/main.c
+++ b/tests/bluetooth/controller/ctrl_chmu/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST
diff --git a/tests/bluetooth/controller/ctrl_cis_create/src/main.c b/tests/bluetooth/controller/ctrl_cis_create/src/main.c
index 47851a8c9c9..a14014dab8a 100644
--- a/tests/bluetooth/controller/ctrl_cis_create/src/main.c
+++ b/tests/bluetooth/controller/ctrl_cis_create/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/controller/ctrl_cis_terminate/src/main.c b/tests/bluetooth/controller/ctrl_cis_terminate/src/main.c
index 6a881aa2595..a686cffe892 100644
--- a/tests/bluetooth/controller/ctrl_cis_terminate/src/main.c
+++ b/tests/bluetooth/controller/ctrl_cis_terminate/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/controller/ctrl_collision/src/main.c b/tests/bluetooth/controller/ctrl_collision/src/main.c
index c6f9779c9e2..430ac4d018b 100644
--- a/tests/bluetooth/controller/ctrl_collision/src/main.c
+++ b/tests/bluetooth/controller/ctrl_collision/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST
diff --git a/tests/bluetooth/controller/ctrl_conn_update/src/main.c b/tests/bluetooth/controller/ctrl_conn_update/src/main.c
index 02d812bfd90..14991ce1f67 100644
--- a/tests/bluetooth/controller/ctrl_conn_update/src/main.c
+++ b/tests/bluetooth/controller/ctrl_conn_update/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define ULL_LLCP_UNITTEST
 
diff --git a/tests/bluetooth/controller/ctrl_cte_req/src/main.c b/tests/bluetooth/controller/ctrl_cte_req/src/main.c
index 2dfee461094..a836ed9c1ce 100644
--- a/tests/bluetooth/controller/ctrl_cte_req/src/main.c
+++ b/tests/bluetooth/controller/ctrl_cte_req/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/controller/ctrl_data_length_update/src/main.c b/tests/bluetooth/controller/ctrl_data_length_update/src/main.c
index 180a16597f1..5ad28f94bea 100644
--- a/tests/bluetooth/controller/ctrl_data_length_update/src/main.c
+++ b/tests/bluetooth/controller/ctrl_data_length_update/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/sys/byteorder.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define ULL_LLCP_UNITTEST
 
diff --git a/tests/bluetooth/controller/ctrl_encrypt/src/main.c b/tests/bluetooth/controller/ctrl_encrypt/src/main.c
index c8c416e1a98..0c60d6c246e 100644
--- a/tests/bluetooth/controller/ctrl_encrypt/src/main.c
+++ b/tests/bluetooth/controller/ctrl_encrypt/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST
diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/src/main.c b/tests/bluetooth/controller/ctrl_feature_exchange/src/main.c
index 84aaaff2d32..c42a3b6f47a 100644
--- a/tests/bluetooth/controller/ctrl_feature_exchange/src/main.c
+++ b/tests/bluetooth/controller/ctrl_feature_exchange/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/sys/byteorder.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST
diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/src/main_hci.c b/tests/bluetooth/controller/ctrl_feature_exchange/src/main_hci.c
index 2374a706c06..d6bf4952322 100644
--- a/tests/bluetooth/controller/ctrl_feature_exchange/src/main_hci.c
+++ b/tests/bluetooth/controller/ctrl_feature_exchange/src/main_hci.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/sys/byteorder.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST
diff --git a/tests/bluetooth/controller/ctrl_hci/src/main.c b/tests/bluetooth/controller/ctrl_hci/src/main.c
index 52f905bb1fe..9493ff5005e 100644
--- a/tests/bluetooth/controller/ctrl_hci/src/main.c
+++ b/tests/bluetooth/controller/ctrl_hci/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/sys/byteorder.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST
diff --git a/tests/bluetooth/controller/ctrl_invalid/src/main.c b/tests/bluetooth/controller/ctrl_invalid/src/main.c
index b8d3e6bf4dc..a3502d091dc 100644
--- a/tests/bluetooth/controller/ctrl_invalid/src/main.c
+++ b/tests/bluetooth/controller/ctrl_invalid/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/tests/bluetooth/controller/ctrl_le_ping/src/main.c b/tests/bluetooth/controller/ctrl_le_ping/src/main.c
index 62268b715d2..0609902ea72 100644
--- a/tests/bluetooth/controller/ctrl_le_ping/src/main.c
+++ b/tests/bluetooth/controller/ctrl_le_ping/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/controller/ctrl_min_used_chans/src/main.c b/tests/bluetooth/controller/ctrl_min_used_chans/src/main.c
index 39543b8c390..b2308af25df 100644
--- a/tests/bluetooth/controller/ctrl_min_used_chans/src/main.c
+++ b/tests/bluetooth/controller/ctrl_min_used_chans/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/controller/ctrl_phy_update/src/main.c b/tests/bluetooth/controller/ctrl_phy_update/src/main.c
index b7b22a31409..c832a007b09 100644
--- a/tests/bluetooth/controller/ctrl_phy_update/src/main.c
+++ b/tests/bluetooth/controller/ctrl_phy_update/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST
diff --git a/tests/bluetooth/controller/ctrl_terminate/src/main.c b/tests/bluetooth/controller/ctrl_terminate/src/main.c
index ecb0a9c19d5..38c2c9cfd33 100644
--- a/tests/bluetooth/controller/ctrl_terminate/src/main.c
+++ b/tests/bluetooth/controller/ctrl_terminate/src/main.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/src/main.c b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/src/main.c
index a30f6b2c970..8497c710adb 100644
--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/src/main.c
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST
diff --git a/tests/bluetooth/controller/ctrl_tx_queue/src/main.c b/tests/bluetooth/controller/ctrl_tx_queue/src/main.c
index 154548382b0..13e210b52ff 100644
--- a/tests/bluetooth/controller/ctrl_tx_queue/src/main.c
+++ b/tests/bluetooth/controller/ctrl_tx_queue/src/main.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/bluetooth/controller/ctrl_unsupported/src/main.c b/tests/bluetooth/controller/ctrl_unsupported/src/main.c
index fd35186fe6d..b2bae1b7554 100644
--- a/tests/bluetooth/controller/ctrl_unsupported/src/main.c
+++ b/tests/bluetooth/controller/ctrl_unsupported/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/tests/bluetooth/controller/ctrl_version/src/main.c b/tests/bluetooth/controller/ctrl_version/src/main.c
index 9fd97f427b2..8f6fcbfbb90 100644
--- a/tests/bluetooth/controller/ctrl_version/src/main.c
+++ b/tests/bluetooth/controller/ctrl_version/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/controller/mock_ctrl/src/kernel.c b/tests/bluetooth/controller/mock_ctrl/src/kernel.c
index de253ad016b..5e7694714db 100644
--- a/tests/bluetooth/controller/mock_ctrl/src/kernel.c
+++ b/tests/bluetooth/controller/mock_ctrl/src/kernel.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 bool k_is_in_isr(void)
 {
diff --git a/tests/bluetooth/controller/mock_ctrl/src/ll.c b/tests/bluetooth/controller/mock_ctrl/src/ll.c
index b3121450334..7928e53b0b7 100644
--- a/tests/bluetooth/controller/mock_ctrl/src/ll.c
+++ b/tests/bluetooth/controller/mock_ctrl/src/ll.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/controller/mock_ctrl/src/lll.c b/tests/bluetooth/controller/mock_ctrl/src/lll.c
index 229c03e2a52..bff60f3c693 100644
--- a/tests/bluetooth/controller/mock_ctrl/src/lll.c
+++ b/tests/bluetooth/controller/mock_ctrl/src/lll.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/ctrl_isoal/src/main.c b/tests/bluetooth/ctrl_isoal/src/main.c
index adbd902d10f..a5a26c39497 100644
--- a/tests/bluetooth/ctrl_isoal/src/main.c
+++ b/tests/bluetooth/ctrl_isoal/src/main.c
@@ -11,8 +11,8 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <ztest.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest.h>
+#include <zephyr/ztest_error_hook.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/bluetooth/ctrl_sw_privacy/src/main.c b/tests/bluetooth/ctrl_sw_privacy/src/main.c
index 43ba0c6fb73..3056901ccc5 100644
--- a/tests/bluetooth/ctrl_sw_privacy/src/main.c
+++ b/tests/bluetooth/ctrl_sw_privacy/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 
diff --git a/tests/bluetooth/ctrl_sw_privacy_unit/src/main.c b/tests/bluetooth/ctrl_sw_privacy_unit/src/main.c
index 6fcde31bf9a..c0f07e59ec4 100644
--- a/tests/bluetooth/ctrl_sw_privacy_unit/src/main.c
+++ b/tests/bluetooth/ctrl_sw_privacy_unit/src/main.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/bluetooth/ctrl_user_ext/src/main.c b/tests/bluetooth/ctrl_user_ext/src/main.c
index b1a226c59d0..2415e8aeb6e 100644
--- a/tests/bluetooth/ctrl_user_ext/src/main.c
+++ b/tests/bluetooth/ctrl_user_ext/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 
diff --git a/tests/bluetooth/df/common/src/bt_common.c b/tests/bluetooth/df/common/src/bt_common.c
index 04d45781508..cea56163761 100644
--- a/tests/bluetooth/df/common/src/bt_common.c
+++ b/tests/bluetooth/df/common/src/bt_common.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 
diff --git a/tests/bluetooth/df/common/src/bt_conn_common.c b/tests/bluetooth/df/common/src/bt_conn_common.c
index c24e04cfab0..b503a253976 100644
--- a/tests/bluetooth/df/common/src/bt_conn_common.c
+++ b/tests/bluetooth/df/common/src/bt_conn_common.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <util/util.h>
 #include <util/memq.h>
diff --git a/tests/bluetooth/df/connection_cte_req/src/test_cte_req_enable.c b/tests/bluetooth/df/connection_cte_req/src/test_cte_req_enable.c
index 19be69ab468..cfddcb0c65c 100644
--- a/tests/bluetooth/df/connection_cte_req/src/test_cte_req_enable.c
+++ b/tests/bluetooth/df/connection_cte_req/src/test_cte_req_enable.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/df/connection_cte_req/src/test_cte_set_rx_params.c b/tests/bluetooth/df/connection_cte_req/src/test_cte_set_rx_params.c
index 4849c6e210b..19d9b118180 100644
--- a/tests/bluetooth/df/connection_cte_req/src/test_cte_set_rx_params.c
+++ b/tests/bluetooth/df/connection_cte_req/src/test_cte_set_rx_params.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/df/connection_cte_tx_params/src/test_set_conn_cte_tx_params.c b/tests/bluetooth/df/connection_cte_tx_params/src/test_set_conn_cte_tx_params.c
index f00627ebf5e..91918c0d440 100644
--- a/tests/bluetooth/df/connection_cte_tx_params/src/test_set_conn_cte_tx_params.c
+++ b/tests/bluetooth/df/connection_cte_tx_params/src/test_set_conn_cte_tx_params.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/df/connectionless_cte_chains/src/common.c b/tests/bluetooth/df/connectionless_cte_chains/src/common.c
index eb56ba09707..a2f9cfd67d2 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/src/common.c
+++ b/tests/bluetooth/df/connectionless_cte_chains/src/common.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/df/connectionless_cte_chains/src/test_add_cte_to_chain.c b/tests/bluetooth/df/connectionless_cte_chains/src/test_add_cte_to_chain.c
index 497ee626098..10ee6369df4 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/src/test_add_cte_to_chain.c
+++ b/tests/bluetooth/df/connectionless_cte_chains/src/test_add_cte_to_chain.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/df/connectionless_cte_chains/src/test_remove_cte_from_chain.c b/tests/bluetooth/df/connectionless_cte_chains/src/test_remove_cte_from_chain.c
index bc588638a8a..b8f3277f103 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/src/test_remove_cte_from_chain.c
+++ b/tests/bluetooth/df/connectionless_cte_chains/src/test_remove_cte_from_chain.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/df/connectionless_cte_rx/src/common.c b/tests/bluetooth/df/connectionless_cte_rx/src/common.c
index af460bc3b54..6635f537bff 100644
--- a/tests/bluetooth/df/connectionless_cte_rx/src/common.c
+++ b/tests/bluetooth/df/connectionless_cte_rx/src/common.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/df/connectionless_cte_rx/src/test_set_iq_sampling_enable.c b/tests/bluetooth/df/connectionless_cte_rx/src/test_set_iq_sampling_enable.c
index 0cfbf1bbb09..68e9288c5c7 100644
--- a/tests/bluetooth/df/connectionless_cte_rx/src/test_set_iq_sampling_enable.c
+++ b/tests/bluetooth/df/connectionless_cte_rx/src/test_set_iq_sampling_enable.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/df/connectionless_cte_tx/src/common.c b/tests/bluetooth/df/connectionless_cte_tx/src/common.c
index 5d8d7ced76c..0bd45a42a5c 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/src/common.c
+++ b/tests/bluetooth/df/connectionless_cte_tx/src/common.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_enable.c b/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_enable.c
index 86eda5cf273..b63c2eee22a 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_enable.c
+++ b/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_enable.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_param.c b/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_param.c
index 1a500641a81..f2ec025d50e 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_param.c
+++ b/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_param.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/gatt/src/main.c b/tests/bluetooth/gatt/src/main.c
index 5128126d81c..cb72809b1e0 100644
--- a/tests/bluetooth/gatt/src/main.c
+++ b/tests/bluetooth/gatt/src/main.c
@@ -8,7 +8,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/buf.h>
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/tests/bluetooth/hci_codecs_info/src/main.c b/tests/bluetooth/hci_codecs_info/src/main.c
index 17dbc249ff9..e3d40547a85 100644
--- a/tests/bluetooth/hci_codecs_info/src/main.c
+++ b/tests/bluetooth/hci_codecs_info/src/main.c
@@ -8,7 +8,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/tests/bluetooth/hci_prop_evt/src/main.c b/tests/bluetooth/hci_prop_evt/src/main.c
index f262e7d9a5d..6ac19a095ec 100644
--- a/tests/bluetooth/hci_prop_evt/src/main.c
+++ b/tests/bluetooth/hci_prop_evt/src/main.c
@@ -9,8 +9,8 @@
 #include <zephyr/zephyr.h>
 
 #include <errno.h>
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/buf.h>
diff --git a/tests/bluetooth/host_long_adv_recv/src/main.c b/tests/bluetooth/host_long_adv_recv/src/main.c
index d4c49568778..8e15f3c083d 100644
--- a/tests/bluetooth/host_long_adv_recv/src/main.c
+++ b/tests/bluetooth/host_long_adv_recv/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/ztest.h>
 
 #include <errno.h>
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/buf.h>
diff --git a/tests/bluetooth/init/src/main.c b/tests/bluetooth/init/src/main.c
index e7b43489994..9fa752f4550 100644
--- a/tests/bluetooth/init/src/main.c
+++ b/tests/bluetooth/init/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 
diff --git a/tests/bluetooth/l2cap/src/main.c b/tests/bluetooth/l2cap/src/main.c
index 30fdeaa0851..af3e5bf2666 100644
--- a/tests/bluetooth/l2cap/src/main.c
+++ b/tests/bluetooth/l2cap/src/main.c
@@ -8,7 +8,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/buf.h>
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/tests/bluetooth/ll_settings/src/main.c b/tests/bluetooth/ll_settings/src/main.c
index faf277f39ed..472d1df9f9b 100644
--- a/tests/bluetooth/ll_settings/src/main.c
+++ b/tests/bluetooth/ll_settings/src/main.c
@@ -8,7 +8,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/settings/settings.h>
 
diff --git a/tests/boards/altera_max10/i2c_master/src/i2c_master.c b/tests/boards/altera_max10/i2c_master/src/i2c_master.c
index c69edb80109..b3074abedec 100644
--- a/tests/boards/altera_max10/i2c_master/src/i2c_master.c
+++ b/tests/boards/altera_max10/i2c_master/src/i2c_master.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /*
  * For ADV7513 Programming details, please
diff --git a/tests/boards/altera_max10/msgdma/src/dma.c b/tests/boards/altera_max10/msgdma/src/dma.c
index be355a86e3f..58afb7fe3b2 100644
--- a/tests/boards/altera_max10/msgdma/src/dma.c
+++ b/tests/boards/altera_max10/msgdma/src/dma.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <soc.h>
 #include <kernel_arch_func.h>
 #include <zephyr/device.h>
diff --git a/tests/boards/altera_max10/qspi/src/qspi_flash.c b/tests/boards/altera_max10/qspi/src/qspi_flash.c
index fbd7c060e07..de4610edb76 100644
--- a/tests/boards/altera_max10/qspi/src/qspi_flash.c
+++ b/tests/boards/altera_max10/qspi/src/qspi_flash.c
@@ -7,7 +7,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/device.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define MAX_NUM_OF_SECTORS		1024
 #define NUM_OF_SECTORS_TO_TEST		4
diff --git a/tests/boards/altera_max10/sysid/src/sysid.c b/tests/boards/altera_max10/sysid/src/sysid.c
index a3ae3383cbf..30fcbac718d 100644
--- a/tests/boards/altera_max10/sysid/src/sysid.c
+++ b/tests/boards/altera_max10/sysid/src/sysid.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "altera_avalon_sysid.h"
 
diff --git a/tests/boards/espressif_esp32/cache_coex/src/cache_coex.c b/tests/boards/espressif_esp32/cache_coex/src/cache_coex.c
index 4efd243f080..afdaa81c147 100644
--- a/tests/boards/espressif_esp32/cache_coex/src/cache_coex.c
+++ b/tests/boards/espressif_esp32/cache_coex/src/cache_coex.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/flash.h>
diff --git a/tests/boards/intel_adsp/hda/src/dma.c b/tests/boards/intel_adsp/hda/src/dma.c
index 5afc6981e8f..f4112ef950f 100644
--- a/tests/boards/intel_adsp/hda/src/dma.c
+++ b/tests/boards/intel_adsp/hda/src/dma.c
@@ -4,7 +4,7 @@
 
 #include <zephyr/arch/xtensa/cache.h>
 #include <zephyr/kernel.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <cavs_ipc.h>
 #include <zephyr/drivers/dma.h>
 #include "tests.h"
diff --git a/tests/boards/intel_adsp/hda/src/main.c b/tests/boards/intel_adsp/hda/src/main.c
index 976ac763a7b..81404881c59 100644
--- a/tests/boards/intel_adsp/hda/src/main.c
+++ b/tests/boards/intel_adsp/hda/src/main.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdlib.h>
 #include "tests.h"
 
diff --git a/tests/boards/intel_adsp/hda/src/smoke.c b/tests/boards/intel_adsp/hda/src/smoke.c
index b6000ec0cef..9614f8ab38d 100644
--- a/tests/boards/intel_adsp/hda/src/smoke.c
+++ b/tests/boards/intel_adsp/hda/src/smoke.c
@@ -4,7 +4,7 @@
 
 #include <zephyr/arch/xtensa/cache.h>
 #include <zephyr/kernel.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <cavs_ipc.h>
 #include <zephyr/devicetree.h>
 #include "tests.h"
diff --git a/tests/boards/intel_adsp/hda/src/tests.h b/tests/boards/intel_adsp/hda/src/tests.h
index 9cadbf580fe..2359e120064 100644
--- a/tests/boards/intel_adsp/hda/src/tests.h
+++ b/tests/boards/intel_adsp/hda/src/tests.h
@@ -9,7 +9,7 @@
 #include <cavstool.h>
 #include <stdint.h>
 #include <zephyr/device.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 void test_hda_host_in_smoke(void);
 void test_hda_host_out_smoke(void);
diff --git a/tests/boards/intel_adsp/hda_log/src/logger.c b/tests/boards/intel_adsp/hda_log/src/logger.c
index 78017fae447..09b4d73f856 100644
--- a/tests/boards/intel_adsp/hda_log/src/logger.c
+++ b/tests/boards/intel_adsp/hda_log/src/logger.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/kernel.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <cavs_ipc.h>
 #include "tests.h"
 
diff --git a/tests/boards/intel_adsp/hda_log/src/main.c b/tests/boards/intel_adsp/hda_log/src/main.c
index 0268a187ea6..b6c1be31862 100644
--- a/tests/boards/intel_adsp/hda_log/src/main.c
+++ b/tests/boards/intel_adsp/hda_log/src/main.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdlib.h>
 #include "tests.h"
 
diff --git a/tests/boards/intel_adsp/hda_log/src/tests.h b/tests/boards/intel_adsp/hda_log/src/tests.h
index bceba67f5ee..ec5becb0622 100644
--- a/tests/boards/intel_adsp/hda_log/src/tests.h
+++ b/tests/boards/intel_adsp/hda_log/src/tests.h
@@ -8,7 +8,7 @@
 #include <cavstool.h>
 #include <stdint.h>
 #include <zephyr/device.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 void test_hda_logger(void);
 
diff --git a/tests/boards/intel_adsp/mm/src/main.c b/tests/boards/intel_adsp/mm/src/main.c
index 4edf89b8f8c..4bb0419afbd 100644
--- a/tests/boards/intel_adsp/mm/src/main.c
+++ b/tests/boards/intel_adsp/mm/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 #include <zephyr/toolchain.h>
diff --git a/tests/boards/intel_adsp/smoke/src/cpus.c b/tests/boards/intel_adsp/smoke/src/cpus.c
index 04e096f0fe4..3cf8817d13e 100644
--- a/tests/boards/intel_adsp/smoke/src/cpus.c
+++ b/tests/boards/intel_adsp/smoke/src/cpus.c
@@ -3,7 +3,7 @@
  */
 #include <stdlib.h>
 #include <zephyr/kernel.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <cavs_ipc.h>
 #include "tests.h"
 
diff --git a/tests/boards/intel_adsp/smoke/src/hostipc.c b/tests/boards/intel_adsp/smoke/src/hostipc.c
index b1e9a73bb55..8dbe42804db 100644
--- a/tests/boards/intel_adsp/smoke/src/hostipc.c
+++ b/tests/boards/intel_adsp/smoke/src/hostipc.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/kernel.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <cavs_ipc.h>
 #include "tests.h"
 
diff --git a/tests/boards/intel_adsp/smoke/src/ipm.c b/tests/boards/intel_adsp/smoke/src/ipm.c
index 3856344c667..010362df770 100644
--- a/tests/boards/intel_adsp/smoke/src/ipm.c
+++ b/tests/boards/intel_adsp/smoke/src/ipm.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2022 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/ipm.h>
 #include "tests.h"
 
diff --git a/tests/boards/intel_adsp/smoke/src/main.c b/tests/boards/intel_adsp/smoke/src/main.c
index f460c818b0b..2e5efe2fe74 100644
--- a/tests/boards/intel_adsp/smoke/src/main.c
+++ b/tests/boards/intel_adsp/smoke/src/main.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdlib.h>
 #include "tests.h"
 
diff --git a/tests/boards/intel_adsp/smoke/src/smpboot.c b/tests/boards/intel_adsp/smoke/src/smpboot.c
index 3cdf60b3ac9..07396b5d75b 100644
--- a/tests/boards/intel_adsp/smoke/src/smpboot.c
+++ b/tests/boards/intel_adsp/smoke/src/smpboot.c
@@ -3,7 +3,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "tests.h"
 
 /* Experimentally 10ms is enough time to get the second CPU to run on
diff --git a/tests/boards/intel_adsp/ssp/src/main.c b/tests/boards/intel_adsp/ssp/src/main.c
index d1d59ca3581..a4a6d018619 100644
--- a/tests/boards/intel_adsp/ssp/src/main.c
+++ b/tests/boards/intel_adsp/ssp/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 #include <zephyr/toolchain.h>
diff --git a/tests/boards/mec15xxevb_assy6853/i2c_api/src/main.c b/tests/boards/mec15xxevb_assy6853/i2c_api/src/main.c
index 3b663e93e1f..8d18572d1b4 100644
--- a/tests/boards/mec15xxevb_assy6853/i2c_api/src/main.c
+++ b/tests/boards/mec15xxevb_assy6853/i2c_api/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* command to configure port direction of NXP PCA95xx */
 #define REG_CONF_PORT0 0x06U
diff --git a/tests/boards/mec15xxevb_assy6853/qspi/src/main.c b/tests/boards/mec15xxevb_assy6853/qspi/src/main.c
index ef23311c802..18275be7f3b 100644
--- a/tests/boards/mec15xxevb_assy6853/qspi/src/main.c
+++ b/tests/boards/mec15xxevb_assy6853/qspi/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/spi.h>
 
 #define TEST_FREQ_HZ 24000000U
diff --git a/tests/boards/native_posix/cpu_wait/src/main.c b/tests/boards/native_posix/cpu_wait/src/main.c
index 157df73f104..19dd8f0b07a 100644
--- a/tests/boards/native_posix/cpu_wait/src/main.c
+++ b/tests/boards/native_posix/cpu_wait/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/printk.h>
 
diff --git a/tests/boards/native_posix/rtc/src/main.c b/tests/boards/native_posix/rtc/src/main.c
index f0083907650..461186bcebb 100644
--- a/tests/boards/native_posix/rtc/src/main.c
+++ b/tests/boards/native_posix/rtc/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/printk.h>
 
diff --git a/tests/crypto/crypto_hash/src/main.c b/tests/crypto/crypto_hash/src/main.c
index d2cc6d255d6..68bc8523953 100644
--- a/tests/crypto/crypto_hash/src/main.c
+++ b/tests/crypto/crypto_hash/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/crypto/crypto.h>
 
 #define CRYPTO_DRV_NAME CONFIG_CRYPTO_MBEDTLS_SHIM_DRV_NAME
diff --git a/tests/crypto/mbedtls/src/main.c b/tests/crypto/mbedtls/src/main.c
index c7217a3f900..23eab5e4fa0 100644
--- a/tests/crypto/mbedtls/src/main.c
+++ b/tests/crypto/mbedtls/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/app_memory/partitions.h>
 
 extern void test_mbedtls(void);
diff --git a/tests/crypto/mbedtls/src/mbedtls.c b/tests/crypto/mbedtls/src/mbedtls.c
index fb0c937ecae..39dcefc6991 100644
--- a/tests/crypto/mbedtls/src/mbedtls.c
+++ b/tests/crypto/mbedtls/src/mbedtls.c
@@ -18,8 +18,8 @@
 #include <zephyr/linker/sections.h>
 #include <errno.h>
 
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 
 #define MBEDTLS_ALLOW_PRIVATE_ACCESS
 
diff --git a/tests/crypto/rand32/src/main.c b/tests/crypto/rand32/src/main.c
index 5f7c2750290..eca9918684b 100644
--- a/tests/crypto/rand32/src/main.c
+++ b/tests/crypto/rand32/src/main.c
@@ -13,7 +13,7 @@
  */
 
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <kernel_internal.h>
 #include <zephyr/random/rand32.h>
 
diff --git a/tests/crypto/tinycrypt/src/aes.c b/tests/crypto/tinycrypt/src/aes.c
index 66c64327626..7b7bf739104 100644
--- a/tests/crypto/tinycrypt/src/aes.c
+++ b/tests/crypto/tinycrypt/src/aes.c
@@ -45,7 +45,7 @@
 
 #include <tinycrypt/aes.h>
 #include <tinycrypt/constants.h>
-#include <test_utils.h>
+#include <zephyr/test_utils.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -54,7 +54,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define NUM_OF_NIST_KEYS 16
 #define NUM_OF_FIXED_KEYS 128
diff --git a/tests/crypto/tinycrypt/src/cbc_mode.c b/tests/crypto/tinycrypt/src/cbc_mode.c
index dcc4ec2f33d..41f6ab4a65d 100644
--- a/tests/crypto/tinycrypt/src/cbc_mode.c
+++ b/tests/crypto/tinycrypt/src/cbc_mode.c
@@ -38,12 +38,12 @@
 
 #include <tinycrypt/cbc_mode.h>
 #include <tinycrypt/constants.h>
-#include "test_utils.h"
+#include <zephyr/test_utils.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /*
  * NIST test vectors from SP 800-38a:
diff --git a/tests/crypto/tinycrypt/src/ccm_mode.c b/tests/crypto/tinycrypt/src/ccm_mode.c
index 419fe0d9826..177d5e64656 100644
--- a/tests/crypto/tinycrypt/src/ccm_mode.c
+++ b/tests/crypto/tinycrypt/src/ccm_mode.c
@@ -47,8 +47,8 @@
 
 #include <tinycrypt/ccm_mode.h>
 #include <tinycrypt/constants.h>
-#include <test_utils.h>
-#include <ztest.h>
+#include <zephyr/test_utils.h>
+#include <zephyr/ztest.h>
 
 #include <string.h>
 
diff --git a/tests/crypto/tinycrypt/src/cmac_mode.c b/tests/crypto/tinycrypt/src/cmac_mode.c
index 5e016db7a39..c83f151706a 100644
--- a/tests/crypto/tinycrypt/src/cmac_mode.c
+++ b/tests/crypto/tinycrypt/src/cmac_mode.c
@@ -44,11 +44,11 @@
 #include <tinycrypt/cmac_mode.h>
 #include <tinycrypt/constants.h>
 #include <tinycrypt/aes.h>
-#include <test_utils.h>
+#include <zephyr/test_utils.h>
 
 #include <stdio.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define BUF_LEN 16
 
diff --git a/tests/crypto/tinycrypt/src/ctr_mode.c b/tests/crypto/tinycrypt/src/ctr_mode.c
index d0677ff5130..f201d65d3f8 100644
--- a/tests/crypto/tinycrypt/src/ctr_mode.c
+++ b/tests/crypto/tinycrypt/src/ctr_mode.c
@@ -39,12 +39,12 @@
 
 #include <tinycrypt/ctr_mode.h>
 #include <tinycrypt/constants.h>
-#include <test_utils.h>
+#include <zephyr/test_utils.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /*
  * NIST SP 800-38a CTR Test for encryption and decryption.
diff --git a/tests/crypto/tinycrypt/src/ctr_prng.c b/tests/crypto/tinycrypt/src/ctr_prng.c
index 7d3e66d99be..52cc20a6038 100644
--- a/tests/crypto/tinycrypt/src/ctr_prng.c
+++ b/tests/crypto/tinycrypt/src/ctr_prng.c
@@ -34,11 +34,11 @@
 #include <tinycrypt/ctr_prng.h>
 #include <tinycrypt/aes.h>
 #include <tinycrypt/constants.h>
-#include <test_utils.h>
+#include <zephyr/test_utils.h>
 
 #include <stdio.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define MAX_EXPECTED_STRING	128
 #define MAX_BIN_SIZE		(MAX_EXPECTED_STRING / 2)
diff --git a/tests/crypto/tinycrypt/src/ecc_dh.c b/tests/crypto/tinycrypt/src/ecc_dh.c
index 7724df7ff80..4383e46f857 100644
--- a/tests/crypto/tinycrypt/src/ecc_dh.c
+++ b/tests/crypto/tinycrypt/src/ecc_dh.c
@@ -60,13 +60,13 @@
 #include <tinycrypt/ecc_dh.h>
 #include <tinycrypt/ecc_platform_specific.h>
 #include "test_ecc_utils.h"
-#include <test_utils.h>
+#include <zephyr/test_utils.h>
 #include <tinycrypt/constants.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 int ecdh_vectors(char **qx_vec, char **qy_vec, char **d_vec, char **z_vec,
 		 int tests, int verbose)
diff --git a/tests/crypto/tinycrypt/src/ecc_dsa.c b/tests/crypto/tinycrypt/src/ecc_dsa.c
index fec455be635..74609640b24 100644
--- a/tests/crypto/tinycrypt/src/ecc_dsa.c
+++ b/tests/crypto/tinycrypt/src/ecc_dsa.c
@@ -64,7 +64,7 @@
 #include <tinycrypt/ecc_dh.h>
 #include <tinycrypt/constants.h>
 #include <tinycrypt/sha256.h>
-#include <test_utils.h>
+#include <zephyr/test_utils.h>
 #include "test_ecc_utils.h"
 #include <zephyr/sys/util.h>
 #include <zephyr/random/rand32.h>
@@ -72,7 +72,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* Maximum size of message to be signed. */
 #define BUF_SIZE 256
diff --git a/tests/crypto/tinycrypt/src/hmac.c b/tests/crypto/tinycrypt/src/hmac.c
index 01cd320312c..c66d1729555 100644
--- a/tests/crypto/tinycrypt/src/hmac.c
+++ b/tests/crypto/tinycrypt/src/hmac.c
@@ -39,8 +39,8 @@
 
 #include <tinycrypt/hmac.h>
 #include <tinycrypt/constants.h>
-#include <test_utils.h>
-#include <ztest.h>
+#include <zephyr/test_utils.h>
+#include <zephyr/ztest.h>
 
 uint32_t do_hmac_test(TCHmacState_t h, uint32_t testnum, const uint8_t *data,
 		      size_t datalen, const uint8_t *expected,
diff --git a/tests/crypto/tinycrypt/src/main.c b/tests/crypto/tinycrypt/src/main.c
index 116d4dd9af1..ccdb4bffe7e 100644
--- a/tests/crypto/tinycrypt/src/main.c
+++ b/tests/crypto/tinycrypt/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern void test_ccm_vector_1(void);
 extern void test_ccm_vector_2(void);
diff --git a/tests/crypto/tinycrypt/src/sha256.c b/tests/crypto/tinycrypt/src/sha256.c
index 1e41e1f2349..6e97874dc4e 100644
--- a/tests/crypto/tinycrypt/src/sha256.c
+++ b/tests/crypto/tinycrypt/src/sha256.c
@@ -39,13 +39,13 @@
 
 #include <tinycrypt/sha256.h>
 #include <tinycrypt/constants.h>
-#include <test_utils.h>
+#include <zephyr/test_utils.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /*
  * NIST SHA256 test vector 1.
diff --git a/tests/crypto/tinycrypt/src/test_ecc_utils.h b/tests/crypto/tinycrypt/src/test_ecc_utils.h
index cff0e98139e..73f92f9fd41 100644
--- a/tests/crypto/tinycrypt/src/test_ecc_utils.h
+++ b/tests/crypto/tinycrypt/src/test_ecc_utils.h
@@ -62,7 +62,7 @@
 
 #include <tinycrypt/ecc_dh.h>
 #include <tinycrypt/ecc.h>
-#include <test_utils.h>
+#include <zephyr/test_utils.h>
 
 /*
  * Convert hex string to zero-padded nanoECC scalar
diff --git a/tests/crypto/tinycrypt_hmac_prng/src/hmac_prng.c b/tests/crypto/tinycrypt_hmac_prng/src/hmac_prng.c
index 63bdc954ac7..d79064f6b5e 100644
--- a/tests/crypto/tinycrypt_hmac_prng/src/hmac_prng.c
+++ b/tests/crypto/tinycrypt_hmac_prng/src/hmac_prng.c
@@ -44,9 +44,9 @@
 #include <tinycrypt/constants.h>
 
 #include <stdio.h>
-#include <tc_util.h>
-#include <test_utils.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/test_utils.h>
+#include <zephyr/ztest.h>
 
 struct hmac_prng_test_vector {
 	uint8_t entropyinputlen;
diff --git a/tests/crypto/tinycrypt_hmac_prng/src/main.c b/tests/crypto/tinycrypt_hmac_prng/src/main.c
index 9d7fb3230ea..21b8560219c 100644
--- a/tests/crypto/tinycrypt_hmac_prng/src/main.c
+++ b/tests/crypto/tinycrypt_hmac_prng/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 extern void test_hmac_prng(void);
 
 /**test case main entry*/
diff --git a/tests/drivers/adc/adc_api/src/main.c b/tests/drivers/adc/adc_api/src/main.c
index 88d712f391a..609d10c414a 100644
--- a/tests/drivers/adc/adc_api/src/main.c
+++ b/tests/drivers/adc/adc_api/src/main.c
@@ -7,7 +7,7 @@
 
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern const struct device *get_adc_device(void);
 extern struct k_poll_signal async_sig;
diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c
index 1aabe6511e3..7828e1af21e 100644
--- a/tests/drivers/adc/adc_api/src/test_adc.c
+++ b/tests/drivers/adc/adc_api/src/test_adc.c
@@ -8,7 +8,7 @@
 
 #include <zephyr/drivers/adc.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if defined(CONFIG_SHIELD_MIKROE_ADC_CLICK)
 #define ADC_DEVICE_NODE		DT_INST(0, microchip_mcp3204)
diff --git a/tests/drivers/adc/adc_dma/src/main.c b/tests/drivers/adc/adc_dma/src/main.c
index a6d350d47af..a1856888992 100644
--- a/tests/drivers/adc/adc_dma/src/main.c
+++ b/tests/drivers/adc/adc_dma/src/main.c
@@ -6,7 +6,7 @@
 
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern const struct device *get_adc_device(void);
 extern const struct device *get_count_device(void);
diff --git a/tests/drivers/adc/adc_dma/src/test_adc.c b/tests/drivers/adc/adc_dma/src/test_adc.c
index ffe0fb8bea2..7a967223228 100644
--- a/tests/drivers/adc/adc_dma/src/test_adc.c
+++ b/tests/drivers/adc/adc_dma/src/test_adc.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/adc.h>
 #include <zephyr/drivers/counter.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if defined(CONFIG_BOARD_FRDM_K64F)
 
diff --git a/tests/drivers/adc/adc_emul/src/main.c b/tests/drivers/adc/adc_emul/src/main.c
index 00317c1c8f2..4de8f44545e 100644
--- a/tests/drivers/adc/adc_emul/src/main.c
+++ b/tests/drivers/adc/adc_emul/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/drivers/adc.h>
 #include <zephyr/drivers/adc/adc_emul.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define ADC_DEVICE_NODE		DT_INST(0, zephyr_adc_emul)
 #define ADC_REF_INTERNAL_MV	DT_PROP(DT_INST(0, zephyr_adc_emul), ref_internal_mv)
diff --git a/tests/drivers/bbram/emul/src/main.c b/tests/drivers/bbram/emul/src/main.c
index ac2d942df88..0c978702df6 100644
--- a/tests/drivers/bbram/emul/src/main.c
+++ b/tests/drivers/bbram/emul/src/main.c
@@ -6,7 +6,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/bbram.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define BBRAM_NODELABEL DT_NODELABEL(bbram)
 #define BBRAM_SIZE DT_PROP(BBRAM_NODELABEL, size)
diff --git a/tests/drivers/bbram/src/main.c b/tests/drivers/bbram/src/main.c
index a01e31fc751..626bcfd5a13 100644
--- a/tests/drivers/bbram/src/main.c
+++ b/tests/drivers/bbram/src/main.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 void test_main(void)
 {
diff --git a/tests/drivers/can/api/src/main.c b/tests/drivers/can/api/src/main.c
index 39e5ec436d3..9fd55e9966d 100644
--- a/tests/drivers/can/api/src/main.c
+++ b/tests/drivers/can/api/src/main.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/drivers/can.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /**
  * @addtogroup t_can_driver
diff --git a/tests/drivers/can/canfd/src/main.c b/tests/drivers/can/canfd/src/main.c
index 1d0eca958fd..15f27b5a2af 100644
--- a/tests/drivers/can/canfd/src/main.c
+++ b/tests/drivers/can/canfd/src/main.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/drivers/can.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /**
  * @addtogroup t_can_driver
diff --git a/tests/drivers/can/stm32/src/main.c b/tests/drivers/can/stm32/src/main.c
index 8d3c6160680..58f0e61c4c6 100644
--- a/tests/drivers/can/stm32/src/main.c
+++ b/tests/drivers/can/stm32/src/main.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/drivers/can.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /**
  * @addtogroup t_can_driver
diff --git a/tests/drivers/can/timing/src/main.c b/tests/drivers/can/timing/src/main.c
index 4de83d92bda..6827944024c 100644
--- a/tests/drivers/can/timing/src/main.c
+++ b/tests/drivers/can/timing/src/main.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/drivers/can.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <strings.h>
 
 /**
diff --git a/tests/drivers/can/utilities/src/main.c b/tests/drivers/can/utilities/src/main.c
index 2041bb7b0b5..04815dcad16 100644
--- a/tests/drivers/can/utilities/src/main.c
+++ b/tests/drivers/can/utilities/src/main.c
@@ -7,7 +7,7 @@
 
 #include <zephyr/drivers/can.h>
 #include <zephyr/logging/log.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 LOG_MODULE_REGISTER(can_utilities, LOG_LEVEL_ERR);
 
diff --git a/tests/drivers/clock_control/cavs_clock/src/main.c b/tests/drivers/clock_control/cavs_clock/src/main.c
index bde2779f4ee..c55a577761f 100644
--- a/tests/drivers/clock_control/cavs_clock/src/main.c
+++ b/tests/drivers/clock_control/cavs_clock/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/clock_control/clock_control_cavs.h>
 #include <zephyr/drivers/clock_control.h>
 
diff --git a/tests/drivers/clock_control/clock_control_api/src/test_clock_control.c b/tests/drivers/clock_control/clock_control_api/src/test_clock_control.c
index d369fa55c60..9deaa6ea9a8 100644
--- a/tests/drivers/clock_control/clock_control_api/src/test_clock_control.c
+++ b/tests/drivers/clock_control/clock_control_api/src/test_clock_control.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
diff --git a/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c b/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c
index 04aba3a667f..8eec90a3db6 100644
--- a/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c
+++ b/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include <hal/nrf_clock.h>
diff --git a/tests/drivers/clock_control/nrf_lf_clock_start/src/main.c b/tests/drivers/clock_control/nrf_lf_clock_start/src/main.c
index be4b4ef4ed0..1a1837c2eb9 100644
--- a/tests/drivers/clock_control/nrf_lf_clock_start/src/main.c
+++ b/tests/drivers/clock_control/nrf_lf_clock_start/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <hal/nrf_clock.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
 
diff --git a/tests/drivers/clock_control/nrf_onoff_and_bt/src/main.c b/tests/drivers/clock_control/nrf_onoff_and_bt/src/main.c
index 608ea114891..1dd83c2b015 100644
--- a/tests/drivers/clock_control/nrf_onoff_and_bt/src/main.c
+++ b/tests/drivers/clock_control/nrf_onoff_and_bt/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/entropy.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
diff --git a/tests/drivers/clock_control/onoff/src/test_clock_control_onoff.c b/tests/drivers/clock_control/onoff/src/test_clock_control_onoff.c
index 96be7b7b2d0..b67e9fa4ee1 100644
--- a/tests/drivers/clock_control/onoff/src/test_clock_control_onoff.c
+++ b/tests/drivers/clock_control/onoff/src/test_clock_control_onoff.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_core/src/test_stm32_clock_configuration.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_core/src/test_stm32_clock_configuration.c
index a014bf33520..b22ec16ec9a 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_core/src/test_stm32_clock_configuration.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_core/src/test_stm32_clock_configuration.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <soc.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration.c
index 6db7038459b..8ce71eef9c0 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <soc.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_core/src/test_stm32_clock_configuration.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_core/src/test_stm32_clock_configuration.c
index a64b7fd360b..5b46f79ff3a 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_core/src/test_stm32_clock_configuration.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_core/src/test_stm32_clock_configuration.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <soc.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c
index ab14ea3ed2f..b674b9d87a8 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <soc.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/src/test_stm32_clock_configuration.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/src/test_stm32_clock_configuration.c
index 7cf5d6f3bd2..9fd300f5b5f 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/src/test_stm32_clock_configuration.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/src/test_stm32_clock_configuration.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <soc.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_devices/src/test_stm32_clock_configuration.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_devices/src/test_stm32_clock_configuration.c
index fe425adad9b..13bfa105c33 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_devices/src/test_stm32_clock_configuration.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_devices/src/test_stm32_clock_configuration.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <soc.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
diff --git a/tests/drivers/coredump/coredump_api/src/main.c b/tests/drivers/coredump/coredump_api/src/main.c
index 77992826fed..256441392ca 100644
--- a/tests/drivers/coredump/coredump_api/src/main.c
+++ b/tests/drivers/coredump/coredump_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/drivers/coredump.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* Test will verify that these values are present in the core dump */
 #define TEST_MEMORY_VALUE_0 0xabababab
diff --git a/tests/drivers/counter/counter_basic_api/src/test_counter.c b/tests/drivers/counter/counter_basic_api/src/test_counter.c
index 8c5efd210a0..4152383e674 100644
--- a/tests/drivers/counter/counter_basic_api/src/test_counter.c
+++ b/tests/drivers/counter/counter_basic_api/src/test_counter.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/drivers/counter.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
diff --git a/tests/drivers/counter/counter_nrf_rtc/fixed_top/src/test_counter_fixed_top.c b/tests/drivers/counter/counter_nrf_rtc/fixed_top/src/test_counter_fixed_top.c
index 5aef1ffc0d5..df159a83e6b 100644
--- a/tests/drivers/counter/counter_nrf_rtc/fixed_top/src/test_counter_fixed_top.c
+++ b/tests/drivers/counter/counter_nrf_rtc/fixed_top/src/test_counter_fixed_top.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/drivers/counter.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <hal/nrf_rtc.h>
diff --git a/tests/drivers/counter/counter_seconds/src/main.c b/tests/drivers/counter/counter_seconds/src/main.c
index cc1e8e9273f..d519fd36bdb 100644
--- a/tests/drivers/counter/counter_seconds/src/main.c
+++ b/tests/drivers/counter/counter_seconds/src/main.c
@@ -4,7 +4,7 @@
  */
 
 #include <zephyr/drivers/counter.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 
 /*
diff --git a/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c b/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c
index 12487958edc..942c45812f0 100644
--- a/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c
+++ b/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/drivers/counter.h>
 #include <zephyr/drivers/rtc/maxim_ds3231.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
diff --git a/tests/drivers/dac/dac_api/src/main.c b/tests/drivers/dac/dac_api/src/main.c
index 18f45a01338..f8752d28269 100644
--- a/tests/drivers/dac/dac_api/src/main.c
+++ b/tests/drivers/dac/dac_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern void test_dac_write_value(void);
 extern const struct device *get_dac_device(void);
diff --git a/tests/drivers/dac/dac_api/src/test_dac.c b/tests/drivers/dac/dac_api/src/test_dac.c
index c38c8f08ed3..d7d1bf01e99 100644
--- a/tests/drivers/dac/dac_api/src/test_dac.c
+++ b/tests/drivers/dac/dac_api/src/test_dac.c
@@ -7,7 +7,7 @@
 
 #include <zephyr/drivers/dac.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if defined(CONFIG_BOARD_NUCLEO_F091RC) || \
 	defined(CONFIG_BOARD_NUCLEO_F207ZG) || \
diff --git a/tests/drivers/dac/dac_loopback/src/main.c b/tests/drivers/dac/dac_loopback/src/main.c
index 6540dd4ca59..7af5d559fc7 100644
--- a/tests/drivers/dac/dac_loopback/src/main.c
+++ b/tests/drivers/dac/dac_loopback/src/main.c
@@ -12,7 +12,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern void test_dac_loopback(void);
 
diff --git a/tests/drivers/dac/dac_loopback/src/test_dac.c b/tests/drivers/dac/dac_loopback/src/test_dac.c
index bb06c555826..8acefbf1e56 100644
--- a/tests/drivers/dac/dac_loopback/src/test_dac.c
+++ b/tests/drivers/dac/dac_loopback/src/test_dac.c
@@ -15,7 +15,7 @@
 #include <zephyr/drivers/dac.h>
 #include <zephyr/drivers/adc.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /*
  * We need to define an ADC channel to read back the output generated by the
diff --git a/tests/drivers/disk/disk_access/src/main.c b/tests/drivers/disk/disk_access/src/main.c
index 9370faa0638..d91eb5767ab 100644
--- a/tests/drivers/disk/disk_access/src/main.c
+++ b/tests/drivers/disk/disk_access/src/main.c
@@ -10,7 +10,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/storage/disk_access.h>
 #include <zephyr/device.h>
 
diff --git a/tests/drivers/disk/disk_performance/src/main.c b/tests/drivers/disk/disk_performance/src/main.c
index b965113b587..7d0bc2e379a 100644
--- a/tests/drivers/disk/disk_performance/src/main.c
+++ b/tests/drivers/disk/disk_performance/src/main.c
@@ -6,7 +6,7 @@
 
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/storage/disk_access.h>
 #include <zephyr/device.h>
 #include <zephyr/timing/timing.h>
diff --git a/tests/drivers/dma/chan_blen_transfer/src/main.c b/tests/drivers/dma/chan_blen_transfer/src/main.c
index 3efd7b2b1ea..aff6ad04c09 100644
--- a/tests/drivers/dma/chan_blen_transfer/src/main.c
+++ b/tests/drivers/dma/chan_blen_transfer/src/main.c
@@ -6,6 +6,6 @@
 
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(dma_m2m, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/dma/chan_blen_transfer/src/test_dma.c b/tests/drivers/dma/chan_blen_transfer/src/test_dma.c
index 90ad171fbb8..2558e031f42 100644
--- a/tests/drivers/dma/chan_blen_transfer/src/test_dma.c
+++ b/tests/drivers/dma/chan_blen_transfer/src/test_dma.c
@@ -18,7 +18,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/drivers/dma.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define RX_BUFF_SIZE (48)
 
diff --git a/tests/drivers/dma/chan_link_transfer/src/main.c b/tests/drivers/dma/chan_link_transfer/src/main.c
index 3732445812d..1fcc5e57ff2 100644
--- a/tests/drivers/dma/chan_link_transfer/src/main.c
+++ b/tests/drivers/dma/chan_link_transfer/src/main.c
@@ -5,6 +5,6 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(dma_m2m_link, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/dma/chan_link_transfer/src/test_dma.c b/tests/drivers/dma/chan_link_transfer/src/test_dma.c
index c3407e730fa..a626e200bd6 100644
--- a/tests/drivers/dma/chan_link_transfer/src/test_dma.c
+++ b/tests/drivers/dma/chan_link_transfer/src/test_dma.c
@@ -19,7 +19,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/drivers/dma.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define TEST_DMA_CHANNEL_0 (0)
 #define TEST_DMA_CHANNEL_1 (1)
diff --git a/tests/drivers/dma/loop_transfer/src/main.c b/tests/drivers/dma/loop_transfer/src/main.c
index 5476a564890..b8004c14fed 100644
--- a/tests/drivers/dma/loop_transfer/src/main.c
+++ b/tests/drivers/dma/loop_transfer/src/main.c
@@ -6,6 +6,6 @@
 
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(dma_m2m_loop, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/dma/loop_transfer/src/test_dma_loop.c b/tests/drivers/dma/loop_transfer/src/test_dma_loop.c
index 6aa417b9d88..3b6ec11b51f 100644
--- a/tests/drivers/dma/loop_transfer/src/test_dma_loop.c
+++ b/tests/drivers/dma/loop_transfer/src/test_dma_loop.c
@@ -25,7 +25,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/dma.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* in millisecond */
 #define SLEEPTIME 250
diff --git a/tests/drivers/dma/scatter_gather/src/main.c b/tests/drivers/dma/scatter_gather/src/main.c
index fb862a3c151..46ebcc495c8 100644
--- a/tests/drivers/dma/scatter_gather/src/main.c
+++ b/tests/drivers/dma/scatter_gather/src/main.c
@@ -6,6 +6,6 @@
 
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(dma_m2m_sg, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/dma/scatter_gather/src/test_dma_sg.c b/tests/drivers/dma/scatter_gather/src/test_dma_sg.c
index 5b66c468b61..5ea4e9a53a6 100644
--- a/tests/drivers/dma/scatter_gather/src/test_dma_sg.c
+++ b/tests/drivers/dma/scatter_gather/src/test_dma_sg.c
@@ -19,7 +19,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/dma.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define XFERS 2
 #define XFER_SIZE 64
diff --git a/tests/drivers/eeprom/src/main.c b/tests/drivers/eeprom/src/main.c
index 42cf04ff306..59d3d52bfbf 100644
--- a/tests/drivers/eeprom/src/main.c
+++ b/tests/drivers/eeprom/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <ztest_test.h>
+#include <zephyr/ztest.h>
+#include <zephyr/ztest_test.h>
 #include <zephyr/drivers/eeprom.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/device.h>
diff --git a/tests/drivers/entropy/api/src/main.c b/tests/drivers/entropy/api/src/main.c
index d2880a8dd9a..0311391bad9 100644
--- a/tests/drivers/entropy/api/src/main.c
+++ b/tests/drivers/entropy/api/src/main.c
@@ -5,7 +5,7 @@
  */
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/drivers/entropy.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /*
  * @addtogroup t_entropy_api
diff --git a/tests/drivers/espi/src/test_acpi.c b/tests/drivers/espi/src/test_acpi.c
index fb8eb2dbf90..9c708f4fa6b 100644
--- a/tests/drivers/espi/src/test_acpi.c
+++ b/tests/drivers/espi/src/test_acpi.c
@@ -6,7 +6,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/espi.h>
 #include <zephyr/drivers/espi_emul.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static void test_acpi_shared_memory(void)
 {
diff --git a/tests/drivers/flash/src/main.c b/tests/drivers/flash/src/main.c
index 8f2f5645437..fc940c72115 100644
--- a/tests/drivers/flash/src/main.c
+++ b/tests/drivers/flash/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/storage/flash_map.h>
diff --git a/tests/drivers/flash_simulator/src/main.c b/tests/drivers/flash_simulator/src/main.c
index f5403d4cfbb..820237b8788 100644
--- a/tests/drivers/flash_simulator/src/main.c
+++ b/tests/drivers/flash_simulator/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/device.h>
 
diff --git a/tests/drivers/gpio/gpio_api_1pin/src/test_gpio_api.h b/tests/drivers/gpio/gpio_api_1pin/src/test_gpio_api.h
index 517b4bbc8c1..d4431b1b6ba 100644
--- a/tests/drivers/gpio/gpio_api_1pin/src/test_gpio_api.h
+++ b/tests/drivers/gpio/gpio_api_1pin/src/test_gpio_api.h
@@ -9,7 +9,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/drivers/gpio.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if DT_NODE_HAS_PROP(DT_ALIAS(led0), gpios)
 #define TEST_NODE            DT_GPIO_CTLR(DT_ALIAS(led0), gpios)
diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
index acc07094b43..1c2d0047620 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
@@ -10,7 +10,7 @@
 #include <zephyr/zephyr.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/sys/util.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if DT_NODE_HAS_STATUS(DT_INST(0, test_gpio_basic_api), okay)
 
diff --git a/tests/drivers/gpio/gpio_get_direction/src/main.c b/tests/drivers/gpio/gpio_get_direction/src/main.c
index 389b783d932..2f44cd049bf 100644
--- a/tests/drivers/gpio/gpio_get_direction/src/main.c
+++ b/tests/drivers/gpio/gpio_get_direction/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/drivers/gpio.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define TEST_NODE            DT_GPIO_CTLR(DT_ALIAS(led0), gpios)
 #define TEST_PIN             DT_GPIO_PIN(DT_ALIAS(led0), gpios)
diff --git a/tests/drivers/hwinfo/api/src/main.c b/tests/drivers/hwinfo/api/src/main.c
index 726f072491d..4f155006810 100644
--- a/tests/drivers/hwinfo/api/src/main.c
+++ b/tests/drivers/hwinfo/api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/drivers/hwinfo.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <strings.h>
 #include <errno.h>
 
diff --git a/tests/drivers/i2c/i2c_api/src/main.c b/tests/drivers/i2c/i2c_api/src/main.c
index 42774cc3c46..dea6e7c4185 100644
--- a/tests/drivers/i2c/i2c_api/src/main.c
+++ b/tests/drivers/i2c/i2c_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern void test_i2c_gy271(void);
 extern void test_i2c_burst_gy271(void);
diff --git a/tests/drivers/i2c/i2c_api/src/test_i2c.c b/tests/drivers/i2c/i2c_api/src/test_i2c.c
index 98c52fbb887..da21924d3de 100644
--- a/tests/drivers/i2c/i2c_api/src/test_i2c.c
+++ b/tests/drivers/i2c/i2c_api/src/test_i2c.c
@@ -14,7 +14,7 @@
 
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_0), okay)
 #define I2C_DEV_NODE	DT_ALIAS(i2c_0)
diff --git a/tests/drivers/i2c/i2c_target_api/src/main.c b/tests/drivers/i2c/i2c_target_api/src/main.c
index 19c75f603a0..fb80ee2d16a 100644
--- a/tests/drivers/i2c/i2c_target_api/src/main.c
+++ b/tests/drivers/i2c/i2c_target_api/src/main.c
@@ -16,7 +16,7 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/i2c/target/eeprom.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define NODE_EP0 DT_NODELABEL(eeprom0)
 #define NODE_EP1 DT_NODELABEL(eeprom1)
diff --git a/tests/drivers/i2c/i2c_tca954x/src/main.c b/tests/drivers/i2c/i2c_tca954x/src/main.c
index 63c3ab50422..517d0edbf2e 100644
--- a/tests/drivers/i2c/i2c_tca954x/src/main.c
+++ b/tests/drivers/i2c/i2c_tca954x/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/i2c.h>
 
diff --git a/tests/drivers/i2s/i2s_api/src/common.c b/tests/drivers/i2s/i2s_api/src/common.c
index 404dd843950..32c8eec85dd 100644
--- a/tests/drivers/i2s/i2s_api/src/common.c
+++ b/tests/drivers/i2s/i2s_api/src/common.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
 
diff --git a/tests/drivers/i2s/i2s_api/src/main.c b/tests/drivers/i2s/i2s_api/src/main.c
index c8e150e2477..feea482d83e 100644
--- a/tests/drivers/i2s/i2s_api/src/main.c
+++ b/tests/drivers/i2s/i2s_api/src/main.c
@@ -6,7 +6,7 @@
 
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/device.h>
 #include "i2s_api_test.h"
 
diff --git a/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_loopback.c b/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_loopback.c
index 9c0a292aca6..e7c116c4af8 100644
--- a/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_loopback.c
+++ b/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_loopback.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
 
diff --git a/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_states.c b/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_states.c
index a23d290ca8d..9e41e20c783 100644
--- a/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_states.c
+++ b/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_states.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
 
diff --git a/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c b/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c
index 4d8e24c9ec9..d96a89515b7 100644
--- a/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c
+++ b/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c
@@ -6,7 +6,7 @@
 
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
 
diff --git a/tests/drivers/i2s/i2s_api/src/test_i2s_states.c b/tests/drivers/i2s/i2s_api/src/test_i2s_states.c
index 75ac6f26963..0daa670afda 100644
--- a/tests/drivers/i2s/i2s_api/src/test_i2s_states.c
+++ b/tests/drivers/i2s/i2s_api/src/test_i2s_states.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
 
diff --git a/tests/drivers/i2s/i2s_speed/src/main.c b/tests/drivers/i2s/i2s_speed/src/main.c
index 93aaa007a9f..c6e215f6854 100644
--- a/tests/drivers/i2s/i2s_speed/src/main.c
+++ b/tests/drivers/i2s/i2s_speed/src/main.c
@@ -6,7 +6,7 @@
 
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 void test_i2s_tx_transfer_configure(void);
 void test_i2s_rx_transfer_configure(void);
diff --git a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
index d27fb28e66f..964bd6dace6 100644
--- a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
+++ b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
@@ -6,7 +6,7 @@
 
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/i2s.h>
 
 #define I2S_DEV_NAME_RX "I2S_0"
diff --git a/tests/drivers/ipm/src/main.c b/tests/drivers/ipm/src/main.c
index de6a0ab5658..ec084ccad7c 100644
--- a/tests/drivers/ipm/src/main.c
+++ b/tests/drivers/ipm/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/init.h>
 #include <stdio.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include "ipm_dummy.h"
 
 #define PRINTK_OUT      1
diff --git a/tests/drivers/kscan/kscan_api/src/main.c b/tests/drivers/kscan/kscan_api/src/main.c
index 79b623296fb..69675f3ef0c 100644
--- a/tests/drivers/kscan/kscan_api/src/main.c
+++ b/tests/drivers/kscan/kscan_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 void test_init_callback(void);
 void test_control_callback(void);
diff --git a/tests/drivers/kscan/kscan_api/src/test_kscan.c b/tests/drivers/kscan/kscan_api/src/test_kscan.c
index 2af402b2927..6cf40204b70 100644
--- a/tests/drivers/kscan/kscan_api/src/test_kscan.c
+++ b/tests/drivers/kscan/kscan_api/src/test_kscan.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <zephyr/drivers/kscan.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static void kb_callback(const struct device *dev, uint32_t row, uint32_t col,
 			bool pressed)
diff --git a/tests/drivers/led/led_api/src/main.c b/tests/drivers/led/led_api/src/main.c
index 12c88202622..92985191e5b 100644
--- a/tests/drivers/led/led_api/src/main.c
+++ b/tests/drivers/led/led_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "test_led_api.h"
 
diff --git a/tests/drivers/led/led_api/src/test_led_api.c b/tests/drivers/led/led_api/src/test_led_api.c
index b458d5b2d8d..c000eed40b1 100644
--- a/tests/drivers/led/led_api/src/test_led_api.c
+++ b/tests/drivers/led/led_api/src/test_led_api.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/led.h>
 
 #define BRIGHTNESS_MAX	100
diff --git a/tests/drivers/memc/stm32_sdram/src/main.c b/tests/drivers/memc/stm32_sdram/src/main.c
index ea71088fe6d..01a596307f0 100644
--- a/tests/drivers/memc/stm32_sdram/src/main.c
+++ b/tests/drivers/memc/stm32_sdram/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /** Buffer size. */
 #define BUF_SIZE 64U
diff --git a/tests/drivers/mipi_dsi/api/src/main.c b/tests/drivers/mipi_dsi/api/src/main.c
index 0a85a7526a3..8c5a355509b 100644
--- a/tests/drivers/mipi_dsi/api/src/main.c
+++ b/tests/drivers/mipi_dsi/api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/drivers/mipi_dsi.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /**
  * @addtogroup t_mipi_dsi_driver
diff --git a/tests/drivers/pinctrl/gd32/src/main_af.c b/tests/drivers/pinctrl/gd32/src/main_af.c
index 0515f49d2fa..330a16f28e9 100644
--- a/tests/drivers/pinctrl/gd32/src/main_af.c
+++ b/tests/drivers/pinctrl/gd32/src/main_af.c
@@ -4,7 +4,7 @@
  */
 
 #include <zephyr/drivers/pinctrl.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* pin configuration for test device */
 #define TEST_DEVICE DT_NODELABEL(test_device)
diff --git a/tests/drivers/pinctrl/gd32/src/main_afio.c b/tests/drivers/pinctrl/gd32/src/main_afio.c
index a917dd66453..52a120f0841 100644
--- a/tests/drivers/pinctrl/gd32/src/main_afio.c
+++ b/tests/drivers/pinctrl/gd32/src/main_afio.c
@@ -4,7 +4,7 @@
  */
 
 #include <zephyr/drivers/pinctrl.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* pin configuration for test device */
 #define TEST_DEVICE DT_NODELABEL(test_device)
diff --git a/tests/drivers/pinctrl/nrf/src/main.c b/tests/drivers/pinctrl/nrf/src/main.c
index 4e48676bf1f..e65e6a6066a 100644
--- a/tests/drivers/pinctrl/nrf/src/main.c
+++ b/tests/drivers/pinctrl/nrf/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/drivers/pinctrl.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* pin configuration for test device */
 #define TEST_DEVICE DT_NODELABEL(test_device)
diff --git a/tests/drivers/pwm/pwm_api/src/main.c b/tests/drivers/pwm/pwm_api/src/main.c
index 72810298ab1..5c83702b8e2 100644
--- a/tests/drivers/pwm/pwm_api/src/main.c
+++ b/tests/drivers/pwm/pwm_api/src/main.c
@@ -6,7 +6,7 @@
 
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/device.h>
 
 const struct device *get_pwm_device(void);
diff --git a/tests/drivers/pwm/pwm_api/src/test_pwm.c b/tests/drivers/pwm/pwm_api/src/test_pwm.c
index 2ce4a69710e..16c5931c669 100644
--- a/tests/drivers/pwm/pwm_api/src/test_pwm.c
+++ b/tests/drivers/pwm/pwm_api/src/test_pwm.c
@@ -27,7 +27,7 @@
 #include <inttypes.h>
 #include <zephyr/drivers/pwm.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if DT_NODE_HAS_STATUS(DT_ALIAS(pwm_0), okay)
 #define PWM_DEV_NODE DT_ALIAS(pwm_0)
diff --git a/tests/drivers/pwm/pwm_loopback/src/main.c b/tests/drivers/pwm/pwm_loopback/src/main.c
index 1fe85243dee..0078c22b3a7 100644
--- a/tests/drivers/pwm/pwm_loopback/src/main.c
+++ b/tests/drivers/pwm/pwm_loopback/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "test_pwm_loopback.h"
 
diff --git a/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.c b/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.c
index c40dc1a53bb..6c0366fb55f 100644
--- a/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.c
+++ b/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/drivers/pwm.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "test_pwm_loopback.h"
 
diff --git a/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.h b/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.h
index b6b3eaaf189..bba5c2bbd72 100644
--- a/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.h
+++ b/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.h
@@ -9,7 +9,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/drivers/pwm.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define PWM_LOOPBACK_OUT_IDX 0
 #define PWM_LOOPBACK_IN_IDX  1
diff --git a/tests/drivers/regulator/fixed/src/main.c b/tests/drivers/regulator/fixed/src/main.c
index 45a92101822..4a9432fa69c 100644
--- a/tests/drivers/regulator/fixed/src/main.c
+++ b/tests/drivers/regulator/fixed/src/main.c
@@ -6,7 +6,7 @@
 #include <zephyr/zephyr.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/regulator.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define REGULATOR_NODE DT_PATH(regulator)
 #define CHECK_NODE DT_PATH(resources)
diff --git a/tests/drivers/regulator/pmic/src/main.c b/tests/drivers/regulator/pmic/src/main.c
index 27e66ce6e64..d29a216b9d6 100644
--- a/tests/drivers/regulator/pmic/src/main.c
+++ b/tests/drivers/regulator/pmic/src/main.c
@@ -14,7 +14,7 @@
 #include <zephyr/drivers/adc.h>
 #include <zephyr/drivers/regulator.h>
 #include <zephyr/drivers/regulator/consumer.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if !DT_NODE_EXISTS(DT_PATH(zephyr_user)) || \
 	!DT_NODE_HAS_PROP(DT_PATH(zephyr_user), io_channels)
diff --git a/tests/drivers/sdhc/src/main.c b/tests/drivers/sdhc/src/main.c
index 73c18f95917..df64c588987 100644
--- a/tests/drivers/sdhc/src/main.c
+++ b/tests/drivers/sdhc/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/zephyr.h>
 #include <zephyr/drivers/sdhc.h>
 #include <zephyr/device.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static const struct device *sdhc_dev = DEVICE_DT_GET(DT_ALIAS(sdhc0));
 static struct sdhc_host_props props;
diff --git a/tests/drivers/sensor/accel/src/main.c b/tests/drivers/sensor/accel/src/main.c
index a84b6255534..b54b57dbb11 100644
--- a/tests/drivers/sensor/accel/src/main.c
+++ b/tests/drivers/sensor/accel/src/main.c
@@ -11,7 +11,7 @@
  * @}
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/sensor.h>
 
 /* There is no obvious way to pass this to tests, so use a global */
diff --git a/tests/drivers/sensor/generic/src/dummy_sensor.c b/tests/drivers/sensor/generic/src/dummy_sensor.c
index c8923d36e38..043701a98a5 100644
--- a/tests/drivers/sensor/generic/src/dummy_sensor.c
+++ b/tests/drivers/sensor/generic/src/dummy_sensor.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 LOG_MODULE_REGISTER(dummy_sensor, LOG_LEVEL_DBG);
 static struct dummy_sensor_data dummy_data;
diff --git a/tests/drivers/sensor/generic/src/main.c b/tests/drivers/sensor/generic/src/main.c
index 6cad6cf6c0a..b13c65c741b 100644
--- a/tests/drivers/sensor/generic/src/main.c
+++ b/tests/drivers/sensor/generic/src/main.c
@@ -11,7 +11,7 @@
  * @}
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "dummy_sensor.h"
 
 K_SEM_DEFINE(sem, 0, 1);
diff --git a/tests/drivers/sensor/sbs_gauge/src/main.c b/tests/drivers/sensor/sbs_gauge/src/main.c
index 46336f5392d..5307eb38ef1 100644
--- a/tests/drivers/sensor/sbs_gauge/src/main.c
+++ b/tests/drivers/sensor/sbs_gauge/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "test_sbs_gauge.h"
 
diff --git a/tests/drivers/sensor/sbs_gauge/src/test_sbs_gauge.c b/tests/drivers/sensor/sbs_gauge/src/test_sbs_gauge.c
index 3f536ce95cc..241e2ad915a 100644
--- a/tests/drivers/sensor/sbs_gauge/src/test_sbs_gauge.c
+++ b/tests/drivers/sensor/sbs_gauge/src/test_sbs_gauge.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/sensor.h>
 
 const struct device *get_fuel_gauge_device(void)
diff --git a/tests/drivers/spi/dt_spec/src/main.c b/tests/drivers/spi/dt_spec/src/main.c
index 4c307da3274..b6dfb8ee79e 100644
--- a/tests/drivers/spi/dt_spec/src/main.c
+++ b/tests/drivers/spi/dt_spec/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/spi.h>
diff --git a/tests/drivers/spi/spi_loopback/src/spi.c b/tests/drivers/spi/spi_loopback/src/spi.c
index 0042f218c56..fee3604119e 100644
--- a/tests/drivers/spi/spi_loopback/src/spi.c
+++ b/tests/drivers/spi/spi_loopback/src/spi.c
@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(main);
 #include <zephyr/sys/printk.h>
 #include <string.h>
 #include <stdio.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/drivers/spi.h>
 
diff --git a/tests/drivers/syscon/src/main.c b/tests/drivers/syscon/src/main.c
index 3efc9dbbd3b..ab6dca2040e 100644
--- a/tests/drivers/syscon/src/main.c
+++ b/tests/drivers/syscon/src/main.c
@@ -5,7 +5,7 @@
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/syscon.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/linker/devicetree_regions.h>
 
 #define RES_SECT LINKER_DT_NODE_REGION_NAME(DT_NODELABEL(res))
diff --git a/tests/drivers/timer/nrf_rtc_timer/src/main.c b/tests/drivers/timer/nrf_rtc_timer/src/main.c
index 53affb03acd..2d5c3dda20b 100644
--- a/tests/drivers/timer/nrf_rtc_timer/src/main.c
+++ b/tests/drivers/timer/nrf_rtc_timer/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/timer/nrf_rtc_timer.h>
 #include <hal/nrf_rtc.h>
 #include <hal/nrf_timer.h>
diff --git a/tests/drivers/uart/uart_async_api/src/test_uart.h b/tests/drivers/uart/uart_async_api/src/test_uart.h
index a73266fda8c..86af41ed877 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart.h
+++ b/tests/drivers/uart/uart_async_api/src/test_uart.h
@@ -15,7 +15,7 @@
 #define __TEST_UART_H__
 
 #include <zephyr/drivers/uart.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* RX and TX pins have to be connected together*/
 
diff --git a/tests/drivers/uart/uart_basic_api/src/test_uart.h b/tests/drivers/uart/uart_basic_api/src/test_uart.h
index 554821b386e..3d23a0c8028 100644
--- a/tests/drivers/uart/uart_basic_api/src/test_uart.h
+++ b/tests/drivers/uart/uart_basic_api/src/test_uart.h
@@ -16,7 +16,7 @@
 #define __TEST_UART_H__
 
 #include <zephyr/drivers/uart.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 void test_uart_configure(void);
 void test_uart_config_get(void);
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/src/main.c b/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
index a3867894149..53ae7ee1548 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
+++ b/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
@@ -12,7 +12,7 @@
  */
 
 #include <zephyr/drivers/uart.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/counter.h>
 #include <zephyr/random/rand32.h>
 /* RX and TX pins have to be connected together*/
diff --git a/tests/drivers/uart/uart_pm/src/main.c b/tests/drivers/uart/uart_pm/src/main.c
index 45e159a7fc3..36ee3dee471 100644
--- a/tests/drivers/uart/uart_pm/src/main.c
+++ b/tests/drivers/uart/uart_pm/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/drivers/uart.h>
 #include <zephyr/device.h>
 #include <zephyr/pm/device.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if defined(CONFIG_BOARD_NRF52840DK_NRF52840)
 #define LABEL uart0
diff --git a/tests/drivers/virtualization/ivshmem/src/ivshmem.c b/tests/drivers/virtualization/ivshmem/src/ivshmem.c
index a77058437d0..4fb35026e34 100644
--- a/tests/drivers/virtualization/ivshmem/src/ivshmem.c
+++ b/tests/drivers/virtualization/ivshmem/src/ivshmem.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/drivers/virtualization/ivshmem.h>
 
diff --git a/tests/drivers/watchdog/wdt_basic_api/src/main.c b/tests/drivers/watchdog/wdt_basic_api/src/main.c
index a7532305d92..21628dca297 100644
--- a/tests/drivers/watchdog/wdt_basic_api/src/main.c
+++ b/tests/drivers/watchdog/wdt_basic_api/src/main.c
@@ -13,6 +13,6 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(wdt_basic_test_suite, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
index 0c0cb73f31c..ea656437db4 100644
--- a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
+++ b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
@@ -59,7 +59,7 @@
 
 #include <zephyr/drivers/watchdog.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /*
  * To use this test, either the devicetree's /aliases must have a
diff --git a/tests/kernel/common/src/atomic.c b/tests/kernel/common/src/atomic.c
index ed542760c98..bcf54b774b3 100644
--- a/tests/kernel/common/src/atomic.c
+++ b/tests/kernel/common/src/atomic.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/atomic.h>
 
 /* convenience macro - return either 64-bit or 32-bit value */
diff --git a/tests/kernel/common/src/bitarray.c b/tests/kernel/common/src/bitarray.c
index 4a7b756e4b7..2750a8528b2 100644
--- a/tests/kernel/common/src/bitarray.c
+++ b/tests/kernel/common/src/bitarray.c
@@ -5,10 +5,10 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <zephyr/sys/bitarray.h>
 #include <zephyr/sys/util.h>
 
diff --git a/tests/kernel/common/src/bitfield.c b/tests/kernel/common/src/bitfield.c
index 0818a1ef6f6..2fc5f1fdfaf 100644
--- a/tests/kernel/common/src/bitfield.c
+++ b/tests/kernel/common/src/bitfield.c
@@ -5,10 +5,10 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #ifdef CONFIG_BIG_ENDIAN
 #define BIT_INDEX(bit)  ((3 - ((bit >> 3) & 0x3)) + 4*(bit >> 5))
diff --git a/tests/kernel/common/src/boot_delay.c b/tests/kernel/common/src/boot_delay.c
index 0cc64adef99..9b965b8f009 100644
--- a/tests/kernel/common/src/boot_delay.c
+++ b/tests/kernel/common/src/boot_delay.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define NSEC_PER_MSEC (uint64_t)(NSEC_PER_USEC * USEC_PER_MSEC)
 /**
diff --git a/tests/kernel/common/src/byteorder.c b/tests/kernel/common/src/byteorder.c
index 21a4f4b0202..f380dc1be3c 100644
--- a/tests/kernel/common/src/byteorder.c
+++ b/tests/kernel/common/src/byteorder.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/sys/byteorder.h>
 
diff --git a/tests/kernel/common/src/clock.c b/tests/kernel/common/src/clock.c
index 9015a83c51a..55dd729a33e 100644
--- a/tests/kernel/common/src/clock.c
+++ b/tests/kernel/common/src/clock.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if defined(CONFIG_ARCH_POSIX)
 #define ALIGN_MS_BOUNDARY		       \
diff --git a/tests/kernel/common/src/errno.c b/tests/kernel/common/src/errno.c
index 2730ab2445f..9de534493bc 100644
--- a/tests/kernel/common/src/errno.c
+++ b/tests/kernel/common/src/errno.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <errno.h>
 #include <zephyr/sys/errno_private.h>
diff --git a/tests/kernel/common/src/irq_offload.c b/tests/kernel/common/src/irq_offload.c
index 8f2dad4533b..32581fbed8a 100644
--- a/tests/kernel/common/src/irq_offload.c
+++ b/tests/kernel/common/src/irq_offload.c
@@ -13,7 +13,7 @@
  *
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel_structs.h>
 #include <zephyr/irq_offload.h>
 
diff --git a/tests/kernel/common/src/main.c b/tests/kernel/common/src/main.c
index e94ede1be18..279595c214d 100644
--- a/tests/kernel/common/src/main.c
+++ b/tests/kernel/common/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel_version.h>
 #include <zephyr/sys/speculation.h>
 #include "version.h"
diff --git a/tests/kernel/common/src/multilib.c b/tests/kernel/common/src/multilib.c
index d6e65bc0fea..91546171318 100644
--- a/tests/kernel/common/src/multilib.c
+++ b/tests/kernel/common/src/multilib.c
@@ -6,8 +6,8 @@
 
 #include <zephyr/zephyr.h>
 #include <errno.h>
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 /**
  * @addtogroup kernel_common_tests
  * @{
diff --git a/tests/kernel/common/src/pow2.c b/tests/kernel/common/src/pow2.c
index b08f6f86dec..3185558c0f3 100644
--- a/tests/kernel/common/src/pow2.c
+++ b/tests/kernel/common/src/pow2.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 /**
diff --git a/tests/kernel/common/src/printk.c b/tests/kernel/common/src/printk.c
index abeae34fd24..8702664a14b 100644
--- a/tests/kernel/common/src/printk.c
+++ b/tests/kernel/common/src/printk.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define BUF_SZ 1024
 
diff --git a/tests/kernel/common/src/timeout_order.c b/tests/kernel/common/src/timeout_order.c
index 97a8e20d22f..315b2ae7adb 100644
--- a/tests/kernel/common/src/timeout_order.c
+++ b/tests/kernel/common/src/timeout_order.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define NUM_TIMEOUTS 3
 
diff --git a/tests/kernel/condvar/condvar_api/src/main.c b/tests/kernel/condvar/condvar_api/src/main.c
index 74b329e830b..0ce6f36d630 100644
--- a/tests/kernel/condvar/condvar_api/src/main.c
+++ b/tests/kernel/condvar/condvar_api/src/main.c
@@ -5,9 +5,9 @@
  */
 
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest_error_hook.h>
 
 #define STACK_SIZE     (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
 
diff --git a/tests/kernel/context/src/main.c b/tests/kernel/context/src/main.c
index 318bb39929d..b78de68afe4 100644
--- a/tests/kernel/context/src/main.c
+++ b/tests/kernel/context/src/main.c
@@ -21,7 +21,7 @@
  */
 
 #include <stdlib.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel_structs.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/irq_offload.h>
diff --git a/tests/kernel/device/src/abstract_driver.c b/tests/kernel/device/src/abstract_driver.c
index 412dbbdaeab..1fccec62b88 100644
--- a/tests/kernel/device/src/abstract_driver.c
+++ b/tests/kernel/device/src/abstract_driver.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/device.h>
 #include "abstract_driver.h"
 
diff --git a/tests/kernel/device/src/abstract_driver.h b/tests/kernel/device/src/abstract_driver.h
index 6471e4fda8c..f14b3bb4da0 100644
--- a/tests/kernel/device/src/abstract_driver.h
+++ b/tests/kernel/device/src/abstract_driver.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/device.h>
 
 /* define subsystem common API for drivers */
diff --git a/tests/kernel/device/src/main.c b/tests/kernel/device/src/main.c
index 52b839ce436..a07d1e2ec7d 100644
--- a/tests/kernel/device/src/main.c
+++ b/tests/kernel/device/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/zephyr.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/linker/sections.h>
 #include "abstract_driver.h"
diff --git a/tests/kernel/device/src/mmio.c b/tests/kernel/device/src/mmio.c
index ab0c26944c6..a97060654bf 100644
--- a/tests/kernel/device/src/mmio.c
+++ b/tests/kernel/device/src/mmio.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/device.h>
 
 #define DT_DRV_COMPAT	fakedriver
diff --git a/tests/kernel/device/src/mmio_multireg.c b/tests/kernel/device/src/mmio_multireg.c
index 8d35698a320..53b27a282b5 100644
--- a/tests/kernel/device/src/mmio_multireg.c
+++ b/tests/kernel/device/src/mmio_multireg.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/device.h>
 
 #define DT_DRV_COMPAT	fakedriver_multireg
diff --git a/tests/kernel/device/src/test_driver_init.c b/tests/kernel/device/src/test_driver_init.c
index 9a5a620ae8c..6fff2bc2d21 100644
--- a/tests/kernel/device/src/test_driver_init.c
+++ b/tests/kernel/device/src/test_driver_init.c
@@ -7,7 +7,7 @@
 #include <zephyr/zephyr.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/linker/sections.h>
 
 
diff --git a/tests/kernel/early_sleep/src/main.c b/tests/kernel/early_sleep/src/main.c
index 0768e1e4396..ceceba80462 100644
--- a/tests/kernel/early_sleep/src/main.c
+++ b/tests/kernel/early_sleep/src/main.c
@@ -28,8 +28,8 @@
 #include <zephyr/arch/cpu.h>
 #include <zephyr/sys_clock.h>
 #include <stdbool.h>
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 
 #define THREAD_STACK		(384 + CONFIG_TEST_EXTRA_STACK_SIZE)
 
diff --git a/tests/kernel/events/event_api/src/main.c b/tests/kernel/events/event_api/src/main.c
index e6bb480e8e9..f4b98f67802 100644
--- a/tests/kernel/events/event_api/src/main.c
+++ b/tests/kernel/events/event_api/src/main.c
@@ -22,7 +22,7 @@
  * @}
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(events_api, NULL, NULL,
 		ztest_simple_1cpu_before, ztest_simple_1cpu_after, NULL);
diff --git a/tests/kernel/events/event_api/src/test_event_apis.c b/tests/kernel/events/event_api/src/test_event_apis.c
index 11e48ba4de3..ee928a33974 100644
--- a/tests/kernel/events/event_api/src/test_event_apis.c
+++ b/tests/kernel/events/event_api/src/test_event_apis.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/wait_q.h>
 
 #define DELAY          K_MSEC(50)
diff --git a/tests/kernel/events/sys_event/src/main.c b/tests/kernel/events/sys_event/src/main.c
index d15d043f8c3..ef7571bc680 100644
--- a/tests/kernel/events/sys_event/src/main.c
+++ b/tests/kernel/events/sys_event/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest.h>
+#include <zephyr/ztest_error_hook.h>
 
 /* Macro declarations */
 
diff --git a/tests/kernel/fatal/exception/src/main.c b/tests/kernel/fatal/exception/src/main.c
index 9353b50188f..04c30d38600 100644
--- a/tests/kernel/fatal/exception/src/main.c
+++ b/tests/kernel/fatal/exception/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 #include <zephyr/kernel_structs.h>
 #include <zephyr/irq_offload.h>
 #include <kswap.h>
diff --git a/tests/kernel/fatal/no-multithreading/src/main.c b/tests/kernel/fatal/no-multithreading/src/main.c
index 5d754c31061..53421f30347 100644
--- a/tests/kernel/fatal/no-multithreading/src/main.c
+++ b/tests/kernel/fatal/no-multithreading/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 #include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <assert.h>
diff --git a/tests/kernel/fifo/fifo_api/src/main.c b/tests/kernel/fifo/fifo_api/src/main.c
index 92abf3c22d3..1640ba8107f 100644
--- a/tests/kernel/fifo/fifo_api/src/main.c
+++ b/tests/kernel/fifo/fifo_api/src/main.c
@@ -20,7 +20,7 @@
  * @}
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(fifo_api, NULL, NULL, NULL, NULL, NULL);
 
diff --git a/tests/kernel/fifo/fifo_api/src/test_fifo.h b/tests/kernel/fifo/fifo_api/src/test_fifo.h
index 8b415662efe..9aed26491d7 100644
--- a/tests/kernel/fifo/fifo_api/src/test_fifo.h
+++ b/tests/kernel/fifo/fifo_api/src/test_fifo.h
@@ -7,7 +7,7 @@
 #ifndef __TEST_FIFO_H__
 #define __TEST_FIFO_H__
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 
 typedef struct fdata {
diff --git a/tests/kernel/fifo/fifo_timeout/src/main.c b/tests/kernel/fifo/fifo_timeout/src/main.c
index 1f1d367d7c8..7f8691386f4 100644
--- a/tests/kernel/fifo/fifo_timeout/src/main.c
+++ b/tests/kernel/fifo/fifo_timeout/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/util.h>
diff --git a/tests/kernel/fifo/fifo_usage/src/main.c b/tests/kernel/fifo/fifo_usage/src/main.c
index 6e6f4417821..20c22c68f42 100644
--- a/tests/kernel/fifo/fifo_usage/src/main.c
+++ b/tests/kernel/fifo/fifo_usage/src/main.c
@@ -32,7 +32,7 @@
  * All the Push and Pop operations happen in ISR Context.
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 
 #define STACK_SIZE	(1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/fpu_sharing/float_disable/src/k_float_disable.c b/tests/kernel/fpu_sharing/float_disable/src/k_float_disable.c
index 43a2c1daf57..a3b0ed83d14 100644
--- a/tests/kernel/fpu_sharing/float_disable/src/k_float_disable.c
+++ b/tests/kernel/fpu_sharing/float_disable/src/k_float_disable.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define STACKSIZE 1024
 
@@ -154,7 +154,7 @@ ZTEST(k_float_disable, test_k_float_disable_syscall)
 #if defined(CONFIG_CPU_CORTEX_M)
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #else
-#include <interrupt_util.h>
+#include <zephyr/interrupt_util.h>
 #endif
 
 struct k_thread sup_fp_thread;
diff --git a/tests/kernel/fpu_sharing/generic/src/load_store.c b/tests/kernel/fpu_sharing/generic/src/load_store.c
index 9b4ad688551..7a716793dd4 100644
--- a/tests/kernel/fpu_sharing/generic/src/load_store.c
+++ b/tests/kernel/fpu_sharing/generic/src/load_store.c
@@ -35,7 +35,7 @@
  * x87 FPU registers are being saved/restored.
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/debug/gcov.h>
 
 #if defined(CONFIG_X86)
diff --git a/tests/kernel/fpu_sharing/generic/src/main.c b/tests/kernel/fpu_sharing/generic/src/main.c
index b404787619d..0e4ea590a99 100644
--- a/tests/kernel/fpu_sharing/generic/src/main.c
+++ b/tests/kernel/fpu_sharing/generic/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "test_common.h"
 
diff --git a/tests/kernel/fpu_sharing/generic/src/pi.c b/tests/kernel/fpu_sharing/generic/src/pi.c
index ec45cbd9712..48491cd4651 100644
--- a/tests/kernel/fpu_sharing/generic/src/pi.c
+++ b/tests/kernel/fpu_sharing/generic/src/pi.c
@@ -31,7 +31,7 @@
  * has occurred.
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "float_context.h"
 #include "test_common.h"
diff --git a/tests/kernel/gen_isr_table/src/main.c b/tests/kernel/gen_isr_table/src/main.c
index 42cacc6cc2f..5c4b4eac023 100644
--- a/tests/kernel/gen_isr_table/src/main.c
+++ b/tests/kernel/gen_isr_table/src/main.c
@@ -5,11 +5,11 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq.h>
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <zephyr/sw_isr_table.h>
-#include <interrupt_util.h>
+#include <zephyr/interrupt_util.h>
 
 extern uint32_t _irq_vector_table[];
 
diff --git a/tests/kernel/interrupt/src/dynamic_isr.c b/tests/kernel/interrupt/src/dynamic_isr.c
index 9832055df84..717a7f5fb07 100644
--- a/tests/kernel/interrupt/src/dynamic_isr.c
+++ b/tests/kernel/interrupt/src/dynamic_isr.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <interrupt_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/interrupt_util.h>
 
 #define ISR_DYN_ARG	0xab249cfd
 
diff --git a/tests/kernel/interrupt/src/interrupt_offload.c b/tests/kernel/interrupt/src/interrupt_offload.c
index 2aff3064482..f025cbc4261 100644
--- a/tests/kernel/interrupt/src/interrupt_offload.c
+++ b/tests/kernel/interrupt/src/interrupt_offload.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
-#include <interrupt_util.h>
+#include <zephyr/interrupt_util.h>
 
 #define STACK_SIZE	1024
 #define NUM_WORK	4
diff --git a/tests/kernel/interrupt/src/nested_irq.c b/tests/kernel/interrupt/src/nested_irq.c
index eaba7e1fba8..ee48a0366d2 100644
--- a/tests/kernel/interrupt/src/nested_irq.c
+++ b/tests/kernel/interrupt/src/nested_irq.c
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <interrupt_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/interrupt_util.h>
 
 /*
  * Run the nested interrupt test for the supported platforms only.
diff --git a/tests/kernel/interrupt/src/prevent_irq.c b/tests/kernel/interrupt/src/prevent_irq.c
index d613890d172..e6fbb5e97b0 100644
--- a/tests/kernel/interrupt/src/prevent_irq.c
+++ b/tests/kernel/interrupt/src/prevent_irq.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <interrupt_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/interrupt_util.h>
 
 #define DURATION	5
 #define HANDLER_TOKEN	0xDEADBEEF
diff --git a/tests/kernel/interrupt/src/regular_isr.c b/tests/kernel/interrupt/src/regular_isr.c
index bb265b2f7f5..2ed46778ebc 100644
--- a/tests/kernel/interrupt/src/regular_isr.c
+++ b/tests/kernel/interrupt/src/regular_isr.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <interrupt_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/interrupt_util.h>
 
 /*
  * Other arch has already been tested in testcase of gen_isr_table,
diff --git a/tests/kernel/lifo/lifo_api/src/test_lifo.h b/tests/kernel/lifo/lifo_api/src/test_lifo.h
index c3f1c2874c6..13585e207e6 100644
--- a/tests/kernel/lifo/lifo_api/src/test_lifo.h
+++ b/tests/kernel/lifo/lifo_api/src/test_lifo.h
@@ -7,7 +7,7 @@
 #ifndef __TEST_LIFO_H__
 #define __TEST_LIFO_H__
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 
 typedef struct ldata {
diff --git a/tests/kernel/lifo/lifo_usage/src/main.c b/tests/kernel/lifo/lifo_usage/src/main.c
index 69d7eeb86fb..6effcd832cc 100644
--- a/tests/kernel/lifo/lifo_usage/src/main.c
+++ b/tests/kernel/lifo/lifo_usage/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "lifo_usage.h"
 #include <zephyr/kernel.h>
 
diff --git a/tests/kernel/mbox/mbox_api/src/main.c b/tests/kernel/mbox/mbox_api/src/main.c
index 979b452218b..a8f116d9020 100644
--- a/tests/kernel/mbox/mbox_api/src/main.c
+++ b/tests/kernel/mbox/mbox_api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 extern void test_mbox_kinit(void);
 extern void test_mbox_kdefine(void);
 extern void test_enhance_capability(void);
diff --git a/tests/kernel/mbox/mbox_api/src/test_mbox_api.c b/tests/kernel/mbox/mbox_api/src/test_mbox_api.c
index d9ddb224dcf..5c74c73c158 100644
--- a/tests/kernel/mbox/mbox_api/src/test_mbox_api.c
+++ b/tests/kernel/mbox/mbox_api/src/test_mbox_api.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define TIMEOUT K_MSEC(100)
 #if !defined(CONFIG_BOARD_QEMU_X86)
diff --git a/tests/kernel/mbox/mbox_usage/src/main.c b/tests/kernel/mbox/mbox_usage/src/main.c
index 28ab4b82dc9..7511b585a0f 100644
--- a/tests/kernel/mbox/mbox_usage/src/main.c
+++ b/tests/kernel/mbox/mbox_usage/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/mem_heap/k_heap_api/src/main.c b/tests/kernel/mem_heap/k_heap_api/src/main.c
index 311bfb103f7..78a8fca4ad4 100644
--- a/tests/kernel/mem_heap/k_heap_api/src/main.c
+++ b/tests/kernel/mem_heap/k_heap_api/src/main.c
@@ -4,7 +4,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 extern void test_k_heap_min_size(void);
 extern void test_k_heap_alloc(void);
 extern void test_k_heap_alloc_fail(void);
diff --git a/tests/kernel/mem_heap/k_heap_api/src/test_kheap_api.c b/tests/kernel/mem_heap/k_heap_api/src/test_kheap_api.c
index 9cafc82ade4..6461c690b3c 100644
--- a/tests/kernel/mem_heap/k_heap_api/src/test_kheap_api.c
+++ b/tests/kernel/mem_heap/k_heap_api/src/test_kheap_api.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 #include "test_kheap.h"
 
diff --git a/tests/kernel/mem_heap/mheap_api_concept/src/main.c b/tests/kernel/mem_heap/mheap_api_concept/src/main.c
index cf5c799d101..5419adbf70a 100644
--- a/tests/kernel/mem_heap/mheap_api_concept/src/main.c
+++ b/tests/kernel/mem_heap/mheap_api_concept/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 extern void test_mheap_malloc_free(void);
 extern void test_mheap_calloc(void);
 extern void test_mheap_malloc_align4(void);
diff --git a/tests/kernel/mem_heap/mheap_api_concept/src/test_mheap_api.c b/tests/kernel/mem_heap/mheap_api_concept/src/test_mheap_api.c
index 44048b39b92..10466bd47ee 100644
--- a/tests/kernel/mem_heap/mheap_api_concept/src/test_mheap_api.c
+++ b/tests/kernel/mem_heap/mheap_api_concept/src/test_mheap_api.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <kernel_internal.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/sys/multi_heap.h>
diff --git a/tests/kernel/mem_heap/mheap_api_concept/src/test_mheap_concept.c b/tests/kernel/mem_heap/mheap_api_concept/src/test_mheap_concept.c
index dbc48917d94..99c02232108 100644
--- a/tests/kernel/mem_heap/mheap_api_concept/src/test_mheap_concept.c
+++ b/tests/kernel/mem_heap/mheap_api_concept/src/test_mheap_concept.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "test_mheap.h"
 
 #define THREAD_NUM 3
diff --git a/tests/kernel/mem_heap/shared_multi_heap/src/main.c b/tests/kernel/mem_heap/shared_multi_heap/src/main.c
index c9c508db57f..b36a6b2198b 100644
--- a/tests/kernel/mem_heap/shared_multi_heap/src/main.c
+++ b/tests/kernel/mem_heap/shared_multi_heap/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/sys/mem_manage.h>
 
diff --git a/tests/kernel/mem_protect/demand_paging/src/main.c b/tests/kernel/mem_protect/demand_paging/src/main.c
index 432e084b291..ff55972ea07 100644
--- a/tests/kernel/mem_protect/demand_paging/src/main.c
+++ b/tests/kernel/mem_protect/demand_paging/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/mem_manage.h>
 #include <zephyr/timing/timing.h>
 #include <mmu.h>
diff --git a/tests/kernel/mem_protect/futex/src/main.c b/tests/kernel/mem_protect/futex/src/main.c
index eae9434f598..c168b280501 100644
--- a/tests/kernel/mem_protect/futex/src/main.c
+++ b/tests/kernel/mem_protect/futex/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/sys/mutex.h>
 
diff --git a/tests/kernel/mem_protect/mem_map/src/main.c b/tests/kernel/mem_protect/mem_map/src/main.c
index bed727e5455..573d2db5949 100644
--- a/tests/kernel/mem_protect/mem_map/src/main.c
+++ b/tests/kernel/mem_protect/mem_map/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/mem_manage.h>
 #include <zephyr/toolchain.h>
 #include <mmu.h>
diff --git a/tests/kernel/mem_protect/mem_protect/src/common.c b/tests/kernel/mem_protect/mem_protect/src/common.c
index 581c7472c92..c3d50321da7 100644
--- a/tests/kernel/mem_protect/mem_protect/src/common.c
+++ b/tests/kernel/mem_protect/mem_protect/src/common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_BMEM volatile bool valid_fault;
 
diff --git a/tests/kernel/mem_protect/mem_protect/src/main.c b/tests/kernel/mem_protect/mem_protect/src/main.c
index b72fb312be3..960ca3932ac 100644
--- a/tests/kernel/mem_protect/mem_protect/src/main.c
+++ b/tests/kernel/mem_protect/mem_protect/src/main.c
@@ -8,7 +8,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel_structs.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/tests/kernel/mem_protect/mem_protect/src/mem_protect.h b/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
index 1582de9ff79..b400419ad44 100644
--- a/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
+++ b/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel_structs.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/tests/kernel/mem_protect/obj_validation/src/main.c b/tests/kernel/mem_protect/obj_validation/src/main.c
index a310f0828b5..bc96038335a 100644
--- a/tests/kernel/mem_protect/obj_validation/src/main.c
+++ b/tests/kernel/mem_protect/obj_validation/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/syscall_handler.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <kernel_internal.h>
 
 #define SEM_ARRAY_SIZE	16
diff --git a/tests/kernel/mem_protect/protection/src/main.c b/tests/kernel/mem_protect/protection/src/main.c
index e7bf50d8e3b..0eed647e8e9 100644
--- a/tests/kernel/mem_protect/protection/src/main.c
+++ b/tests/kernel/mem_protect/protection/src/main.c
@@ -8,7 +8,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel_structs.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/tests/kernel/mem_protect/stack_random/src/main.c b/tests/kernel/mem_protect/stack_random/src/main.c
index b8c6cd01858..d37ea3f0261 100644
--- a/tests/kernel/mem_protect/stack_random/src/main.c
+++ b/tests/kernel/mem_protect/stack_random/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 #define STACKSIZE       2048
diff --git a/tests/kernel/mem_protect/stackprot/src/main.c b/tests/kernel/mem_protect/stackprot/src/main.c
index 42765b2a66a..8db499b97f7 100644
--- a/tests/kernel/mem_protect/stackprot/src/main.c
+++ b/tests/kernel/mem_protect/stackprot/src/main.c
@@ -7,7 +7,7 @@
 
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 
 #define STACKSIZE       (2048 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/mem_protect/sys_sem/src/main.c b/tests/kernel/mem_protect/sys_sem/src/main.c
index d9e8c91b06b..f301ac95f24 100644
--- a/tests/kernel/mem_protect/sys_sem/src/main.c
+++ b/tests/kernel/mem_protect/sys_sem/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/sys/sem.h>
 
diff --git a/tests/kernel/mem_protect/syscalls/src/main.c b/tests/kernel/mem_protect/syscalls/src/main.c
index 472670f96a4..3d216730802 100644
--- a/tests/kernel/mem_protect/syscalls/src/main.c
+++ b/tests/kernel/mem_protect/syscalls/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/syscall_handler.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/linker/linker-defs.h>
 #include "test_syscalls.h"
 #include <mmu.h>
diff --git a/tests/kernel/mem_protect/userspace/src/main.c b/tests/kernel/mem_protect/userspace/src/main.c
index f71a9667b11..f0beb3e30f3 100644
--- a/tests/kernel/mem_protect/userspace/src/main.c
+++ b/tests/kernel/mem_protect/userspace/src/main.c
@@ -8,7 +8,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel_structs.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/tests/kernel/mem_slab/mslab/src/main.c b/tests/kernel/mem_slab/mslab/src/main.c
index 98a0d7c7da6..fd7db3ab77e 100644
--- a/tests/kernel/mem_slab/mslab/src/main.c
+++ b/tests/kernel/mem_slab/mslab/src/main.c
@@ -23,10 +23,10 @@
  * will have unpredictable side effects.
  */
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <stdbool.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* size of stack area used by each thread */
 #define STACKSIZE (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/mem_slab/mslab_api/src/main.c b/tests/kernel/mem_slab/mslab_api/src/main.c
index 65a75ae77da..d249a5e297b 100644
--- a/tests/kernel/mem_slab/mslab_api/src/main.c
+++ b/tests/kernel/mem_slab/mslab_api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern void test_mslab_kinit(void);
 extern void test_mslab_kdefine(void);
diff --git a/tests/kernel/mem_slab/mslab_api/src/test_mslab_api.c b/tests/kernel/mem_slab/mslab_api/src/test_mslab_api.c
index 51c34099bcb..a1e8495a319 100644
--- a/tests/kernel/mem_slab/mslab_api/src/test_mslab_api.c
+++ b/tests/kernel/mem_slab/mslab_api/src/test_mslab_api.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "test_mslab.h"
 
 /* TESTPOINT: Statically define and initialize a memory slab*/
diff --git a/tests/kernel/mem_slab/mslab_api/src/test_mslab_extern.c b/tests/kernel/mem_slab/mslab_api/src/test_mslab_extern.c
index e63e48804dc..38b6f426825 100644
--- a/tests/kernel/mem_slab/mslab_api/src/test_mslab_extern.c
+++ b/tests/kernel/mem_slab/mslab_api/src/test_mslab_extern.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "test_mslab.h"
 
 extern struct k_mem_slab kmslab;
diff --git a/tests/kernel/mem_slab/mslab_concept/src/main.c b/tests/kernel/mem_slab/mslab_concept/src/main.c
index d360c5575d5..17741b94ed4 100644
--- a/tests/kernel/mem_slab/mslab_concept/src/main.c
+++ b/tests/kernel/mem_slab/mslab_concept/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 extern void test_mslab_alloc_wait_prio(void);
 
 /*test case main entry*/
diff --git a/tests/kernel/mem_slab/mslab_concept/src/test_mslab_alloc_wait.c b/tests/kernel/mem_slab/mslab_concept/src/test_mslab_alloc_wait.c
index 7a7b7d73eee..8348b12feea 100644
--- a/tests/kernel/mem_slab/mslab_concept/src/test_mslab_alloc_wait.c
+++ b/tests/kernel/mem_slab/mslab_concept/src/test_mslab_alloc_wait.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "test_mslab.h"
 
 #define THREAD_NUM 3
diff --git a/tests/kernel/mem_slab/mslab_stats/src/main.c b/tests/kernel/mem_slab/mslab_stats/src/main.c
index ea944b3018e..d48e71c6172 100644
--- a/tests/kernel/mem_slab/mslab_stats/src/main.c
+++ b/tests/kernel/mem_slab/mslab_stats/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define BLK_SZ     64
 #define NUM_BLOCKS 8
diff --git a/tests/kernel/mem_slab/mslab_threadsafe/src/main.c b/tests/kernel/mem_slab/mslab_threadsafe/src/main.c
index d8c9f94fbd0..9bd2fc1e2ab 100644
--- a/tests/kernel/mem_slab/mslab_threadsafe/src/main.c
+++ b/tests/kernel/mem_slab/mslab_threadsafe/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern void test_mslab_threadsafe(void);
 
diff --git a/tests/kernel/mem_slab/mslab_threadsafe/src/test_mslab_threadsafe.c b/tests/kernel/mem_slab/mslab_threadsafe/src/test_mslab_threadsafe.c
index fd4e67bca96..fd8fc92a822 100644
--- a/tests/kernel/mem_slab/mslab_threadsafe/src/test_mslab_threadsafe.c
+++ b/tests/kernel/mem_slab/mslab_threadsafe/src/test_mslab_threadsafe.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/atomic.h>
 
 #define LOOP 10
diff --git a/tests/kernel/mp/src/main.c b/tests/kernel/mp/src/main.c
index a59fc443001..f6d40db62e7 100644
--- a/tests/kernel/mp/src/main.c
+++ b/tests/kernel/mp/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 
 #ifdef CONFIG_SMP
diff --git a/tests/kernel/msgq/msgq_api/src/main.c b/tests/kernel/msgq/msgq_api/src/main.c
index 42c2f26917d..ee1625cc0af 100644
--- a/tests/kernel/msgq/msgq_api/src/main.c
+++ b/tests/kernel/msgq/msgq_api/src/main.c
@@ -11,7 +11,7 @@
  * @}
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "test_msgq.h"
 
diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq.h b/tests/kernel/msgq/msgq_api/src/test_msgq.h
index eae397d2b58..8f1c20897c8 100644
--- a/tests/kernel/msgq/msgq_api/src/test_msgq.h
+++ b/tests/kernel/msgq/msgq_api/src/test_msgq.h
@@ -9,7 +9,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/irq_offload.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <limits.h>
 
 #define TIMEOUT_MS 100
diff --git a/tests/kernel/msgq/msgq_usage/src/main.c b/tests/kernel/msgq/msgq_usage/src/main.c
index cf6a9db49c5..f0f83697324 100644
--- a/tests/kernel/msgq/msgq_usage/src/main.c
+++ b/tests/kernel/msgq/msgq_usage/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/irq_offload.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <limits.h>
 
 #define MSGQ_LEN (2)
diff --git a/tests/kernel/mutex/mutex_api/src/test_mutex_apis.c b/tests/kernel/mutex/mutex_api/src/test_mutex_apis.c
index ced5e0092d0..5050022117a 100644
--- a/tests/kernel/mutex/mutex_api/src/test_mutex_apis.c
+++ b/tests/kernel/mutex/mutex_api/src/test_mutex_apis.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define TIMEOUT 500
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/mutex/mutex_error_case/src/test_mutex_error.c b/tests/kernel/mutex/mutex_error_case/src/test_mutex_error.c
index 1289776bf43..35e74ea1ba7 100644
--- a/tests/kernel/mutex/mutex_error_case/src/test_mutex_error.c
+++ b/tests/kernel/mutex/mutex_error_case/src/test_mutex_error.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest_error_hook.h>
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define THREAD_TEST_PRIORITY 5
diff --git a/tests/kernel/mutex/sys_mutex/src/main.c b/tests/kernel/mutex/sys_mutex/src/main.c
index b1054dd7a56..c66ed2d9a0c 100644
--- a/tests/kernel/mutex/sys_mutex/src/main.c
+++ b/tests/kernel/mutex/sys_mutex/src/main.c
@@ -45,9 +45,9 @@
  *             : main thread (@ priority 10) sleeps
  */
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/mutex.h>
 
 #define STACKSIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/mutex/sys_mutex/src/thread_12.c b/tests/kernel/mutex/sys_mutex/src/thread_12.c
index 0cb10440dff..5b33bced33a 100644
--- a/tests/kernel/mutex/sys_mutex/src/thread_12.c
+++ b/tests/kernel/mutex/sys_mutex/src/thread_12.c
@@ -15,7 +15,7 @@
  * the one it was defined in.
  */
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/mutex.h>
 
diff --git a/tests/kernel/mutex/sys_mutex/src/thread_competition.c b/tests/kernel/mutex/sys_mutex/src/thread_competition.c
index 5ff6125201d..c75484ad6da 100644
--- a/tests/kernel/mutex/sys_mutex/src/thread_competition.c
+++ b/tests/kernel/mutex/sys_mutex/src/thread_competition.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/mutex.h>
 
 #define HIGH_T1	 0xaaa
diff --git a/tests/kernel/obj_tracking/src/main.c b/tests/kernel/obj_tracking/src/main.c
index eb22b80a9b2..ba71f523e7c 100644
--- a/tests/kernel/obj_tracking/src/main.c
+++ b/tests/kernel/obj_tracking/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 void dummy_fn(struct k_timer *timer)
 {
diff --git a/tests/kernel/pending/src/main.c b/tests/kernel/pending/src/main.c
index 01d6970e410..a9aea4a890d 100644
--- a/tests/kernel/pending/src/main.c
+++ b/tests/kernel/pending/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <zephyr/kernel_structs.h>
 #include <stdbool.h>
diff --git a/tests/kernel/pipe/pipe/src/main.c b/tests/kernel/pipe/pipe/src/main.c
index 84471a0981c..b0f495137bc 100644
--- a/tests/kernel/pipe/pipe/src/main.c
+++ b/tests/kernel/pipe/pipe/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern struct k_pipe test_pipe;
 extern struct k_pipe small_pipe;
diff --git a/tests/kernel/pipe/pipe/src/test_pipe.c b/tests/kernel/pipe/pipe/src/test_pipe.c
index 76d372af2f9..2ad23a2091e 100644
--- a/tests/kernel/pipe/pipe/src/test_pipe.c
+++ b/tests/kernel/pipe/pipe/src/test_pipe.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /**
  * @brief Define and initialize test_pipe at compile time
diff --git a/tests/kernel/pipe/pipe_api/src/main.c b/tests/kernel/pipe/pipe_api/src/main.c
index 7f46defbf99..c6f057d9176 100644
--- a/tests/kernel/pipe/pipe_api/src/main.c
+++ b/tests/kernel/pipe/pipe_api/src/main.c
@@ -11,7 +11,7 @@
  * @}
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* k objects */
 extern struct k_pipe pipe, kpipe, khalfpipe, put_get_pipe;
diff --git a/tests/kernel/pipe/pipe_api/src/test_pipe_avail.c b/tests/kernel/pipe/pipe_api/src/test_pipe_avail.c
index 6aebb34dc0d..7c3ff00bd24 100644
--- a/tests/kernel/pipe/pipe_api/src/test_pipe_avail.c
+++ b/tests/kernel/pipe/pipe_api/src/test_pipe_avail.c
@@ -10,7 +10,7 @@
  * @{
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static ZTEST_DMEM unsigned char __aligned(4) data[] = "abcdefgh";
 static struct k_pipe pipe = {
diff --git a/tests/kernel/pipe/pipe_api/src/test_pipe_contexts.c b/tests/kernel/pipe/pipe_api/src/test_pipe_contexts.c
index f222cdff8e1..ab799d477b7 100644
--- a/tests/kernel/pipe/pipe_api/src/test_pipe_contexts.c
+++ b/tests/kernel/pipe/pipe_api/src/test_pipe_contexts.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define STACK_SIZE	(1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define PIPE_LEN	(4 * 16)
diff --git a/tests/kernel/pipe/pipe_api/src/test_pipe_fail.c b/tests/kernel/pipe/pipe_api/src/test_pipe_fail.c
index 2d24bc58729..8e364a48a8c 100644
--- a/tests/kernel/pipe/pipe_api/src/test_pipe_fail.c
+++ b/tests/kernel/pipe/pipe_api/src/test_pipe_fail.c
@@ -5,8 +5,8 @@
  */
 
 
-#include <ztest.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest.h>
+#include <zephyr/ztest_error_hook.h>
 
 #define TIMEOUT K_MSEC(100)
 #define PIPE_LEN 8
diff --git a/tests/kernel/poll/src/main.c b/tests/kernel/poll/src/main.c
index a3c6e73f03f..5a305450d1c 100644
--- a/tests/kernel/poll/src/main.c
+++ b/tests/kernel/poll/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 extern void test_poll_no_wait(void);
 extern void test_poll_wait(void);
 extern void test_poll_zero_events(void);
diff --git a/tests/kernel/poll/src/test_poll.c b/tests/kernel/poll/src/test_poll.c
index 389641cdf21..357e9222d3c 100644
--- a/tests/kernel/poll/src/test_poll.c
+++ b/tests/kernel/poll/src/test_poll.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 
 /* global values and data structures */
diff --git a/tests/kernel/poll/src/test_poll_fail.c b/tests/kernel/poll/src/test_poll_fail.c
index ca9874154f8..a2ab7312aad 100644
--- a/tests/kernel/poll/src/test_poll_fail.c
+++ b/tests/kernel/poll/src/test_poll_fail.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest_error_hook.h>
 
 static struct k_poll_signal signal_err;
 #define STACK_SIZE (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/profiling/profiling_api/src/main.c b/tests/kernel/profiling/profiling_api/src/main.c
index 43a1731d4ee..baa79cdc879 100644
--- a/tests/kernel/profiling/profiling_api/src/main.c
+++ b/tests/kernel/profiling/profiling_api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/pm/pm.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/debug/stack.h>
diff --git a/tests/kernel/queue/src/main.c b/tests/kernel/queue/src/main.c
index e22c6ff1730..5fe4bd2ef74 100644
--- a/tests/kernel/queue/src/main.c
+++ b/tests/kernel/queue/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "test_queue.h"
 
 #ifndef CONFIG_USERSPACE
diff --git a/tests/kernel/queue/src/test_queue.h b/tests/kernel/queue/src/test_queue.h
index 6015064876c..4b0ef0dd7bc 100644
--- a/tests/kernel/queue/src/test_queue.h
+++ b/tests/kernel/queue/src/test_queue.h
@@ -7,9 +7,9 @@
 #ifndef __TEST_FIFO_H__
 #define __TEST_FIFO_H__
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest_error_hook.h>
 
 extern void test_queue_thread2thread(void);
 extern void test_queue_thread2isr(void);
diff --git a/tests/kernel/sched/deadline/src/main.c b/tests/kernel/sched/deadline/src/main.c
index 12c187c710f..bca0a2b9b05 100644
--- a/tests/kernel/sched/deadline/src/main.c
+++ b/tests/kernel/sched/deadline/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/random/rand32.h>
 
 #define NUM_THREADS 8
diff --git a/tests/kernel/sched/metairq/src/main.c b/tests/kernel/sched/metairq/src/main.c
index f0e77903a2b..83d9ce01ed1 100644
--- a/tests/kernel/sched/metairq/src/main.c
+++ b/tests/kernel/sched/metairq/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 
 /*
diff --git a/tests/kernel/sched/preempt/src/main.c b/tests/kernel/sched/preempt/src/main.c
index 2960019e006..3d06b934e45 100644
--- a/tests/kernel/sched/preempt/src/main.c
+++ b/tests/kernel/sched/preempt/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/kernel_structs.h> /* for _THREAD_PENDING */
 
diff --git a/tests/kernel/sched/schedule_api/src/test_priority_scheduling.c b/tests/kernel/sched/schedule_api/src/test_priority_scheduling.c
index 41807964f48..abb2a8aa933 100644
--- a/tests/kernel/sched/schedule_api/src/test_priority_scheduling.c
+++ b/tests/kernel/sched/schedule_api/src/test_priority_scheduling.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "test_sched.h"
 
 /* nrf 51 has lower ram, so creating less number of threads */
diff --git a/tests/kernel/sched/schedule_api/src/test_sched.h b/tests/kernel/sched/schedule_api/src/test_sched.h
index e276a949166..e1f6310bd1f 100644
--- a/tests/kernel/sched/schedule_api/src/test_sched.h
+++ b/tests/kernel/sched/schedule_api/src/test_sched.h
@@ -8,7 +8,7 @@
 #define __TEST_SCHED_H__
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define MAX_NUM_THREAD 10
 #define STACK_SIZE (640 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/sched/schedule_api/src/test_sched_is_preempt_thread.c b/tests/kernel/sched/schedule_api/src/test_sched_is_preempt_thread.c
index 12370652e6d..27cc46fafcf 100644
--- a/tests/kernel/sched/schedule_api/src/test_sched_is_preempt_thread.c
+++ b/tests/kernel/sched/schedule_api/src/test_sched_is_preempt_thread.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 #include "test_sched.h"
 
diff --git a/tests/kernel/sched/schedule_api/src/test_sched_timeslice_reset.c b/tests/kernel/sched/schedule_api/src/test_sched_timeslice_reset.c
index 589a980ca24..d4fe7422339 100644
--- a/tests/kernel/sched/schedule_api/src/test_sched_timeslice_reset.c
+++ b/tests/kernel/sched/schedule_api/src/test_sched_timeslice_reset.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "test_sched.h"
 
 #ifdef CONFIG_TIMESLICING
diff --git a/tests/kernel/sched/schedule_api/src/test_slice_scheduling.c b/tests/kernel/sched/schedule_api/src/test_slice_scheduling.c
index e86f0285388..4b05c9fbfa6 100644
--- a/tests/kernel/sched/schedule_api/src/test_slice_scheduling.c
+++ b/tests/kernel/sched/schedule_api/src/test_slice_scheduling.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "test_sched.h"
 
 #ifdef CONFIG_TIMESLICING
diff --git a/tests/kernel/sched/schedule_api/src/user_api.c b/tests/kernel/sched/schedule_api/src/user_api.c
index 58c0683c8d8..17e2bfbc8ac 100644
--- a/tests/kernel/sched/schedule_api/src/user_api.c
+++ b/tests/kernel/sched/schedule_api/src/user_api.c
@@ -5,10 +5,10 @@
  */
 
 #include "test_sched.h"
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 #include <kernel_internal.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest_error_hook.h>
 
 struct k_thread user_thread;
 K_SEM_DEFINE(user_sem, 0, 1);
diff --git a/tests/kernel/semaphore/semaphore/src/main.c b/tests/kernel/semaphore/semaphore/src/main.c
index 9a02e0edac4..8c32fc3ea90 100644
--- a/tests/kernel/semaphore/semaphore/src/main.c
+++ b/tests/kernel/semaphore/semaphore/src/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest_error_hook.h>
 
 /* Macro declarations */
 #define SEM_INIT_VAL (0U)
diff --git a/tests/kernel/semaphore/sys_sem/src/main.c b/tests/kernel/semaphore/sys_sem/src/main.c
index a21a543e2c8..513c91cac82 100644
--- a/tests/kernel/semaphore/sys_sem/src/main.c
+++ b/tests/kernel/semaphore/sys_sem/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest.h>
+#include <zephyr/ztest_error_hook.h>
 
 /* Macro declarations */
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/sleep/src/main.c b/tests/kernel/sleep/src/main.c
index 09ad90c51dd..edd10b81112 100644
--- a/tests/kernel/sleep/src/main.c
+++ b/tests/kernel/sleep/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/irq_offload.h>
diff --git a/tests/kernel/sleep/src/usleep.c b/tests/kernel/sleep/src/usleep.c
index 5060bd52973..9341e392919 100644
--- a/tests/kernel/sleep/src/usleep.c
+++ b/tests/kernel/sleep/src/usleep.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 /*
diff --git a/tests/kernel/smp/src/main.c b/tests/kernel/smp/src/main.c
index a5e02cb5944..a4a276cea66 100644
--- a/tests/kernel/smp/src/main.c
+++ b/tests/kernel/smp/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <ksched.h>
 #include <zephyr/kernel_structs.h>
diff --git a/tests/kernel/smp_boot_delay/src/main.c b/tests/kernel/smp_boot_delay/src/main.c
index 30da0cda73d..e318a015bc6 100644
--- a/tests/kernel/smp_boot_delay/src/main.c
+++ b/tests/kernel/smp_boot_delay/src/main.c
@@ -3,7 +3,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* Experimentally 10ms is enough time to get the second CPU to run on
  * all known platforms.
diff --git a/tests/kernel/spinlock/src/main.c b/tests/kernel/spinlock/src/main.c
index 6673175d230..ba35979e756 100644
--- a/tests/kernel/spinlock/src/main.c
+++ b/tests/kernel/spinlock/src/main.c
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <zephyr/spinlock.h>
 
diff --git a/tests/kernel/spinlock/src/spinlock_error_case.c b/tests/kernel/spinlock/src/spinlock_error_case.c
index 37b821192dc..6d3ac6d84cf 100644
--- a/tests/kernel/spinlock/src/spinlock_error_case.c
+++ b/tests/kernel/spinlock/src/spinlock_error_case.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/spinlock.h>
 
 BUILD_ASSERT(CONFIG_MP_NUM_CPUS > 1);
diff --git a/tests/kernel/stack/stack/src/main.c b/tests/kernel/stack/stack/src/main.c
index 984b063e6ac..f0a1ad7bfb3 100644
--- a/tests/kernel/stack/stack/src/main.c
+++ b/tests/kernel/stack/stack/src/main.c
@@ -41,7 +41,7 @@
  * @}
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 
 #define TSTACK_SIZE     (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/stack/stack/src/test_stack_contexts.c b/tests/kernel/stack/stack/src/test_stack_contexts.c
index eb5e23ae407..757b5cd3867 100644
--- a/tests/kernel/stack/stack/src/test_stack_contexts.c
+++ b/tests/kernel/stack/stack/src/test_stack_contexts.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define STACK_LEN 4
diff --git a/tests/kernel/stack/stack/src/test_stack_fail.c b/tests/kernel/stack/stack/src/test_stack_fail.c
index f6c51460c38..0f0f2d6bd70 100644
--- a/tests/kernel/stack/stack/src/test_stack_fail.c
+++ b/tests/kernel/stack/stack/src/test_stack_fail.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest_error_hook.h>
 
 #define TIMEOUT K_MSEC(100)
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/threads/dynamic_thread/src/main.c b/tests/kernel/threads/dynamic_thread/src/main.c
index 169b336a696..637bdf508be 100644
--- a/tests/kernel/threads/dynamic_thread/src/main.c
+++ b/tests/kernel/threads/dynamic_thread/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/debug/stack.h>
 
diff --git a/tests/kernel/threads/no-multithreading/src/main.c b/tests/kernel/threads/no-multithreading/src/main.c
index c127342cb1b..f31aa02c16e 100644
--- a/tests/kernel/threads/no-multithreading/src/main.c
+++ b/tests/kernel/threads/no-multithreading/src/main.c
@@ -6,7 +6,7 @@
  */
 #include <zephyr/zephyr.h>
 #include <zephyr/device.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 void test_k_busy_wait(void)
 {
diff --git a/tests/kernel/threads/thread_apis/src/main.c b/tests/kernel/threads/thread_apis/src/main.c
index e1a952fbea8..bf7b365d1fd 100644
--- a/tests/kernel/threads/thread_apis/src/main.c
+++ b/tests/kernel/threads/thread_apis/src/main.c
@@ -13,7 +13,7 @@
  * @}
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel_structs.h>
 #include <zephyr/kernel.h>
 #include <kernel_internal.h>
diff --git a/tests/kernel/threads/thread_apis/src/test_essential_thread.c b/tests/kernel/threads/thread_apis/src/test_essential_thread.c
index 6b630b67a4c..2c88e9ac763 100644
--- a/tests/kernel/threads/thread_apis/src/test_essential_thread.c
+++ b/tests/kernel/threads/thread_apis/src/test_essential_thread.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
diff --git a/tests/kernel/threads/thread_apis/src/test_kthread_for_each.c b/tests/kernel/threads/thread_apis/src/test_kthread_for_each.c
index 4a1c6f17784..66fe21a002d 100644
--- a/tests/kernel/threads/thread_apis/src/test_kthread_for_each.c
+++ b/tests/kernel/threads/thread_apis/src/test_kthread_for_each.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/debug/stack.h>
 
diff --git a/tests/kernel/threads/thread_apis/src/test_threads_cancel_abort.c b/tests/kernel/threads/thread_apis/src/test_threads_cancel_abort.c
index b798202091d..d567191b002 100644
--- a/tests/kernel/threads/thread_apis/src/test_threads_cancel_abort.c
+++ b/tests/kernel/threads/thread_apis/src/test_threads_cancel_abort.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "tests_thread_apis.h"
 
diff --git a/tests/kernel/threads/thread_apis/src/test_threads_cpu_mask.c b/tests/kernel/threads/thread_apis/src/test_threads_cpu_mask.c
index 5b430751629..9bdc564cb50 100644
--- a/tests/kernel/threads/thread_apis/src/test_threads_cpu_mask.c
+++ b/tests/kernel/threads/thread_apis/src/test_threads_cpu_mask.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 
 #include "tests_thread_apis.h"
diff --git a/tests/kernel/threads/thread_apis/src/test_threads_set_priority.c b/tests/kernel/threads/thread_apis/src/test_threads_set_priority.c
index 10b2240d44f..274ec32f793 100644
--- a/tests/kernel/threads/thread_apis/src/test_threads_set_priority.c
+++ b/tests/kernel/threads/thread_apis/src/test_threads_set_priority.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "tests_thread_apis.h"
 
diff --git a/tests/kernel/threads/thread_apis/src/test_threads_spawn.c b/tests/kernel/threads/thread_apis/src/test_threads_spawn.c
index 2583e6f78ad..3f9ebcdadd3 100644
--- a/tests/kernel/threads/thread_apis/src/test_threads_spawn.c
+++ b/tests/kernel/threads/thread_apis/src/test_threads_spawn.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "tests_thread_apis.h"
 
diff --git a/tests/kernel/threads/thread_apis/src/test_threads_suspend_resume.c b/tests/kernel/threads/thread_apis/src/test_threads_suspend_resume.c
index 54e891e8458..2e16bf2afd2 100644
--- a/tests/kernel/threads/thread_apis/src/test_threads_suspend_resume.c
+++ b/tests/kernel/threads/thread_apis/src/test_threads_suspend_resume.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "tests_thread_apis.h"
 
diff --git a/tests/kernel/threads/thread_error_case/src/main.c b/tests/kernel/threads/thread_error_case/src/main.c
index eb3291a6cc0..54c81021355 100644
--- a/tests/kernel/threads/thread_error_case/src/main.c
+++ b/tests/kernel/threads/thread_error_case/src/main.c
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest.h>
+#include <zephyr/ztest_error_hook.h>
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define THREAD_TEST_PRIORITY 5
diff --git a/tests/kernel/threads/thread_init/src/main.c b/tests/kernel/threads/thread_init/src/main.c
index e24adb73be4..d97e409e4a7 100644
--- a/tests/kernel/threads/thread_init/src/main.c
+++ b/tests/kernel/threads/thread_init/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /*macro definition*/
 #define INIT_COOP_PRIO -2
diff --git a/tests/kernel/threads/thread_stack/src/main.c b/tests/kernel/threads/thread_stack/src/main.c
index b7e2dcd3bfb..a8d52c91d14 100644
--- a/tests/kernel/threads/thread_stack/src/main.c
+++ b/tests/kernel/threads/thread_stack/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/syscall_handler.h>
 #include <kernel_internal.h>
 
diff --git a/tests/kernel/threads/tls/src/main.c b/tests/kernel/threads/tls/src/main.c
index ce0a0d5780d..4b069da64d6 100644
--- a/tests/kernel/threads/tls/src/main.c
+++ b/tests/kernel/threads/tls/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <zephyr/kernel_structs.h>
 #include <zephyr/app_memory/app_memdomain.h>
diff --git a/tests/kernel/tickless/tickless_concept/src/main.c b/tests/kernel/tickless/tickless_concept/src/main.c
index 45e62f053d8..55e01c37872 100644
--- a/tests/kernel/tickless/tickless_concept/src/main.c
+++ b/tests/kernel/tickless/tickless_concept/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/pm/pm.h>
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/timer/cycle64/src/main.c b/tests/kernel/timer/cycle64/src/main.c
index 74dbb9a6623..0a318b44bc7 100644
--- a/tests/kernel/timer/cycle64/src/main.c
+++ b/tests/kernel/timer/cycle64/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 static void swap64(uint64_t *a, uint64_t *b)
diff --git a/tests/kernel/timer/starve/src/main.c b/tests/kernel/timer/starve/src/main.c
index aad5619c876..3559fb95745 100644
--- a/tests/kernel/timer/starve/src/main.c
+++ b/tests/kernel/timer/starve/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/sys/printk.h>
 
diff --git a/tests/kernel/timer/timer_api/src/main.c b/tests/kernel/timer/timer_api/src/main.c
index 35474e452bb..29066dd2747 100644
--- a/tests/kernel/timer/timer_api/src/main.c
+++ b/tests/kernel/timer/timer_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/types.h>
 
 struct timer_data {
diff --git a/tests/kernel/timer/timer_api/src/timer_convert.c b/tests/kernel/timer/timer_api/src/timer_convert.c
index 2eb44fbd87b..74f6665f997 100644
--- a/tests/kernel/timer/timer_api/src/timer_convert.c
+++ b/tests/kernel/timer/timer_api/src/timer_convert.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/types.h>
 #include <zephyr/sys/time_units.h>
 #include <zephyr/random/rand32.h>
diff --git a/tests/kernel/timer/timer_error_case/src/main.c b/tests/kernel/timer/timer_error_case/src/main.c
index 3aabf438583..b68a1bdbfa7 100644
--- a/tests/kernel/timer/timer_error_case/src/main.c
+++ b/tests/kernel/timer/timer_error_case/src/main.c
@@ -5,10 +5,10 @@
  */
 
 #include <stdlib.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/types.h>
 #include <zephyr/irq_offload.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest_error_hook.h>
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define THREAD_TEST_PRIORITY 0
diff --git a/tests/kernel/timer/timer_monotonic/src/main.c b/tests/kernel/timer/timer_monotonic/src/main.c
index ad7c247a87d..c3553848d6d 100644
--- a/tests/kernel/timer/timer_monotonic/src/main.c
+++ b/tests/kernel/timer/timer_monotonic/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 
 int test_frequency(void)
 {
diff --git a/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c b/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c
index 903896a1639..e071765cb12 100644
--- a/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c
+++ b/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define HELPER_STACK_SIZE 500
 
diff --git a/tests/kernel/workq/critical/src/main.c b/tests/kernel/workq/critical/src/main.c
index 29e01d6f613..78fc283d50d 100644
--- a/tests/kernel/workq/critical/src/main.c
+++ b/tests/kernel/workq/critical/src/main.c
@@ -26,7 +26,7 @@
  */
 #include <zephyr/zephyr.h>
 #include <zephyr/linker/sections.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define NUM_MILLISECONDS        50
 #define TEST_TIMEOUT            200
diff --git a/tests/kernel/workq/user_work/src/main.c b/tests/kernel/workq/user_work/src/main.c
index d49ac941ed7..17623487f74 100644
--- a/tests/kernel/workq/user_work/src/main.c
+++ b/tests/kernel/workq/user_work/src/main.c
@@ -12,7 +12,7 @@
  * @}
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/workq/work/src/main.c b/tests/kernel/workq/work/src/main.c
index 4553d411333..3cab74992c0 100644
--- a/tests/kernel/workq/work/src/main.c
+++ b/tests/kernel/workq/work/src/main.c
@@ -13,7 +13,7 @@
 #undef __DEPRECATED_MACRO
 #define __DEPRECATED_MACRO
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define STACK_SIZE (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define COOPHI_PRIORITY K_PRIO_COOP(0) /* = -4 */
diff --git a/tests/kernel/workq/work_queue/src/main.c b/tests/kernel/workq/work_queue/src/main.c
index 955148df582..697ec88aca7 100644
--- a/tests/kernel/workq/work_queue/src/main.c
+++ b/tests/kernel/workq/work_queue/src/main.c
@@ -16,8 +16,8 @@
 #define __DEPRECATED_MACRO
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 #include <zephyr/sys/util.h>
 
 #define NUM_TEST_ITEMS          6
diff --git a/tests/kernel/xip/src/main.c b/tests/kernel/xip/src/main.c
index bf94c3bab1b..9bd3f3e3229 100644
--- a/tests/kernel/xip/src/main.c
+++ b/tests/kernel/xip/src/main.c
@@ -20,7 +20,7 @@
  * @}
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* This test relies on these values being one larger than the one before */
 #define TEST_VAL_1  0x1
diff --git a/tests/lib/c_lib/src/main.c b/tests/lib/c_lib/src/main.c
index a2cf616c68f..9dd885b137e 100644
--- a/tests/lib/c_lib/src/main.c
+++ b/tests/lib/c_lib/src/main.c
@@ -17,7 +17,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/__assert.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <limits.h>
 #include <sys/types.h>
@@ -31,7 +31,7 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <time.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest_error_hook.h>
 #ifdef CONFIG_PICOLIBC
 #include <unistd.h>
 #endif
diff --git a/tests/lib/c_lib/src/test_qsort.c b/tests/lib/c_lib/src/test_qsort.c
index d90fd75fa16..9cfddc396c9 100644
--- a/tests/lib/c_lib/src/test_qsort.c
+++ b/tests/lib/c_lib/src/test_qsort.c
@@ -7,7 +7,7 @@
 #define _GNU_SOURCE
 #include <stdbool.h>
 #include <stdlib.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static int compare_ints(const void *a, const void *b)
 {
diff --git a/tests/lib/c_lib/src/test_strerror.c b/tests/lib/c_lib/src/test_strerror.c
index d3b8e335f6a..62994d401ae 100644
--- a/tests/lib/c_lib/src/test_strerror.c
+++ b/tests/lib/c_lib/src/test_strerror.c
@@ -7,7 +7,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST(test_c_lib, test_strerror)
 {
diff --git a/tests/lib/cbprintf_package/src/main.c b/tests/lib/cbprintf_package/src/main.c
index ae3882b173d..11fa466f2a7 100644
--- a/tests/lib/cbprintf_package/src/main.c
+++ b/tests/lib/cbprintf_package/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/cbprintf.h>
 #include <zephyr/linker/utils.h>
 
diff --git a/tests/lib/cmsis_dsp/basicmath/src/f16.c b/tests/lib/cmsis_dsp/basicmath/src/f16.c
index a35cdcfd4e6..dcbe3f72117 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/f16.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/basicmath/src/f32.c b/tests/lib/cmsis_dsp/basicmath/src/f32.c
index dc10fbee8d8..a1e64d83b9d 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q15.c b/tests/lib/cmsis_dsp/basicmath/src/q15.c
index a685f05fd32..1ad79a79e5e 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q15.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q31.c b/tests/lib/cmsis_dsp/basicmath/src/q31.c
index 937bc7e9d3a..9215ea5651a 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q31.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q7.c b/tests/lib/cmsis_dsp/basicmath/src/q7.c
index b2b353469ec..48445ebd06d 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q7.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/q7.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/bayes/src/f16.c b/tests/lib/cmsis_dsp/bayes/src/f16.c
index 366b7f518f4..42c91e2a914 100644
--- a/tests/lib/cmsis_dsp/bayes/src/f16.c
+++ b/tests/lib/cmsis_dsp/bayes/src/f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/bayes/src/f32.c b/tests/lib/cmsis_dsp/bayes/src/f32.c
index 00cce3ca9dd..4b59cd4a2ff 100644
--- a/tests/lib/cmsis_dsp/bayes/src/f32.c
+++ b/tests/lib/cmsis_dsp/bayes/src/f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/common/test_common.h b/tests/lib/cmsis_dsp/common/test_common.h
index f2a5e74b16c..ee82bba1f6e 100644
--- a/tests/lib/cmsis_dsp/common/test_common.h
+++ b/tests/lib/cmsis_dsp/common/test_common.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_TESTS_LIB_CMSIS_DSP_COMMON_TEST_COMMON_H_
 #define ZEPHYR_TESTS_LIB_CMSIS_DSP_COMMON_TEST_COMMON_H_
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/complexmath/src/f16.c b/tests/lib/cmsis_dsp/complexmath/src/f16.c
index d83102da929..779e65805cc 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/f16.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/complexmath/src/f32.c b/tests/lib/cmsis_dsp/complexmath/src/f32.c
index 18e511c51c0..9d38d43079b 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/complexmath/src/q15.c b/tests/lib/cmsis_dsp/complexmath/src/q15.c
index 11f618ca4bc..8895bdbec55 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/q15.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/complexmath/src/q31.c b/tests/lib/cmsis_dsp/complexmath/src/q31.c
index 680afc81678..2f11df8aaa9 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/q31.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/distance/src/f16.c b/tests/lib/cmsis_dsp/distance/src/f16.c
index ba80bac37c7..5d7333815ba 100644
--- a/tests/lib/cmsis_dsp/distance/src/f16.c
+++ b/tests/lib/cmsis_dsp/distance/src/f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/distance/src/f32.c b/tests/lib/cmsis_dsp/distance/src/f32.c
index ad6e747205d..d0d764b6e3d 100644
--- a/tests/lib/cmsis_dsp/distance/src/f32.c
+++ b/tests/lib/cmsis_dsp/distance/src/f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/distance/src/u32.c b/tests/lib/cmsis_dsp/distance/src/u32.c
index d39d6f01919..e21c5e1fc42 100644
--- a/tests/lib/cmsis_dsp/distance/src/u32.c
+++ b/tests/lib/cmsis_dsp/distance/src/u32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/fastmath/src/f16.c b/tests/lib/cmsis_dsp/fastmath/src/f16.c
index 0c346b44623..9634aa71484 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/f16.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/fastmath/src/f32.c b/tests/lib/cmsis_dsp/fastmath/src/f32.c
index 4f4f91867a7..e757fd88126 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/fastmath/src/q15.c b/tests/lib/cmsis_dsp/fastmath/src/q15.c
index 23b07bf6d48..ac35618a664 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/q15.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/fastmath/src/q31.c b/tests/lib/cmsis_dsp/fastmath/src/q31.c
index 648d6afdc3c..c090e29a429 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/q31.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_f16.c b/tests/lib/cmsis_dsp/filtering/src/biquad_f16.c
index e551b51a22e..b3475f4eef9 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_f16.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c b/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c
index 090575b8884..29db34bf75e 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c b/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c
index bf8cdb309ea..081b89d52c2 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_q15.c b/tests/lib/cmsis_dsp/filtering/src/biquad_q15.c
index 9645960ec3e..9afa3698d10 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_q31.c b/tests/lib/cmsis_dsp/filtering/src/biquad_q31.c
index ba9dbc55def..48696121d59 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/decim_f32.c b/tests/lib/cmsis_dsp/filtering/src/decim_f32.c
index b4d7e6603d1..5e0c764b217 100644
--- a/tests/lib/cmsis_dsp/filtering/src/decim_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/decim_f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/decim_q15.c b/tests/lib/cmsis_dsp/filtering/src/decim_q15.c
index 6b2c5b9567e..d7f3b195195 100644
--- a/tests/lib/cmsis_dsp/filtering/src/decim_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/decim_q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/decim_q31.c b/tests/lib/cmsis_dsp/filtering/src/decim_q31.c
index 7d7a3ae24ec..eded8fddb04 100644
--- a/tests/lib/cmsis_dsp/filtering/src/decim_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/decim_q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_f16.c b/tests/lib/cmsis_dsp/filtering/src/fir_f16.c
index f579cdca3b4..5d0808785b3 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_f16.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_f32.c b/tests/lib/cmsis_dsp/filtering/src/fir_f32.c
index 4985f60e514..2bec71811d6 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_q15.c b/tests/lib/cmsis_dsp/filtering/src/fir_q15.c
index b1924269d78..958373b177e 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_q31.c b/tests/lib/cmsis_dsp/filtering/src/fir_q31.c
index c91119dbdc7..327f0e0660f 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_q7.c b/tests/lib/cmsis_dsp/filtering/src/fir_q7.c
index b5bbf64ad97..b906adebf93 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_q7.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_q7.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/main.c b/tests/lib/cmsis_dsp/filtering/src/main.c
index cb3aa7bed59..c1317e8c42d 100644
--- a/tests/lib/cmsis_dsp/filtering/src/main.c
+++ b/tests/lib/cmsis_dsp/filtering/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 extern void test_filtering_biquad_q15(void);
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_f16.c b/tests/lib/cmsis_dsp/filtering/src/misc_f16.c
index c69733a39c7..4231a7f562c 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_f16.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_f32.c b/tests/lib/cmsis_dsp/filtering/src/misc_f32.c
index bc7a8b52c6e..1d9325101ed 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_q15.c b/tests/lib/cmsis_dsp/filtering/src/misc_q15.c
index 09c051ae4e9..a94e0c70cab 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_q31.c b/tests/lib/cmsis_dsp/filtering/src/misc_q31.c
index 890e6b87343..1fdaeebd9d5 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_q7.c b/tests/lib/cmsis_dsp/filtering/src/misc_q7.c
index b9d4ed58860..9e66954f078 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_q7.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_q7.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/interpolation/src/f16.c b/tests/lib/cmsis_dsp/interpolation/src/f16.c
index 20e288d2bbf..8bdba1ae107 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/f16.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/interpolation/src/f32.c b/tests/lib/cmsis_dsp/interpolation/src/f32.c
index 7675b3da8ff..76436695fa1 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/f32.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/interpolation/src/main.c b/tests/lib/cmsis_dsp/interpolation/src/main.c
index a8423818c08..3e22024e1a0 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/main.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 extern void test_interpolation_q7(void);
diff --git a/tests/lib/cmsis_dsp/interpolation/src/q15.c b/tests/lib/cmsis_dsp/interpolation/src/q15.c
index 9537dc587a0..1ed1f03680e 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/q15.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/interpolation/src/q31.c b/tests/lib/cmsis_dsp/interpolation/src/q31.c
index cafae262907..86634caae12 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/q31.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/interpolation/src/q7.c b/tests/lib/cmsis_dsp/interpolation/src/q7.c
index 7285a9f0eb6..218f9ac57ae 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/q7.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/q7.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_f16.c b/tests/lib/cmsis_dsp/matrix/src/binary_f16.c
index 6ce5b3d8979..bba59bfa9da 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_f16.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_f32.c b/tests/lib/cmsis_dsp/matrix/src/binary_f32.c
index 078d6f3b5b5..31091366972 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_f32.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_f64.c b/tests/lib/cmsis_dsp/matrix/src/binary_f64.c
index 1ef9c753efe..7686e19d7e3 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_f64.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_f64.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_q15.c b/tests/lib/cmsis_dsp/matrix/src/binary_q15.c
index 95fa7119f18..d3e346caed1 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_q15.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_q31.c b/tests/lib/cmsis_dsp/matrix/src/binary_q31.c
index 42d4b72b234..3546baf8f1f 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_q31.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_q7.c b/tests/lib/cmsis_dsp/matrix/src/binary_q7.c
index 0ac2d0748d9..73a6447a942 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_q7.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_q7.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/matrix/src/main.c b/tests/lib/cmsis_dsp/matrix/src/main.c
index 526a83e5e4f..19c08ed575d 100644
--- a/tests/lib/cmsis_dsp/matrix/src/main.c
+++ b/tests/lib/cmsis_dsp/matrix/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 extern void test_matrix_unary_q7(void);
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_f16.c b/tests/lib/cmsis_dsp/matrix/src/unary_f16.c
index 88905260650..3829b4bde0b 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_f16.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_f32.c b/tests/lib/cmsis_dsp/matrix/src/unary_f32.c
index 631d0cb8661..c0cafa685e7 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_f32.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_f64.c b/tests/lib/cmsis_dsp/matrix/src/unary_f64.c
index 0ad7a6bbbef..a22cee9eab0 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_f64.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_f64.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_q15.c b/tests/lib/cmsis_dsp/matrix/src/unary_q15.c
index 3d633c0c948..779d1ed74b0 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_q15.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_q31.c b/tests/lib/cmsis_dsp/matrix/src/unary_q31.c
index 936f7dc405b..f61ab0f7bae 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_q31.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_q7.c b/tests/lib/cmsis_dsp/matrix/src/unary_q7.c
index 5fb1e135541..dfeeb16327b 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_q7.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_q7.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/quaternionmath/src/f32.c b/tests/lib/cmsis_dsp/quaternionmath/src/f32.c
index 303b0f18064..eed70c9595d 100644
--- a/tests/lib/cmsis_dsp/quaternionmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/quaternionmath/src/f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/statistics/src/f16.c b/tests/lib/cmsis_dsp/statistics/src/f16.c
index 578c407dd5f..f0028e90d0d 100644
--- a/tests/lib/cmsis_dsp/statistics/src/f16.c
+++ b/tests/lib/cmsis_dsp/statistics/src/f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/statistics/src/f32.c b/tests/lib/cmsis_dsp/statistics/src/f32.c
index 5f1ac337d29..7f57c3096dc 100644
--- a/tests/lib/cmsis_dsp/statistics/src/f32.c
+++ b/tests/lib/cmsis_dsp/statistics/src/f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/statistics/src/f64.c b/tests/lib/cmsis_dsp/statistics/src/f64.c
index 802af682f33..00c1fc4f0a8 100644
--- a/tests/lib/cmsis_dsp/statistics/src/f64.c
+++ b/tests/lib/cmsis_dsp/statistics/src/f64.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/statistics/src/main.c b/tests/lib/cmsis_dsp/statistics/src/main.c
index 078f759398d..894ede6a2b5 100644
--- a/tests/lib/cmsis_dsp/statistics/src/main.c
+++ b/tests/lib/cmsis_dsp/statistics/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 extern void test_statistics_q7(void);
diff --git a/tests/lib/cmsis_dsp/statistics/src/q15.c b/tests/lib/cmsis_dsp/statistics/src/q15.c
index 63aa1f231d1..fba7557b028 100644
--- a/tests/lib/cmsis_dsp/statistics/src/q15.c
+++ b/tests/lib/cmsis_dsp/statistics/src/q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/statistics/src/q31.c b/tests/lib/cmsis_dsp/statistics/src/q31.c
index efc3eff9be7..08bfca98e5b 100644
--- a/tests/lib/cmsis_dsp/statistics/src/q31.c
+++ b/tests/lib/cmsis_dsp/statistics/src/q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/statistics/src/q7.c b/tests/lib/cmsis_dsp/statistics/src/q7.c
index 6848605a025..715272dd627 100644
--- a/tests/lib/cmsis_dsp/statistics/src/q7.c
+++ b/tests/lib/cmsis_dsp/statistics/src/q7.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/support/src/barycenter_f16.c b/tests/lib/cmsis_dsp/support/src/barycenter_f16.c
index 1603ae732eb..5999cc09524 100644
--- a/tests/lib/cmsis_dsp/support/src/barycenter_f16.c
+++ b/tests/lib/cmsis_dsp/support/src/barycenter_f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/support/src/barycenter_f32.c b/tests/lib/cmsis_dsp/support/src/barycenter_f32.c
index e3abdcb2990..4948907a3d1 100644
--- a/tests/lib/cmsis_dsp/support/src/barycenter_f32.c
+++ b/tests/lib/cmsis_dsp/support/src/barycenter_f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/support/src/f16.c b/tests/lib/cmsis_dsp/support/src/f16.c
index 0a110300d98..2e6d0fb7798 100644
--- a/tests/lib/cmsis_dsp/support/src/f16.c
+++ b/tests/lib/cmsis_dsp/support/src/f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/support/src/f32.c b/tests/lib/cmsis_dsp/support/src/f32.c
index 14086a4f208..2a749bd1e8f 100644
--- a/tests/lib/cmsis_dsp/support/src/f32.c
+++ b/tests/lib/cmsis_dsp/support/src/f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/support/src/main.c b/tests/lib/cmsis_dsp/support/src/main.c
index 7ddaa4231cd..e0ac51d2dbb 100644
--- a/tests/lib/cmsis_dsp/support/src/main.c
+++ b/tests/lib/cmsis_dsp/support/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 extern void test_support_q7(void);
diff --git a/tests/lib/cmsis_dsp/support/src/q15.c b/tests/lib/cmsis_dsp/support/src/q15.c
index 1c589a0fdd2..702fdf29d3d 100644
--- a/tests/lib/cmsis_dsp/support/src/q15.c
+++ b/tests/lib/cmsis_dsp/support/src/q15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/support/src/q31.c b/tests/lib/cmsis_dsp/support/src/q31.c
index dfc73154953..b5d5813bb25 100644
--- a/tests/lib/cmsis_dsp/support/src/q31.c
+++ b/tests/lib/cmsis_dsp/support/src/q31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/support/src/q7.c b/tests/lib/cmsis_dsp/support/src/q7.c
index 233362c77e1..80db4a331c0 100644
--- a/tests/lib/cmsis_dsp/support/src/q7.c
+++ b/tests/lib/cmsis_dsp/support/src/q7.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/svm/src/f16.c b/tests/lib/cmsis_dsp/svm/src/f16.c
index 414dfbe718f..1589dd65198 100644
--- a/tests/lib/cmsis_dsp/svm/src/f16.c
+++ b/tests/lib/cmsis_dsp/svm/src/f16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/svm/src/f32.c b/tests/lib/cmsis_dsp/svm/src/f32.c
index 54710e5722d..59afc87d2a6 100644
--- a/tests/lib/cmsis_dsp/svm/src/f32.c
+++ b/tests/lib/cmsis_dsp/svm/src/f32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/svm/src/main.c b/tests/lib/cmsis_dsp/svm/src/main.c
index 59ef657ae91..b8fccfbf129 100644
--- a/tests/lib/cmsis_dsp/svm/src/main.c
+++ b/tests/lib/cmsis_dsp/svm/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 extern void test_svm_f16(void);
diff --git a/tests/lib/cmsis_dsp/transform/src/cf16.c b/tests/lib/cmsis_dsp/transform/src/cf16.c
index d5627f75ef7..e16e3928429 100644
--- a/tests/lib/cmsis_dsp/transform/src/cf16.c
+++ b/tests/lib/cmsis_dsp/transform/src/cf16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/cf32.c b/tests/lib/cmsis_dsp/transform/src/cf32.c
index 6ba6993376f..785da42b233 100644
--- a/tests/lib/cmsis_dsp/transform/src/cf32.c
+++ b/tests/lib/cmsis_dsp/transform/src/cf32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/cf64.c b/tests/lib/cmsis_dsp/transform/src/cf64.c
index a303d1c32cb..1bae3d20dcc 100644
--- a/tests/lib/cmsis_dsp/transform/src/cf64.c
+++ b/tests/lib/cmsis_dsp/transform/src/cf64.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/cq15.c b/tests/lib/cmsis_dsp/transform/src/cq15.c
index 031da33bdd7..1b56c757835 100644
--- a/tests/lib/cmsis_dsp/transform/src/cq15.c
+++ b/tests/lib/cmsis_dsp/transform/src/cq15.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/cq31.c b/tests/lib/cmsis_dsp/transform/src/cq31.c
index 5caf25030a6..4a05b864dea 100644
--- a/tests/lib/cmsis_dsp/transform/src/cq31.c
+++ b/tests/lib/cmsis_dsp/transform/src/cq31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/main.c b/tests/lib/cmsis_dsp/transform/src/main.c
index 4eba19c2c4a..7c764f74fe9 100644
--- a/tests/lib/cmsis_dsp/transform/src/main.c
+++ b/tests/lib/cmsis_dsp/transform/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 extern void test_transform_cq15(void);
diff --git a/tests/lib/cmsis_dsp/transform/src/rf16.c b/tests/lib/cmsis_dsp/transform/src/rf16.c
index 782b8b76d07..2313b2865c5 100644
--- a/tests/lib/cmsis_dsp/transform/src/rf16.c
+++ b/tests/lib/cmsis_dsp/transform/src/rf16.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/rf32.c b/tests/lib/cmsis_dsp/transform/src/rf32.c
index 4ac15471cea..4ef7a640618 100644
--- a/tests/lib/cmsis_dsp/transform/src/rf32.c
+++ b/tests/lib/cmsis_dsp/transform/src/rf32.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/rf64.c b/tests/lib/cmsis_dsp/transform/src/rf64.c
index 3a005abcf53..8d416e50d8f 100644
--- a/tests/lib/cmsis_dsp/transform/src/rf64.c
+++ b/tests/lib/cmsis_dsp/transform/src/rf64.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/rq15.c b/tests/lib/cmsis_dsp/transform/src/rq15.c
index 7282a669ac9..fbe4dc5acfc 100644
--- a/tests/lib/cmsis_dsp/transform/src/rq15.c
+++ b/tests/lib/cmsis_dsp/transform/src/rq15.c
@@ -21,7 +21,7 @@
  *       test_arm_rifft_q15_step_4096
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/rq31.c b/tests/lib/cmsis_dsp/transform/src/rq31.c
index 6373f022058..8e0c6f5fd4c 100644
--- a/tests/lib/cmsis_dsp/transform/src/rq31.c
+++ b/tests/lib/cmsis_dsp/transform/src/rq31.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
diff --git a/tests/lib/cmsis_nn/src/main.c b/tests/lib/cmsis_nn/src/main.c
index 3286bec9d2b..2ebed03cbd4 100644
--- a/tests/lib/cmsis_nn/src/main.c
+++ b/tests/lib/cmsis_nn/src/main.c
@@ -10,7 +10,7 @@
  * validate the integration of CMSIS-NN and Zephyr
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 
diff --git a/tests/lib/devicetree/api/src/main.c b/tests/lib/devicetree/api/src/main.c
index a2e0f84457c..b641f263d78 100644
--- a/tests/lib/devicetree/api/src/main.c
+++ b/tests/lib/devicetree/api/src/main.c
@@ -17,7 +17,7 @@
  */
 #define __DEPRECATED_MACRO
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/tests/lib/devicetree/api_ext/src/main.c b/tests/lib/devicetree/api_ext/src/main.c
index 92580d1855b..cbd595d0779 100644
--- a/tests/lib/devicetree/api_ext/src/main.c
+++ b/tests/lib/devicetree/api_ext/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/tests/lib/devicetree/devices/src/main.c b/tests/lib/devicetree/devices/src/main.c
index 920acb8bd94..485d041d364 100644
--- a/tests/lib/devicetree/devices/src/main.c
+++ b/tests/lib/devicetree/devices/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/tests/lib/devicetree/memory_region/src/main.c b/tests/lib/devicetree/memory_region/src/main.c
index d42b36ad643..915e8db4c83 100644
--- a/tests/lib/devicetree/memory_region/src/main.c
+++ b/tests/lib/devicetree/memory_region/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/device.h>
 
diff --git a/tests/lib/fdtable/src/main.c b/tests/lib/fdtable/src/main.c
index 88b8632cc0e..460ba2361b6 100644
--- a/tests/lib/fdtable/src/main.c
+++ b/tests/lib/fdtable/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/fdtable.h>
 #include <errno.h>
diff --git a/tests/lib/gui/lvgl/src/main.c b/tests/lib/gui/lvgl/src/main.c
index 6e282e7e87b..1081874498d 100644
--- a/tests/lib/gui/lvgl/src/main.c
+++ b/tests/lib/gui/lvgl/src/main.c
@@ -10,7 +10,7 @@
 #include <zephyr/device.h>
 #include <zephyr/fs/fs.h>
 #include <zephyr/fs/littlefs.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <lvgl.h>
 
diff --git a/tests/lib/heap/src/main.c b/tests/lib/heap/src/main.c
index 3e09e75bbbd..a8b8bbac736 100644
--- a/tests/lib/heap/src/main.c
+++ b/tests/lib/heap/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/sys_heap.h>
 #include <zephyr/sys/heap_listener.h>
 #include <inttypes.h>
diff --git a/tests/lib/heap_align/src/main.c b/tests/lib/heap_align/src/main.c
index 8c45d8f8189..ac72de6b829 100644
--- a/tests/lib/heap_align/src/main.c
+++ b/tests/lib/heap_align/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/sys_heap.h>
 
 #define HEAP_SZ 0x1000
diff --git a/tests/lib/json/src/main.c b/tests/lib/json/src/main.c
index b7c66750b79..0171c85bbb6 100644
--- a/tests/lib/json/src/main.c
+++ b/tests/lib/json/src/main.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <zephyr/types.h>
 #include <stdbool.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/data/json.h>
 
 struct test_nested {
diff --git a/tests/lib/mem_alloc/src/main.c b/tests/lib/mem_alloc/src/main.c
index 015f33e23bc..f59dab1ecb5 100644
--- a/tests/lib/mem_alloc/src/main.c
+++ b/tests/lib/mem_alloc/src/main.c
@@ -26,7 +26,7 @@
 
 #define _BSD_SOURCE
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <time.h>
diff --git a/tests/lib/mem_blocks/src/main.c b/tests/lib/mem_blocks/src/main.c
index 41efb7ffc4a..41473cdaca1 100644
--- a/tests/lib/mem_blocks/src/main.c
+++ b/tests/lib/mem_blocks/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/sys/heap_listener.h>
 #include <zephyr/sys/mem_blocks.h>
diff --git a/tests/lib/mem_blocks_stats/src/main.c b/tests/lib/mem_blocks_stats/src/main.c
index 01258a70bf2..721bac557ee 100644
--- a/tests/lib/mem_blocks_stats/src/main.c
+++ b/tests/lib/mem_blocks_stats/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/sys/heap_listener.h>
 #include <zephyr/sys/mem_blocks.h>
diff --git a/tests/lib/mpsc_pbuf/src/main.c b/tests/lib/mpsc_pbuf/src/main.c
index 8ad2fc77a65..f00d9292741 100644
--- a/tests/lib/mpsc_pbuf/src/main.c
+++ b/tests/lib/mpsc_pbuf/src/main.c
@@ -11,10 +11,10 @@
 
 #include <zephyr/sys/mpsc_pbuf.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <stdbool.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/random/rand32.h>
 
 #define PUT_EXT_LEN \
diff --git a/tests/lib/newlib/heap_listener/src/main.c b/tests/lib/newlib/heap_listener/src/main.c
index 47bcdf65689..7b89a102063 100644
--- a/tests/lib/newlib/heap_listener/src/main.c
+++ b/tests/lib/newlib/heap_listener/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/sys/heap_listener.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <malloc.h>
 #include <stdio.h>
diff --git a/tests/lib/newlib/thread_safety/src/locks.c b/tests/lib/newlib/thread_safety/src/locks.c
index 9d92e65c911..ca2bdafc6d2 100644
--- a/tests/lib/newlib/thread_safety/src/locks.c
+++ b/tests/lib/newlib/thread_safety/src/locks.c
@@ -13,7 +13,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/lib/newlib/thread_safety/src/stress.c b/tests/lib/newlib/thread_safety/src/stress.c
index d369f6c6baf..05cbab89ab6 100644
--- a/tests/lib/newlib/thread_safety/src/stress.c
+++ b/tests/lib/newlib/thread_safety/src/stress.c
@@ -13,7 +13,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/lib/notify/src/main.c b/tests/lib/notify/src/main.c
index 889d9b79c2a..fb4875e60ad 100644
--- a/tests/lib/notify/src/main.c
+++ b/tests/lib/notify/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/notify.h>
 
 static uint32_t get_extflags(const struct sys_notify *anp)
diff --git a/tests/lib/onoff/src/main.c b/tests/lib/onoff/src/main.c
index 97373a2d8dc..dce12b17bcb 100644
--- a/tests/lib/onoff/src/main.c
+++ b/tests/lib/onoff/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/onoff.h>
 
 static struct onoff_client cli;
diff --git a/tests/lib/p4workq/src/main.c b/tests/lib/p4workq/src/main.c
index c74bacdc542..a3d89700f63 100644
--- a/tests/lib/p4workq/src/main.c
+++ b/tests/lib/p4workq/src/main.c
@@ -5,7 +5,7 @@
  */
 #include <zephyr/zephyr.h>
 #include <zephyr/random/rand32.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/p4wq.h>
 
 #define NUM_THREADS (CONFIG_MP_NUM_CPUS * 2)
diff --git a/tests/lib/ringbuffer/src/concurrent.c b/tests/lib/ringbuffer/src/concurrent.c
index ab72107b546..05c7b64a7a0 100644
--- a/tests/lib/ringbuffer/src/concurrent.c
+++ b/tests/lib/ringbuffer/src/concurrent.c
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
-#include <ztress.h>
+#include <zephyr/ztest.h>
+#include <zephyr/ztress.h>
 #include <zephyr/sys/ring_buffer.h>
 #include <zephyr/sys/mutex.h>
 #include <zephyr/random/rand32.h>
diff --git a/tests/lib/ringbuffer/src/main.c b/tests/lib/ringbuffer/src/main.c
index 661245f1b7c..1fd0911b708 100644
--- a/tests/lib/ringbuffer/src/main.c
+++ b/tests/lib/ringbuffer/src/main.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/sys/ring_buffer.h>
 
diff --git a/tests/lib/smf/src/main.c b/tests/lib/smf/src/main.c
index 52202b6987a..70ad335f6b7 100644
--- a/tests/lib/smf/src/main.c
+++ b/tests/lib/smf/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/smf.h>
 #include "test_lib_smf.h"
diff --git a/tests/lib/smf/src/test_lib_flat_smf.c b/tests/lib/smf/src/test_lib_flat_smf.c
index 2f10eacee1c..a2e93b9e5d8 100644
--- a/tests/lib/smf/src/test_lib_flat_smf.c
+++ b/tests/lib/smf/src/test_lib_flat_smf.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/smf.h>
 
 /*
diff --git a/tests/lib/smf/src/test_lib_hierarchical_5_ancestor_smf.c b/tests/lib/smf/src/test_lib_hierarchical_5_ancestor_smf.c
index eb22e32ca74..bd152105fc5 100644
--- a/tests/lib/smf/src/test_lib_hierarchical_5_ancestor_smf.c
+++ b/tests/lib/smf/src/test_lib_hierarchical_5_ancestor_smf.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/smf.h>
 
 /*
diff --git a/tests/lib/smf/src/test_lib_hierarchical_smf.c b/tests/lib/smf/src/test_lib_hierarchical_smf.c
index 03a0d0379c8..f9e89a54735 100644
--- a/tests/lib/smf/src/test_lib_hierarchical_smf.c
+++ b/tests/lib/smf/src/test_lib_hierarchical_smf.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/smf.h>
 
 /*
diff --git a/tests/lib/sprintf/src/main.c b/tests/lib/sprintf/src/main.c
index 87cb2cdaff8..44c3bc92602 100644
--- a/tests/lib/sprintf/src/main.c
+++ b/tests/lib/sprintf/src/main.c
@@ -11,7 +11,7 @@
  * This module contains the code for testing sprintf() functionality.
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdio.h>
 #include <stdarg.h>
 
diff --git a/tests/lib/spsc_pbuf/src/main.c b/tests/lib/spsc_pbuf/src/main.c
index c8237da0ade..ba7a413a8a9 100644
--- a/tests/lib/spsc_pbuf/src/main.c
+++ b/tests/lib/spsc_pbuf/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <ztress.h>
+#include <zephyr/ztest.h>
+#include <zephyr/ztress.h>
 #include <zephyr/sys/spsc_pbuf.h>
 #include <zephyr/random/rand32.h>
 
diff --git a/tests/lib/sys_util/src/main.c b/tests/lib/sys_util/src/main.c
index 792541667bf..718cf3d5b8c 100644
--- a/tests/lib/sys_util/src/main.c
+++ b/tests/lib/sys_util/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern void test_wait_for(void);
 
diff --git a/tests/lib/sys_util/src/wait_for.c b/tests/lib/sys_util/src/wait_for.c
index 0b73009b794..f36a1382393 100644
--- a/tests/lib/sys_util/src/wait_for.c
+++ b/tests/lib/sys_util/src/wait_for.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/sys/util.h>
 #include <zephyr/kernel.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /**
  * @addtogroup sys_util_tests
diff --git a/tests/lib/time/src/main.c b/tests/lib/time/src/main.c
index 1cfe61ae3ee..e815ba11dbb 100644
--- a/tests/lib/time/src/main.c
+++ b/tests/lib/time/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <time.h>
 
 ZTEST(libc_time, test_time_passing)
diff --git a/tests/misc/arm_mpu_regions/src/main.c b/tests/misc/arm_mpu_regions/src/main.c
index 35fdd6d857f..e4b29ac9244 100644
--- a/tests/misc/arm_mpu_regions/src/main.c
+++ b/tests/misc/arm_mpu_regions/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/sys/slist.h>
 #include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <string.h>
 
 extern const struct arm_mpu_config mpu_config;
diff --git a/tests/misc/iterable_sections/src/main.c b/tests/misc/iterable_sections/src/main.c
index f1420ddc94d..124b6ca1780 100644
--- a/tests/misc/iterable_sections/src/main.c
+++ b/tests/misc/iterable_sections/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 struct test_ram {
 	int i;
diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c
index 0592727258a..f1b399c693e 100644
--- a/tests/net/6lo/src/main.c
+++ b/tests/net/6lo/src/main.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_6LO_LOG_LEVEL);
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/linker/sections.h>
 
 #include <zephyr/types.h>
@@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_6LO_LOG_LEVEL);
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/dummy.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include "6lo.h"
 #include "icmpv6.h"
diff --git a/tests/net/all/src/main.c b/tests/net/all/src/main.c
index a6058793834..83d5bfbff00 100644
--- a/tests/net/all/src/main.c
+++ b/tests/net/all/src/main.c
@@ -13,7 +13,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, LOG_LEVEL_DBG);
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_pkt.h>
diff --git a/tests/net/arp/src/main.c b/tests/net/arp/src/main.c
index b56d9d5c2e2..d7522d61d5c 100644
--- a/tests/net/arp/src/main.c
+++ b/tests/net/arp/src/main.c
@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ARP_LOG_LEVEL);
 #include <zephyr/zephyr.h>
 #include <zephyr/linker/sections.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/types.h>
 #include <stddef.h>
@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ARP_LOG_LEVEL);
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/dummy.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/random/rand32.h>
 
 #include "arp.h"
diff --git a/tests/net/bridge/src/main.c b/tests/net/bridge/src/main.c
index 24e3dd45457..121c2683273 100644
--- a/tests/net/bridge/src/main.c
+++ b/tests/net/bridge/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/ethernet.h>
diff --git a/tests/net/buf/src/main.c b/tests/net/buf/src/main.c
index a278e1e5c67..8aa2ca6d77f 100644
--- a/tests/net/buf/src/main.c
+++ b/tests/net/buf/src/main.c
@@ -13,7 +13,7 @@
 
 #include <zephyr/net/buf.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define TEST_TIMEOUT K_SECONDS(1)
 
diff --git a/tests/net/checksum_offload/src/main.c b/tests/net/checksum_offload/src/main.c
index 7e9ff5a74a2..90beb4deb3c 100644
--- a/tests/net/checksum_offload/src/main.c
+++ b/tests/net/checksum_offload/src/main.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <zephyr/linker/sections.h>
 #include <zephyr/random/rand32.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/buf.h>
diff --git a/tests/net/context/src/main.c b/tests/net/context/src/main.c
index cadc44e5179..bf9113dd734 100644
--- a/tests/net/context/src/main.c
+++ b/tests/net/context/src/main.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_CONTEXT_LOG_LEVEL);
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_CONTEXT_LOG_LEVEL);
 #include <zephyr/linker/sections.h>
 #include <zephyr/random/rand32.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/dummy.h>
diff --git a/tests/net/dhcpv4/src/main.c b/tests/net/dhcpv4/src/main.c
index c511213db9b..71cf6988279 100644
--- a/tests/net/dhcpv4/src/main.c
+++ b/tests/net/dhcpv4/src/main.c
@@ -30,8 +30,8 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_DHCPV4_LOG_LEVEL);
 #include "ipv4.h"
 #include "udp_internal.h"
 
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
diff --git a/tests/net/ethernet_mgmt/src/main.c b/tests/net/ethernet_mgmt/src/main.c
index e07f5f6e16b..ef424f4e352 100644
--- a/tests/net/ethernet_mgmt/src/main.c
+++ b/tests/net/ethernet_mgmt/src/main.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/ethernet_mgmt.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if NET_LOG_LEVEL >= LOG_LEVEL_DBG
 #define DBG(fmt, ...) printk(fmt, ##__VA_ARGS__)
diff --git a/tests/net/hostname/src/main.c b/tests/net/hostname/src/main.c
index 937fba75d63..a9c1bf976e0 100644
--- a/tests/net/hostname/src/main.c
+++ b/tests/net/hostname/src/main.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <zephyr/sys/printk.h>
 #include <zephyr/linker/sections.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/buf.h>
diff --git a/tests/net/icmpv4/src/main.c b/tests/net/icmpv4/src/main.c
index 62d202e01dc..7d72d3e8721 100644
--- a/tests/net/icmpv4/src/main.c
+++ b/tests/net/icmpv4/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ICMPV4_LOG_LEVEL);
 #include <zephyr/sys/printk.h>
 #include <zephyr/linker/sections.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/net/buf.h>
 #include <zephyr/net/ethernet.h>
@@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ICMPV4_LOG_LEVEL);
 #include "icmpv4.h"
 #include "ipv4.h"
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static const unsigned char icmpv4_echo_req[] = {
 	/* IPv4 Header */
diff --git a/tests/net/icmpv6/src/main.c b/tests/net/icmpv6/src/main.c
index 9c9dd770cc7..5546e0ff724 100644
--- a/tests/net/icmpv6/src/main.c
+++ b/tests/net/icmpv6/src/main.c
@@ -16,12 +16,12 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ICMPV6_LOG_LEVEL);
 #include <zephyr/sys/printk.h>
 #include <zephyr/linker/sections.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/net/buf.h>
 
 #include "icmpv6.h"
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static int handler_called;
 static int handler_status;
diff --git a/tests/net/ieee802154/custom_l2/src/main.c b/tests/net/ieee802154/custom_l2/src/main.c
index e5d31b609ee..3f2ac5fd50c 100644
--- a/tests/net/ieee802154/custom_l2/src/main.c
+++ b/tests/net/ieee802154/custom_l2/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/ieee802154_radio.h>
 
diff --git a/tests/net/ieee802154/fragment/src/main.c b/tests/net/ieee802154/fragment/src/main.c
index 84008ae083a..d4f084a5d39 100644
--- a/tests/net/ieee802154/fragment/src/main.c
+++ b/tests/net/ieee802154/fragment/src/main.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/linker/sections.h>
 
 #include <zephyr/types.h>
@@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/dummy.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include "6lo.h"
 #include "ieee802154_fragment.h"
diff --git a/tests/net/ieee802154/l2/src/ieee802154_test.c b/tests/net/ieee802154/l2/src/ieee802154_test.c
index 39a2baf16ec..375967a0d73 100644
--- a/tests/net/ieee802154/l2/src/ieee802154_test.c
+++ b/tests/net/ieee802154/l2/src/ieee802154_test.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(net_ieee802154_test, LOG_LEVEL_DBG);
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/net_core.h>
 #include "net_private.h"
diff --git a/tests/net/iface/src/main.c b/tests/net/iface/src/main.c
index 12b4b83ffdb..5df7ce32c13 100644
--- a/tests/net/iface/src/main.c
+++ b/tests/net/iface/src/main.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <zephyr/linker/sections.h>
 #include <zephyr/random/rand32.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/dummy.h>
diff --git a/tests/net/igmp/src/main.c b/tests/net/igmp/src/main.c
index 930b72a5c3f..cdfad896d96 100644
--- a/tests/net/igmp/src/main.c
+++ b/tests/net/igmp/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV4_LOG_LEVEL);
 #include <errno.h>
 #include <zephyr/linker/sections.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_pkt.h>
diff --git a/tests/net/ip-addr/src/main.c b/tests/net/ip-addr/src/main.c
index e772b04381e..f3e37b29e29 100644
--- a/tests/net/ip-addr/src/main.c
+++ b/tests/net/ip-addr/src/main.c
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <zephyr/linker/sections.h>
 #include <zephyr/random/rand32.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/net_pkt.h>
diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c
index 36628bcb3f7..9acb0a9077c 100644
--- a/tests/net/ipv6/src/main.c
+++ b/tests/net/ipv6/src/main.c
@@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <zephyr/linker/sections.h>
 #include <zephyr/random/rand32.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/net_pkt.h>
diff --git a/tests/net/ipv6_fragment/src/main.c b/tests/net/ipv6_fragment/src/main.c
index 29086a56ad3..1c2aec7ced0 100644
--- a/tests/net/ipv6_fragment/src/main.c
+++ b/tests/net/ipv6_fragment/src/main.c
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <zephyr/linker/sections.h>
 #include <zephyr/random/rand32.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/dummy.h>
diff --git a/tests/net/lib/coap/src/main.c b/tests/net/lib/coap/src/main.c
index b3aff8b813c..d4bb75a7c49 100644
--- a/tests/net/lib/coap/src/main.c
+++ b/tests/net/lib/coap/src/main.c
@@ -18,8 +18,8 @@ LOG_MODULE_REGISTER(net_test, LOG_LEVEL_DBG);
 
 #include <zephyr/net/coap.h>
 
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 
 #include "net_private.h"
 
diff --git a/tests/net/lib/dns_addremove/src/main.c b/tests/net/lib/dns_addremove/src/main.c
index d6dd8a30110..1d0d8126c8f 100644
--- a/tests/net/lib/dns_addremove/src/main.c
+++ b/tests/net/lib/dns_addremove/src/main.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL);
 #include <zephyr/sys/printk.h>
 #include <zephyr/random/rand32.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/dummy.h>
diff --git a/tests/net/lib/dns_packet/src/main.c b/tests/net/lib/dns_packet/src/main.c
index 03fc1c914f1..c78265cae66 100644
--- a/tests/net/lib/dns_packet/src/main.c
+++ b/tests/net/lib/dns_packet/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/crc.h>
 #include <dns_pack.h>
 #include <dns_internal.h>
diff --git a/tests/net/lib/dns_resolve/src/main.c b/tests/net/lib/dns_resolve/src/main.c
index beb49db94f9..a594ffbcd1c 100644
--- a/tests/net/lib/dns_resolve/src/main.c
+++ b/tests/net/lib/dns_resolve/src/main.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL);
 #include <zephyr/sys/printk.h>
 #include <zephyr/random/rand32.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/dummy.h>
diff --git a/tests/net/lib/dns_sd/src/main.c b/tests/net/lib/dns_sd/src/main.c
index 29bd45c5cd8..635855f74bc 100644
--- a/tests/net/lib/dns_sd/src/main.c
+++ b/tests/net/lib/dns_sd/src/main.c
@@ -7,7 +7,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/dns_sd.h>
 #include <zephyr/net/net_context.h>
diff --git a/tests/net/lib/http_header_fields/src/main.c b/tests/net/lib/http_header_fields/src/main.c
index 41089ec6c49..02b9fd9b0d9 100644
--- a/tests/net/lib/http_header_fields/src/main.c
+++ b/tests/net/lib/http_header_fields/src/main.c
@@ -24,8 +24,8 @@
 #include <errno.h>
 
 #include <zephyr/sys/printk.h>
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 
 static
 struct http_parser_settings settings_null = {
diff --git a/tests/net/lib/lwm2m/content_json/src/main.c b/tests/net/lib/lwm2m/content_json/src/main.c
index 5600523c727..c73840591a0 100644
--- a/tests/net/lib/lwm2m/content_json/src/main.c
+++ b/tests/net/lib/lwm2m/content_json/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "lwm2m_engine.h"
 #include "lwm2m_rw_json.h"
diff --git a/tests/net/lib/lwm2m/content_link_format/src/main.c b/tests/net/lib/lwm2m/content_link_format/src/main.c
index 3e761acd6a3..0e55f504b12 100644
--- a/tests/net/lib/lwm2m/content_link_format/src/main.c
+++ b/tests/net/lib/lwm2m/content_link_format/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "lwm2m_engine.h"
 #include "lwm2m_rw_link_format.h"
diff --git a/tests/net/lib/lwm2m/content_oma_tlv/src/main.c b/tests/net/lib/lwm2m/content_oma_tlv/src/main.c
index 66ccda92115..af5c8aed0c2 100644
--- a/tests/net/lib/lwm2m/content_oma_tlv/src/main.c
+++ b/tests/net/lib/lwm2m/content_oma_tlv/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "lwm2m_util.h"
 #include "lwm2m_rw_oma_tlv.h"
diff --git a/tests/net/lib/lwm2m/content_plain_text/src/main.c b/tests/net/lib/lwm2m/content_plain_text/src/main.c
index afbd29627e9..5f8e06304d5 100644
--- a/tests/net/lib/lwm2m/content_plain_text/src/main.c
+++ b/tests/net/lib/lwm2m/content_plain_text/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "lwm2m_rw_plain_text.h"
 
diff --git a/tests/net/lib/lwm2m/content_raw_cbor/src/main.c b/tests/net/lib/lwm2m/content_raw_cbor/src/main.c
index 6cee7821cd8..bcbd052867d 100644
--- a/tests/net/lib/lwm2m/content_raw_cbor/src/main.c
+++ b/tests/net/lib/lwm2m/content_raw_cbor/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "lwm2m_util.h"
 #include "lwm2m_rw_cbor.h"
diff --git a/tests/net/lib/lwm2m/content_senml_cbor/src/main.c b/tests/net/lib/lwm2m/content_senml_cbor/src/main.c
index c7144ed8de9..7d4359f39ad 100644
--- a/tests/net/lib/lwm2m/content_senml_cbor/src/main.c
+++ b/tests/net/lib/lwm2m/content_senml_cbor/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "lwm2m_util.h"
 #include "lwm2m_rw_senml_cbor.h"
diff --git a/tests/net/lib/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt_packet/src/mqtt_packet.c
index 4d2809897aa..45bf834da3e 100644
--- a/tests/net/lib/mqtt_packet/src/mqtt_packet.c
+++ b/tests/net/lib/mqtt_packet/src/mqtt_packet.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <mqtt_internal.h>
 #include <zephyr/sys/util.h>	/* for ARRAY_SIZE */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define CLIENTID	MQTT_UTF8_LITERAL("zephyr")
 #define TOPIC		MQTT_UTF8_LITERAL("sensors")
diff --git a/tests/net/lib/mqtt_publisher/src/main.c b/tests/net/lib/mqtt_publisher/src/main.c
index 38eb76767a8..e79e54c2028 100644
--- a/tests/net/lib/mqtt_publisher/src/main.c
+++ b/tests/net/lib/mqtt_publisher/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern void test_mqtt_init(void);
 extern void test_mqtt_connect(void);
diff --git a/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c b/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c
index 58cfeadfc2f..a0758d52be5 100644
--- a/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c
+++ b/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c
@@ -9,7 +9,7 @@ LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN);
 
 #include <zephyr/net/mqtt.h>
 #include <zephyr/net/socket.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <string.h>
 #include <errno.h>
diff --git a/tests/net/lib/mqtt_pubsub/src/main.c b/tests/net/lib/mqtt_pubsub/src/main.c
index 380823abe4d..1f68a841b4e 100644
--- a/tests/net/lib/mqtt_pubsub/src/main.c
+++ b/tests/net/lib/mqtt_pubsub/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern void test_mqtt_connect(void);
 extern void test_mqtt_subscribe(void);
diff --git a/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c b/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c
index 05aca234ad9..e33ac55f61b 100644
--- a/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c
+++ b/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN);
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/mqtt.h>
 #include <zephyr/random/rand32.h>
diff --git a/tests/net/lib/mqtt_subscriber/src/main.c b/tests/net/lib/mqtt_subscriber/src/main.c
index 96839d0a0af..e812f9fbcbb 100644
--- a/tests/net/lib/mqtt_subscriber/src/main.c
+++ b/tests/net/lib/mqtt_subscriber/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern void test_mqtt_init(void);
 extern void test_mqtt_connect(void);
diff --git a/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c b/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c
index 0919e96635a..e163af2e7fe 100644
--- a/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c
+++ b/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN);
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/mqtt.h>
 #include <zephyr/random/rand32.h>
diff --git a/tests/net/lib/tls_credentials/src/main.c b/tests/net/lib/tls_credentials/src/main.c
index 77735f96b67..4ee88c6c0d8 100644
--- a/tests/net/lib/tls_credentials/src/main.c
+++ b/tests/net/lib/tls_credentials/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "tls_internal.h"
 
diff --git a/tests/net/mgmt/src/mgmt.c b/tests/net/mgmt/src/mgmt.c
index 73122da1f7a..d5b020bce81 100644
--- a/tests/net/mgmt/src/mgmt.c
+++ b/tests/net/mgmt/src/mgmt.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_MGMT_EVENT_LOG_LEVEL);
 
 #include <zephyr/zephyr.h>
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <errno.h>
 #include <zephyr/toolchain.h>
 #include <zephyr/linker/sections.h>
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_MGMT_EVENT_LOG_LEVEL);
 #include <zephyr/net/dummy.h>
 #include <zephyr/net/net_mgmt.h>
 #include <zephyr/net/net_pkt.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define THREAD_SLEEP 50 /* ms */
 #define TEST_INFO_STRING "mgmt event info"
diff --git a/tests/net/mld/src/main.c b/tests/net/mld/src/main.c
index 5bda52dc110..41f90d8296c 100644
--- a/tests/net/mld/src/main.c
+++ b/tests/net/mld/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <errno.h>
 #include <zephyr/linker/sections.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_pkt.h>
diff --git a/tests/net/neighbor/src/main.c b/tests/net/neighbor/src/main.c
index 02e385fd2f7..c6a04c1c16c 100644
--- a/tests/net/neighbor/src/main.c
+++ b/tests/net/neighbor/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_NBR_CACHE_LOG_LEVEL);
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/tests/net/net_pkt/src/main.c b/tests/net/net_pkt/src/main.c
index 92f20d4f30f..6e80352541c 100644
--- a/tests/net/net_pkt/src/main.c
+++ b/tests/net/net_pkt/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "kernel.h"
-#include "ztest_assert.h"
+#include <zephyr/kernel.h>
+#include <zephyr/ztest_assert.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
@@ -16,7 +16,7 @@
 #include <zephyr/net/ethernet.h>
 #include <zephyr/random/rand32.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static uint8_t mac_addr[sizeof(struct net_eth_addr)];
 static struct net_if *eth_if;
diff --git a/tests/net/npf/src/main.c b/tests/net/npf/src/main.c
index 342d0e2687c..840a4ea3b6f 100644
--- a/tests/net/npf/src/main.c
+++ b/tests/net/npf/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(npf_test, NET_LOG_LEVEL);
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/ethernet.h>
diff --git a/tests/net/pm/src/main.c b/tests/net/pm/src/main.c
index fe2799a6d82..cc4b33a410d 100644
--- a/tests/net/pm/src/main.c
+++ b/tests/net/pm/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/zephyr.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/pm/device.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/random/rand32.h>
 
 #include <zephyr/net/ethernet.h>
diff --git a/tests/net/ppp/driver/src/main.c b/tests/net/ppp/driver/src/main.c
index 9ba05a2cbee..2e61b64370b 100644
--- a/tests/net/ppp/driver/src/main.c
+++ b/tests/net/ppp/driver/src/main.c
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/crc.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/dummy.h>
diff --git a/tests/net/promiscuous/src/main.c b/tests/net/promiscuous/src/main.c
index 7d9ca1f8866..0b6e6a47957 100644
--- a/tests/net/promiscuous/src/main.c
+++ b/tests/net/promiscuous/src/main.c
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/net_ip.h>
diff --git a/tests/net/ptp/clock/src/main.c b/tests/net/ptp/clock/src/main.c
index f5260a8dc33..bb3d6f3194e 100644
--- a/tests/net/ptp/clock/src/main.c
+++ b/tests/net/ptp/clock/src/main.c
@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <zephyr/sys/printk.h>
 #include <zephyr/linker/sections.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/drivers/ptp_clock.h>
 #include <zephyr/net/ptp_time.h>
diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c
index b95d449de68..b7b901e1ff4 100644
--- a/tests/net/route/src/main.c
+++ b/tests/net/route/src/main.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL);
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL);
 #include <zephyr/linker/sections.h>
 #include <zephyr/random/rand32.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/dummy.h>
diff --git a/tests/net/route_mcast/src/main.c b/tests/net/route_mcast/src/main.c
index ded369ed5ca..cb10b830fa9 100644
--- a/tests/net/route_mcast/src/main.c
+++ b/tests/net/route_mcast/src/main.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL);
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL);
 #include <zephyr/linker/sections.h>
 #include <zephyr/random/rand32.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/dummy.h>
diff --git a/tests/net/shell/src/main.c b/tests/net/shell/src/main.c
index e1651ea4ce0..3c4db798745 100644
--- a/tests/net/shell/src/main.c
+++ b/tests/net/shell/src/main.c
@@ -34,7 +34,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include "ipv4.h"
 #include "ipv6.h"
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if NET_LOG_LEVEL >= LOG_LEVEL_DBG
 #define DBG(fmt, ...) printk(fmt, ##__VA_ARGS__)
diff --git a/tests/net/socket/af_packet/src/main.c b/tests/net/socket/af_packet/src/main.c
index d215c2d1b90..8a01924b846 100644
--- a/tests/net/socket/af_packet/src/main.c
+++ b/tests/net/socket/af_packet/src/main.c
@@ -9,7 +9,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <zephyr/sys/mutex.h>
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #include <fcntl.h>
 #include <zephyr/net/socket.h>
diff --git a/tests/net/socket/af_packet_ipproto_raw/src/main.c b/tests/net/socket/af_packet_ipproto_raw/src/main.c
index 461fa32e0d9..606bfe8713b 100644
--- a/tests/net/socket/af_packet_ipproto_raw/src/main.c
+++ b/tests/net/socket/af_packet_ipproto_raw/src/main.c
@@ -9,7 +9,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <zephyr/zephyr.h>
 #include <zephyr/linker/sections.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/random/rand32.h>
 
 #include <fcntl.h>
diff --git a/tests/net/socket/getaddrinfo/src/main.c b/tests/net/socket/getaddrinfo/src/main.c
index d715495c595..d6c9ee0cf20 100644
--- a/tests/net/socket/getaddrinfo/src/main.c
+++ b/tests/net/socket/getaddrinfo/src/main.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 #include <zephyr/sys/sem.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/dns_resolve.h>
diff --git a/tests/net/socket/getnameinfo/src/main.c b/tests/net/socket/getnameinfo/src/main.c
index 1c4751ada6e..ad9aaa59d3c 100644
--- a/tests/net/socket/getnameinfo/src/main.c
+++ b/tests/net/socket/getnameinfo/src/main.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #include <zephyr/net/socket.h>
 
diff --git a/tests/net/socket/misc/src/main.c b/tests/net/socket/misc/src/main.c
index 559090da414..36273a37004 100644
--- a/tests/net/socket/misc/src/main.c
+++ b/tests/net/socket/misc/src/main.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 #include <zephyr/sys/sem.h>
 
 #include <zephyr/net/socket.h>
diff --git a/tests/net/socket/net_mgmt/src/main.c b/tests/net/socket/net_mgmt/src/main.c
index 21153d8c508..fd264247d37 100644
--- a/tests/net/socket/net_mgmt/src/main.c
+++ b/tests/net/socket/net_mgmt/src/main.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/socket.h>
diff --git a/tests/net/socket/offload_dispatcher/src/main.c b/tests/net/socket/offload_dispatcher/src/main.c
index cd6971751a5..ad38cba5f2b 100644
--- a/tests/net/socket/offload_dispatcher/src/main.c
+++ b/tests/net/socket/offload_dispatcher/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/net/socket.h>
 #include <sockets_internal.h>
 #include <zephyr/sys/fdtable.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
diff --git a/tests/net/socket/poll/src/main.c b/tests/net/socket/poll/src/main.c
index 15beeb261c6..c734d2597eb 100644
--- a/tests/net/socket/poll/src/main.c
+++ b/tests/net/socket/poll/src/main.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #include <zephyr/net/socket.h>
 #include <zephyr/sys/fdtable.h>
diff --git a/tests/net/socket/register/src/main.c b/tests/net/socket/register/src/main.c
index 944d5331134..8b590e9b633 100644
--- a/tests/net/socket/register/src/main.c
+++ b/tests/net/socket/register/src/main.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/ethernet.h>
diff --git a/tests/net/socket/select/src/main.c b/tests/net/socket/select/src/main.c
index 54cfd390212..27895e37db3 100644
--- a/tests/net/socket/select/src/main.c
+++ b/tests/net/socket/select/src/main.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #include <zephyr/net/socket.h>
 
diff --git a/tests/net/socket/socket_helpers.h b/tests/net/socket/socket_helpers.h
index d67a0ff6c01..1d4d33f4bca 100644
--- a/tests/net/socket/socket_helpers.h
+++ b/tests/net/socket/socket_helpers.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #include <zephyr/net/socket.h>
 
diff --git a/tests/net/socket/socketpair/src/main.c b/tests/net/socket/socketpair/src/main.c
index 08412efe434..80bd9a18e8a 100644
--- a/tests/net/socket/socketpair/src/main.c
+++ b/tests/net/socket/socketpair/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "test_socketpair_thread.h"
 
diff --git a/tests/net/socket/socketpair/src/test_socketpair_block.c b/tests/net/socket/socketpair/src/test_socketpair_block.c
index c979b514e14..751c876f17c 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_block.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_block.c
@@ -14,7 +14,7 @@ LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include <zephyr/sys/util.h>
 #include <zephyr/posix/unistd.h>
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #include "test_socketpair_thread.h"
 
diff --git a/tests/net/socket/socketpair/src/test_socketpair_closed_ends.c b/tests/net/socket/socketpair/src/test_socketpair_closed_ends.c
index bedc2f720db..0ffa0c6ec43 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_closed_ends.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_closed_ends.c
@@ -13,7 +13,7 @@ LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include <zephyr/sys/util.h>
 #include <zephyr/posix/unistd.h>
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #undef read
 #define read(fd, buf, len) zsock_recv(fd, buf, len, 0)
diff --git a/tests/net/socket/socketpair/src/test_socketpair_expected_failures.c b/tests/net/socket/socketpair/src/test_socketpair_expected_failures.c
index 290f11c8b5b..79ea59afe89 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_expected_failures.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_expected_failures.c
@@ -15,7 +15,7 @@ LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include <zephyr/sys/util.h>
 #include <zephyr/posix/unistd.h>
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #undef read
 #define read(fd, buf, len) zsock_recv(fd, buf, len, 0)
diff --git a/tests/net/socket/socketpair/src/test_socketpair_fcntl.c b/tests/net/socket/socketpair/src/test_socketpair_fcntl.c
index 397438595b4..652c20d8a84 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_fcntl.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_fcntl.c
@@ -15,7 +15,7 @@ LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include <zephyr/sys/util.h>
 #include <zephyr/posix/unistd.h>
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #undef read
 #define read(fd, buf, len) zsock_recv(fd, buf, len, 0)
diff --git a/tests/net/socket/socketpair/src/test_socketpair_happy_path.c b/tests/net/socket/socketpair/src/test_socketpair_happy_path.c
index 0ba29c1e768..db70a603552 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_happy_path.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_happy_path.c
@@ -14,7 +14,7 @@ LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include <zephyr/sys/util.h>
 #include <zephyr/posix/unistd.h>
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #undef read
 #define read(fd, buf, len) zsock_recv(fd, buf, len, 0)
diff --git a/tests/net/socket/socketpair/src/test_socketpair_nonblock.c b/tests/net/socket/socketpair/src/test_socketpair_nonblock.c
index 9ef413e889b..0ee3561d298 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_nonblock.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_nonblock.c
@@ -15,7 +15,7 @@ LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include <zephyr/sys/util.h>
 #include <zephyr/posix/unistd.h>
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #undef read
 #define read(fd, buf, len) zsock_recv(fd, buf, len, 0)
diff --git a/tests/net/socket/socketpair/src/test_socketpair_poll.c b/tests/net/socket/socketpair/src/test_socketpair_poll.c
index 96e7c0e0b19..1900f6b8ae8 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_poll.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_poll.c
@@ -14,7 +14,7 @@ LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include <zephyr/posix/unistd.h>
 #include <zephyr/sys/util.h>
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #include "test_socketpair_thread.h"
 
diff --git a/tests/net/socket/socketpair/src/test_socketpair_unsupported_calls.c b/tests/net/socket/socketpair/src/test_socketpair_unsupported_calls.c
index 44d095a98c2..03ade4d7122 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_unsupported_calls.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_unsupported_calls.c
@@ -15,7 +15,7 @@ LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include <zephyr/sys/util.h>
 #include <zephyr/posix/unistd.h>
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #undef read
 #define read(fd, buf, len) zsock_recv(fd, buf, len, 0)
diff --git a/tests/net/socket/tcp/src/main.c b/tests/net/socket/tcp/src/main.c
index 9d023b4a13b..e190a9c6795 100644
--- a/tests/net/socket/tcp/src/main.c
+++ b/tests/net/socket/tcp/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 #include <fcntl.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/loopback.h>
diff --git a/tests/net/socket/tls/src/main.c b/tests/net/socket/tls/src/main.c
index 44fb4dcd1e7..ecf828dd0da 100644
--- a/tests/net/socket/tls/src/main.c
+++ b/tests/net/socket/tls/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 #include <fcntl.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/tests/net/socket/tls_ext/src/main.c b/tests/net/socket/tls_ext/src/main.c
index 1dc61bef134..ff58acd2194 100644
--- a/tests/net/socket/tls_ext/src/main.c
+++ b/tests/net/socket/tls_ext/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/net/tls_credentials.h>
 #include <zephyr/posix/unistd.h>
 #include <zephyr/sys/util.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 LOG_MODULE_REGISTER(tls_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
diff --git a/tests/net/socket/udp/src/main.c b/tests/net/socket/udp/src/main.c
index 85651f6e6f0..f405e04aef2 100644
--- a/tests/net/socket/udp/src/main.c
+++ b/tests/net/socket/udp/src/main.c
@@ -10,7 +10,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <zephyr/sys/mutex.h>
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #include <zephyr/net/socket.h>
 #include <zephyr/net/ethernet.h>
diff --git a/tests/net/socket/websocket/src/main.c b/tests/net/socket/websocket/src/main.c
index e0386c34654..39d135104f9 100644
--- a/tests/net/socket/websocket/src/main.c
+++ b/tests/net/socket/websocket/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_WEBSOCKET_LOG_LEVEL);
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/socket.h>
diff --git a/tests/net/tcp/src/main.c b/tests/net/tcp/src/main.c
index 8d0508c217a..6d372a7883a 100644
--- a/tests/net/tcp/src/main.c
+++ b/tests/net/tcp/src/main.c
@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_TCP_LOG_LEVEL);
 #include <string.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/linker/sections.h>
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/dummy.h>
@@ -33,7 +33,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_TCP_LOG_LEVEL);
 #include "tcp_private.h"
 #include "net_stats.h"
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define MY_PORT 4242
 #define PEER_PORT 4242
diff --git a/tests/net/traffic_class/src/main.c b/tests/net/traffic_class/src/main.c
index 82a132c262a..ca4e05dfbfa 100644
--- a/tests/net/traffic_class/src/main.c
+++ b/tests/net/traffic_class/src/main.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <zephyr/linker/sections.h>
 #include <zephyr/random/rand32.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/dummy.h>
diff --git a/tests/net/trickle/src/main.c b/tests/net/trickle/src/main.c
index 51027bfc787..755ae870b11 100644
--- a/tests/net/trickle/src/main.c
+++ b/tests/net/trickle/src/main.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_TRICKLE_LOG_LEVEL);
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_TRICKLE_LOG_LEVEL);
 #include <zephyr/sys/printk.h>
 #include <zephyr/linker/sections.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/net/buf.h>
 #include <zephyr/net/net_ip.h>
diff --git a/tests/net/tx_timestamp/src/main.c b/tests/net/tx_timestamp/src/main.c
index 4b53b7f5aed..573dcef58ef 100644
--- a/tests/net/tx_timestamp/src/main.c
+++ b/tests/net/tx_timestamp/src/main.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <zephyr/linker/sections.h>
 #include <zephyr/random/rand32.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/buf.h>
 #include <zephyr/net/net_ip.h>
diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c
index e766c7f343e..0eb8db69a2f 100644
--- a/tests/net/udp/src/main.c
+++ b/tests/net/udp/src/main.c
@@ -34,7 +34,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include "ipv4.h"
 #include "ipv6.h"
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #if NET_LOG_LEVEL >= LOG_LEVEL_DBG
 #define DBG(fmt, ...) printk(fmt, ##__VA_ARGS__)
diff --git a/tests/net/utils/src/main.c b/tests/net/utils/src/main.c
index 70bbede1e34..0b6f06182bf 100644
--- a/tests/net/utils/src/main.c
+++ b/tests/net/utils/src/main.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_UTILS_LOG_LEVEL);
 
 #include <zephyr/kernel.h>
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
@@ -24,8 +24,8 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_UTILS_LOG_LEVEL);
 #include <zephyr/net/ethernet.h>
 #include <zephyr/linker/sections.h>
 
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
diff --git a/tests/net/virtual/src/main.c b/tests/net/virtual/src/main.c
index 53695c3a46d..4c08890bcf7 100644
--- a/tests/net/virtual/src/main.c
+++ b/tests/net/virtual/src/main.c
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <zephyr/sys/printk.h>
 #include <zephyr/random/rand32.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/dummy.h>
 #include <zephyr/net/buf.h>
diff --git a/tests/net/vlan/src/main.c b/tests/net/vlan/src/main.c
index 8b649d75172..7f5781a9231 100644
--- a/tests/net/vlan/src/main.c
+++ b/tests/net/vlan/src/main.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <zephyr/linker/sections.h>
 #include <zephyr/random/rand32.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/dummy.h>
diff --git a/tests/posix/common/src/clock.c b/tests/posix/common/src/clock.c
index 0ce1c9ce3f1..cf68b261fc2 100644
--- a/tests/posix/common/src/clock.c
+++ b/tests/posix/common/src/clock.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/posix/time.h>
 #include <zephyr/posix/sys/time.h>
 #include <zephyr/posix/unistd.h>
diff --git a/tests/posix/common/src/main.c b/tests/posix/common/src/main.c
index 118aae85536..8ecb328c50f 100644
--- a/tests/posix/common/src/main.c
+++ b/tests/posix/common/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <pthread.h>
 
 ZTEST_SUITE(posix_apis, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/posix/common/src/mqueue.c b/tests/posix/common/src/mqueue.c
index a6be7d2dbe9..f229f4feba0 100644
--- a/tests/posix/common/src/mqueue.c
+++ b/tests/posix/common/src/mqueue.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/printk.h>
 #include <fcntl.h>
diff --git a/tests/posix/common/src/mutex.c b/tests/posix/common/src/mutex.c
index 4e2060850a4..280aa023b44 100644
--- a/tests/posix/common/src/mutex.c
+++ b/tests/posix/common/src/mutex.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <errno.h>
 #include <pthread.h>
 
diff --git a/tests/posix/common/src/nanosleep.c b/tests/posix/common/src/nanosleep.c
index 3a93d866884..e2e067a5d05 100644
--- a/tests/posix/common/src/nanosleep.c
+++ b/tests/posix/common/src/nanosleep.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <errno.h>
 #include <zephyr/posix/time.h>
 #include <stdint.h>
diff --git a/tests/posix/common/src/posix_rwlock.c b/tests/posix/common/src/posix_rwlock.c
index 075c75ec20c..5b982cddfbd 100644
--- a/tests/posix/common/src/posix_rwlock.c
+++ b/tests/posix/common/src/posix_rwlock.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <pthread.h>
 #include <zephyr/sys/util.h>
 
diff --git a/tests/posix/common/src/pthread.c b/tests/posix/common/src/pthread.c
index 5dd0735ff17..6a4c4d267f4 100644
--- a/tests/posix/common/src/pthread.c
+++ b/tests/posix/common/src/pthread.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <pthread.h>
 #include <semaphore.h>
diff --git a/tests/posix/common/src/pthread_key.c b/tests/posix/common/src/pthread_key.c
index 1f9a5d35d6b..86a3109ea22 100644
--- a/tests/posix/common/src/pthread_key.c
+++ b/tests/posix/common/src/pthread_key.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <pthread.h>
 #include <zephyr/sys/util.h>
diff --git a/tests/posix/common/src/semaphore.c b/tests/posix/common/src/semaphore.c
index d5e98ffcc66..73fbc1ec15b 100644
--- a/tests/posix/common/src/semaphore.c
+++ b/tests/posix/common/src/semaphore.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <errno.h>
 #include <pthread.h>
 #include <semaphore.h>
diff --git a/tests/posix/common/src/timer.c b/tests/posix/common/src/timer.c
index f5b07f9e772..5ec51c41a97 100644
--- a/tests/posix/common/src/timer.c
+++ b/tests/posix/common/src/timer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <time.h>
 #include <unistd.h>
 
diff --git a/tests/posix/eventfd/src/main.c b/tests/posix/eventfd/src/main.c
index fb24bc58101..5957e7d86af 100644
--- a/tests/posix/eventfd/src/main.c
+++ b/tests/posix/eventfd/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/tests/posix/eventfd_basic/src/main.c b/tests/posix/eventfd_basic/src/main.c
index c25efa20645..707ec6a7b6d 100644
--- a/tests/posix/eventfd_basic/src/main.c
+++ b/tests/posix/eventfd_basic/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/net/socket.h>
 
diff --git a/tests/posix/fs/src/test_fs.h b/tests/posix/fs/src/test_fs.h
index 247d9c1dec8..adb1290758d 100644
--- a/tests/posix/fs/src/test_fs.h
+++ b/tests/posix/fs/src/test_fs.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define FATFS_MNTP	"/RAM:"
 #define TEST_FILE	FATFS_MNTP"/testfile.txt"
diff --git a/tests/posix/getopt/src/main.c b/tests/posix/getopt/src/main.c
index 961b3f93485..55f8dbcf19b 100644
--- a/tests/posix/getopt/src/main.c
+++ b/tests/posix/getopt/src/main.c
@@ -10,7 +10,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <string.h>
 #include <getopt.h>
 
diff --git a/tests/subsys/canbus/isotp/conformance/src/main.c b/tests/subsys/canbus/isotp/conformance/src/main.c
index 9430885f953..b1ac9168085 100644
--- a/tests/subsys/canbus/isotp/conformance/src/main.c
+++ b/tests/subsys/canbus/isotp/conformance/src/main.c
@@ -5,7 +5,7 @@
  */
 #include <zephyr/canbus/isotp.h>
 #include <zephyr/drivers/can.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <strings.h>
 #include "random_data.h"
 
diff --git a/tests/subsys/canbus/isotp/implementation/src/main.c b/tests/subsys/canbus/isotp/implementation/src/main.c
index e3b327563ba..a8e7cd7db2c 100644
--- a/tests/subsys/canbus/isotp/implementation/src/main.c
+++ b/tests/subsys/canbus/isotp/implementation/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/canbus/isotp.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <strings.h>
 #include "random_data.h"
 #include <zephyr/net/buf.h>
diff --git a/tests/subsys/cpp/cxx/src/main.cpp b/tests/subsys/cpp/cxx/src/main.cpp
index ac2405c83b7..eb36b9e2aa8 100644
--- a/tests/subsys/cpp/cxx/src/main.cpp
+++ b/tests/subsys/cpp/cxx/src/main.cpp
@@ -75,7 +75,7 @@
 #include <zephyr/drivers/video.h>
 #include <zephyr/drivers/watchdog.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 class foo_class {
 public:
diff --git a/tests/subsys/cpp/libcxx/src/main.cpp b/tests/subsys/cpp/libcxx/src/main.cpp
index 2ae446b622b..db8c87e900b 100644
--- a/tests/subsys/cpp/libcxx/src/main.cpp
+++ b/tests/subsys/cpp/libcxx/src/main.cpp
@@ -8,7 +8,7 @@
 #include <functional>
 #include <memory>
 #include <vector>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 BUILD_ASSERT(__cplusplus == 201703);
 
diff --git a/tests/subsys/debug/coredump_backends/src/main.c b/tests/subsys/debug/coredump_backends/src/main.c
index 88eb6f26d2a..e902523e832 100644
--- a/tests/subsys/debug/coredump_backends/src/main.c
+++ b/tests/subsys/debug/coredump_backends/src/main.c
@@ -7,9 +7,9 @@
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/printk.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <assert.h>
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/debug/coredump.h>
 
diff --git a/tests/subsys/dfu/img_util/src/main.c b/tests/subsys/dfu/img_util/src/main.c
index 7dd6f7e5368..d2d22ffa157 100644
--- a/tests/subsys/dfu/img_util/src/main.c
+++ b/tests/subsys/dfu/img_util/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/storage/flash_map.h>
 #include <zephyr/dfu/flash_img.h>
 
diff --git a/tests/subsys/dfu/mcuboot/src/main.c b/tests/subsys/dfu/mcuboot/src/main.c
index 9601f719961..e4d1b75795c 100644
--- a/tests/subsys/dfu/mcuboot/src/main.c
+++ b/tests/subsys/dfu/mcuboot/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/storage/flash_map.h>
 #include <zephyr/dfu/mcuboot.h>
 
diff --git a/tests/subsys/dfu/mcuboot_multi/src/main.c b/tests/subsys/dfu/mcuboot_multi/src/main.c
index a4c9a505dad..8a657eace83 100644
--- a/tests/subsys/dfu/mcuboot_multi/src/main.c
+++ b/tests/subsys/dfu/mcuboot_multi/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/storage/flash_map.h>
 #include <zephyr/dfu/mcuboot.h>
 #include <zephyr/drivers/flash.h>
diff --git a/tests/subsys/edac/ibecc/src/dummy.c b/tests/subsys/edac/ibecc/src/dummy.c
index 4c2d8c73aff..b63b647a89a 100644
--- a/tests/subsys/edac/ibecc/src/dummy.c
+++ b/tests/subsys/edac/ibecc/src/dummy.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/device.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/drivers/edac.h>
 
diff --git a/tests/subsys/edac/ibecc/src/ibecc.c b/tests/subsys/edac/ibecc/src/ibecc.c
index bd9c243e632..fd62aea1c6a 100644
--- a/tests/subsys/edac/ibecc/src/ibecc.c
+++ b/tests/subsys/edac/ibecc/src/ibecc.c
@@ -6,8 +6,8 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/device.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/drivers/edac.h>
 #include <ibecc.h>
diff --git a/tests/subsys/edac/ibecc_cov/src/ibecc.c b/tests/subsys/edac/ibecc_cov/src/ibecc.c
index b2325711ef0..d22c58da9c7 100644
--- a/tests/subsys/edac/ibecc_cov/src/ibecc.c
+++ b/tests/subsys/edac/ibecc_cov/src/ibecc.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/drivers/pcie/pcie.h>
 #include <ibecc.h>
diff --git a/tests/subsys/fs/common/test_fs_open_flags.c b/tests/subsys/fs/common/test_fs_open_flags.c
index 96c39dd5541..88e1227a0ee 100644
--- a/tests/subsys/fs/common/test_fs_open_flags.c
+++ b/tests/subsys/fs/common/test_fs_open_flags.c
@@ -11,7 +11,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/fs/fs.h>
 #include <string.h>
 
diff --git a/tests/subsys/fs/fat_fs_api/src/test_fat.h b/tests/subsys/fs/fat_fs_api/src/test_fat.h
index 05232c80888..d6679d5e2fb 100644
--- a/tests/subsys/fs/fat_fs_api/src/test_fat.h
+++ b/tests/subsys/fs/fat_fs_api/src/test_fat.h
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/fs/fs.h>
 
 #define FATFS_MNTP	"/NAND:"
diff --git a/tests/subsys/fs/fat_fs_dual_drive/src/test_fat.h b/tests/subsys/fs/fat_fs_dual_drive/src/test_fat.h
index b7ddc9d90d3..88772ed826f 100644
--- a/tests/subsys/fs/fat_fs_dual_drive/src/test_fat.h
+++ b/tests/subsys/fs/fat_fs_dual_drive/src/test_fat.h
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/fs/fs.h>
 
 /* Make sure to match the drive name to ELM FAT Lib volume strings */
diff --git a/tests/subsys/fs/fcb/src/fcb_test.h b/tests/subsys/fs/fcb/src/fcb_test.h
index fc0f2de81aa..7889a371b08 100644
--- a/tests/subsys/fs/fcb/src/fcb_test.h
+++ b/tests/subsys/fs/fcb/src/fcb_test.h
@@ -10,7 +10,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/fs/fcb.h>
 #include "fcb_priv.h"
diff --git a/tests/subsys/fs/fs_api/src/test_fs.h b/tests/subsys/fs/fs_api/src/test_fs.h
index c4700d89684..dc8e1819b0c 100644
--- a/tests/subsys/fs/fs_api/src/test_fs.h
+++ b/tests/subsys/fs/fs_api/src/test_fs.h
@@ -8,7 +8,7 @@
 #define __TEST_FS_H__
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/fs/fs.h>
 #include <zephyr/fs/fs_sys.h>
 
diff --git a/tests/subsys/fs/fs_api/src/test_fs_mount_flags.c b/tests/subsys/fs/fs_api/src/test_fs_mount_flags.c
index 92b1ed40090..cc72ca7e043 100644
--- a/tests/subsys/fs/fs_api/src/test_fs_mount_flags.c
+++ b/tests/subsys/fs/fs_api/src/test_fs_mount_flags.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "test_fs.h"
 
 static struct test_fs_data test_data;
diff --git a/tests/subsys/fs/littlefs/src/main.c b/tests/subsys/fs/littlefs/src/main.c
index f3fda41574a..b8ec7a1501d 100644
--- a/tests/subsys/fs/littlefs/src/main.c
+++ b/tests/subsys/fs/littlefs/src/main.c
@@ -7,7 +7,7 @@
 /* Tests of functions in testfs_util */
 
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "testfs_tests.h"
 #include "testfs_lfs.h"
 
diff --git a/tests/subsys/fs/littlefs/src/test_lfs_basic.c b/tests/subsys/fs/littlefs/src/test_lfs_basic.c
index b1113591f71..18fb0176bdf 100644
--- a/tests/subsys/fs/littlefs/src/test_lfs_basic.c
+++ b/tests/subsys/fs/littlefs/src/test_lfs_basic.c
@@ -17,7 +17,7 @@
  */
 
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "testfs_tests.h"
 #include "testfs_lfs.h"
 #include <lfs.h>
diff --git a/tests/subsys/fs/littlefs/src/test_lfs_dirops.c b/tests/subsys/fs/littlefs/src/test_lfs_dirops.c
index 91a3e704ed9..5b564ddebb8 100644
--- a/tests/subsys/fs/littlefs/src/test_lfs_dirops.c
+++ b/tests/subsys/fs/littlefs/src/test_lfs_dirops.c
@@ -13,7 +13,7 @@
  */
 
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "testfs_tests.h"
 #include "testfs_lfs.h"
 #include <lfs.h>
diff --git a/tests/subsys/fs/littlefs/src/test_lfs_perf.c b/tests/subsys/fs/littlefs/src/test_lfs_perf.c
index c60904c308c..7d2c2a73557 100644
--- a/tests/subsys/fs/littlefs/src/test_lfs_perf.c
+++ b/tests/subsys/fs/littlefs/src/test_lfs_perf.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <zephyr/kernel.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "testfs_tests.h"
 #include "testfs_lfs.h"
 #include <lfs.h>
diff --git a/tests/subsys/fs/littlefs/src/test_util.c b/tests/subsys/fs/littlefs/src/test_util.c
index facc4fb023d..b5162ded49e 100644
--- a/tests/subsys/fs/littlefs/src/test_util.c
+++ b/tests/subsys/fs/littlefs/src/test_util.c
@@ -7,7 +7,7 @@
 /* Tests of functions in testfs_util */
 
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "testfs_tests.h"
 #include "testfs_util.h"
 
diff --git a/tests/subsys/fs/littlefs/src/testfs_lfs.c b/tests/subsys/fs/littlefs/src/testfs_lfs.c
index 8f8afb77a75..ae4e766ad92 100644
--- a/tests/subsys/fs/littlefs/src/testfs_lfs.c
+++ b/tests/subsys/fs/littlefs/src/testfs_lfs.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/fs/littlefs.h>
 #include <zephyr/storage/flash_map.h>
 #include "testfs_lfs.h"
diff --git a/tests/subsys/fs/littlefs/src/testfs_mount_flags.c b/tests/subsys/fs/littlefs/src/testfs_mount_flags.c
index db57266de2e..1ed2a042341 100644
--- a/tests/subsys/fs/littlefs/src/testfs_mount_flags.c
+++ b/tests/subsys/fs/littlefs/src/testfs_mount_flags.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/fs/littlefs.h>
 #include "testfs_tests.h"
 #include "testfs_lfs.h"
diff --git a/tests/subsys/fs/littlefs/src/testfs_open_flags.c b/tests/subsys/fs/littlefs/src/testfs_open_flags.c
index 57789089e0d..c246b59261b 100644
--- a/tests/subsys/fs/littlefs/src/testfs_open_flags.c
+++ b/tests/subsys/fs/littlefs/src/testfs_open_flags.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/fs/littlefs.h>
 #include "testfs_tests.h"
 #include "testfs_lfs.h"
diff --git a/tests/subsys/fs/littlefs/src/testfs_util.c b/tests/subsys/fs/littlefs/src/testfs_util.c
index 56ed96ecf4f..e95a392d5eb 100644
--- a/tests/subsys/fs/littlefs/src/testfs_util.c
+++ b/tests/subsys/fs/littlefs/src/testfs_util.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <errno.h>
 #include <zephyr/sys/__assert.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "testfs_util.h"
 
 static const char *path_vextend(struct testfs_path *pp,
diff --git a/tests/subsys/fs/multi-fs/src/main.c b/tests/subsys/fs/multi-fs/src/main.c
index 2d79fd9ffc7..93a94859261 100644
--- a/tests/subsys/fs/multi-fs/src/main.c
+++ b/tests/subsys/fs/multi-fs/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "test_common.h"
 #include "test_fat.h"
 #include "test_littlefs.h"
diff --git a/tests/subsys/fs/multi-fs/src/test_common.h b/tests/subsys/fs/multi-fs/src/test_common.h
index 93fa818d5d6..d7b29bbdccb 100644
--- a/tests/subsys/fs/multi-fs/src/test_common.h
+++ b/tests/subsys/fs/multi-fs/src/test_common.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/fs/fs.h>
 #include <limits.h>
 
diff --git a/tests/subsys/fs/multi-fs/src/test_common_dir.c b/tests/subsys/fs/multi-fs/src/test_common_dir.c
index 9eed54e1d87..5a18883d61e 100644
--- a/tests/subsys/fs/multi-fs/src/test_common_dir.c
+++ b/tests/subsys/fs/multi-fs/src/test_common_dir.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdio.h>
 #include <limits.h>
 #include <zephyr/sys/__assert.h>
diff --git a/tests/subsys/fs/multi-fs/src/test_common_file.c b/tests/subsys/fs/multi-fs/src/test_common_file.c
index 930d0cf0025..56e74ab3295 100644
--- a/tests/subsys/fs/multi-fs/src/test_common_file.c
+++ b/tests/subsys/fs/multi-fs/src/test_common_file.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <string.h>
 #include <zephyr/fs/fs.h>
 #include "test_common.h"
diff --git a/tests/subsys/fs/multi-fs/src/test_fs_shell.c b/tests/subsys/fs/multi-fs/src/test_fs_shell.c
index e2b7c832e28..653da72695f 100644
--- a/tests/subsys/fs/multi-fs/src/test_fs_shell.c
+++ b/tests/subsys/fs/multi-fs/src/test_fs_shell.c
@@ -10,7 +10,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "test_fs_shell.h"
 #include <zephyr/shell/shell.h>
diff --git a/tests/subsys/fs/multi-fs/src/test_littlefs_mount.c b/tests/subsys/fs/multi-fs/src/test_littlefs_mount.c
index b694d2a0fea..e95f0d9411a 100644
--- a/tests/subsys/fs/multi-fs/src/test_littlefs_mount.c
+++ b/tests/subsys/fs/multi-fs/src/test_littlefs_mount.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <zephyr/device.h>
 #include <zephyr/fs/fs.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/fs/littlefs.h>
 #include "test_fs_shell.h"
 
diff --git a/tests/subsys/fs/multi-fs/src/test_ram_backend.c b/tests/subsys/fs/multi-fs/src/test_ram_backend.c
index 07560abd9c9..e3e986688a4 100644
--- a/tests/subsys/fs/multi-fs/src/test_ram_backend.c
+++ b/tests/subsys/fs/multi-fs/src/test_ram_backend.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/flash.h>
 #include <zephyr/storage/flash_map.h>
 #include <zephyr/types.h>
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
 
 static uint8_t rambuf[FLASH_AREA_SIZE(storage)];
 
diff --git a/tests/subsys/fs/multi-fs/src/test_utils.c b/tests/subsys/fs/multi-fs/src/test_utils.c
index 7194d7a8c35..13ca11ec23b 100644
--- a/tests/subsys/fs/multi-fs/src/test_utils.c
+++ b/tests/subsys/fs/multi-fs/src/test_utils.c
@@ -7,7 +7,7 @@
 #include <limits.h>
 #include <zephyr/device.h>
 #include <zephyr/fs/fs.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/storage/flash_map.h>
 
 int check_file_dir_exists(const char *fpath)
diff --git a/tests/subsys/fs/nvs/src/main.c b/tests/subsys/fs/nvs/src/main.c
index e1ddbfa7dc1..d95f2ca7ba1 100644
--- a/tests/subsys/fs/nvs/src/main.c
+++ b/tests/subsys/fs/nvs/src/main.c
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/drivers/flash.h>
 #include <zephyr/storage/flash_map.h>
diff --git a/tests/subsys/ipc/ipc_service/src/main.c b/tests/subsys/ipc/ipc_service/src/main.c
index a017c3643d1..a831b0e0500 100644
--- a/tests/subsys/ipc/ipc_service/src/main.c
+++ b/tests/subsys/ipc/ipc_service/src/main.c
@@ -4,7 +4,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/ipc/ipc_service.h>
 
 static void received_cb(const void *data, size_t len, void *priv)
diff --git a/tests/subsys/jwt/src/main.c b/tests/subsys/jwt/src/main.c
index 7da476c2050..e192b136110 100644
--- a/tests/subsys/jwt/src/main.c
+++ b/tests/subsys/jwt/src/main.c
@@ -19,7 +19,7 @@
 
 #include <zephyr/types.h>
 #include <stdbool.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/data/json.h>
 #include <zephyr/data/jwt.h>
 
diff --git a/tests/subsys/logging/log_api/src/main.c b/tests/subsys/logging/log_api/src/main.c
index 96f716c9eb3..13d3e702ba5 100644
--- a/tests/subsys/logging/log_api/src/main.c
+++ b/tests/subsys/logging/log_api/src/main.c
@@ -7,7 +7,7 @@
 #include "mock_backend.h"
 #include "mock_frontend.h"
 #include "test_module.h"
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/sys/cbprintf.h>
diff --git a/tests/subsys/logging/log_api/src/mock_backend.c b/tests/subsys/logging/log_api/src/mock_backend.c
index 95799daab8d..0a08336aafb 100644
--- a/tests/subsys/logging/log_api/src/mock_backend.c
+++ b/tests/subsys/logging/log_api/src/mock_backend.c
@@ -5,7 +5,7 @@
  */
 
 #include "mock_backend.h"
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/logging/log_core.h>
 
 void mock_log_backend_reset(const struct log_backend *backend)
diff --git a/tests/subsys/logging/log_api/src/mock_frontend.c b/tests/subsys/logging/log_api/src/mock_frontend.c
index 5e760b63396..aae6778bdb0 100644
--- a/tests/subsys/logging/log_api/src/mock_frontend.c
+++ b/tests/subsys/logging/log_api/src/mock_frontend.c
@@ -5,7 +5,7 @@
  */
 
 #include "mock_backend.h"
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/logging/log_ctrl.h>
 
 struct mock_log_frontend {
diff --git a/tests/subsys/logging/log_backend_fs/src/log_fs_test.c b/tests/subsys/logging/log_backend_fs/src/log_fs_test.c
index 2d01483242e..dccc6cb5dde 100644
--- a/tests/subsys/logging/log_backend_fs/src/log_fs_test.c
+++ b/tests/subsys/logging/log_backend_fs/src/log_fs_test.c
@@ -13,7 +13,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/fs/fs.h>
 
 #define DT_DRV_COMPAT zephyr_fstab_littlefs
diff --git a/tests/subsys/logging/log_backend_init/src/main.c b/tests/subsys/logging/log_backend_init/src/main.c
index 2e96dd87b1a..fd45f87bd96 100644
--- a/tests/subsys/logging/log_backend_init/src/main.c
+++ b/tests/subsys/logging/log_backend_init/src/main.c
@@ -5,10 +5,10 @@
  */
 
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <stdbool.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/logging/log_backend.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>
diff --git a/tests/subsys/logging/log_benchmark/src/main.c b/tests/subsys/logging/log_benchmark/src/main.c
index 7f114d871e1..2e8c006d433 100644
--- a/tests/subsys/logging/log_benchmark/src/main.c
+++ b/tests/subsys/logging/log_benchmark/src/main.c
@@ -11,10 +11,10 @@
  */
 
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <stdbool.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/logging/log_backend.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>
diff --git a/tests/subsys/logging/log_core_additional/src/log_test.c b/tests/subsys/logging/log_core_additional/src/log_test.c
index 033ece46f2a..bcbf5a8bea9 100644
--- a/tests/subsys/logging/log_core_additional/src/log_test.c
+++ b/tests/subsys/logging/log_core_additional/src/log_test.c
@@ -10,10 +10,10 @@
  *
  */
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <stdbool.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/logging/log_backend.h>
 #include <zephyr/logging/log_backend_std.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/tests/subsys/logging/log_core_additional/src/log_test_user.c b/tests/subsys/logging/log_core_additional/src/log_test_user.c
index 098737e2cfc..1455e8d424d 100644
--- a/tests/subsys/logging/log_core_additional/src/log_test_user.c
+++ b/tests/subsys/logging/log_core_additional/src/log_test_user.c
@@ -10,10 +10,10 @@
  *
  */
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <stdbool.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/logging/log_backend.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>
diff --git a/tests/subsys/logging/log_immediate/src/log_immediate_test.c b/tests/subsys/logging/log_immediate/src/log_immediate_test.c
index 667b8c75f20..11ed46d961a 100644
--- a/tests/subsys/logging/log_immediate/src/log_immediate_test.c
+++ b/tests/subsys/logging/log_immediate/src/log_immediate_test.c
@@ -11,10 +11,10 @@
  */
 
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <stdbool.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/logging/log_backend.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>
diff --git a/tests/subsys/logging/log_msg/src/main.c b/tests/subsys/logging/log_msg/src/main.c
index f347ae9f15d..f3a07dfbdbe 100644
--- a/tests/subsys/logging/log_msg/src/main.c
+++ b/tests/subsys/logging/log_msg/src/main.c
@@ -13,10 +13,10 @@
 #include <zephyr/logging/log_internal.h>
 #include <zephyr/logging/log_ctrl.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <stdbool.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/cbprintf.h>
 
 #if CONFIG_NO_OPTIMIZATIONS
diff --git a/tests/subsys/logging/log_output/src/log_output_test.c b/tests/subsys/logging/log_output/src/log_output_test.c
index db35dcc5c7d..0e7bbcef4e4 100644
--- a/tests/subsys/logging/log_output/src/log_output_test.c
+++ b/tests/subsys/logging/log_output/src/log_output_test.c
@@ -12,10 +12,10 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/logging/log_output.h>
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <stdbool.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define LOG_MODULE_NAME test
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
diff --git a/tests/subsys/logging/log_stack/src/main.c b/tests/subsys/logging/log_stack/src/main.c
index c68e8066779..6f9a5bb751e 100644
--- a/tests/subsys/logging/log_stack/src/main.c
+++ b/tests/subsys/logging/log_stack/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/logging/log.h>
 
 /* The idea of this test is to estimate stack usage of logging messages. Each
diff --git a/tests/subsys/logging/log_stress/src/main.c b/tests/subsys/logging/log_stress/src/main.c
index 30bec187164..d87152482f3 100644
--- a/tests/subsys/logging/log_stress/src/main.c
+++ b/tests/subsys/logging/log_stress/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/util.h>
 #include <string.h>
-#include <ztress.h>
+#include <zephyr/ztress.h>
 #include <zephyr/random/rand32.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/tests/subsys/logging/log_switch_format/src/main.c b/tests/subsys/logging/log_switch_format/src/main.c
index b971f89fadb..e2d6cd66471 100644
--- a/tests/subsys/logging/log_switch_format/src/main.c
+++ b/tests/subsys/logging/log_switch_format/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log_output.h>
 #include <zephyr/logging/log_output_dict.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define LOG_MODULE_NAME log_switch_format
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_ERR);
diff --git a/tests/subsys/logging/log_switch_format/src/mock_backend.c b/tests/subsys/logging/log_switch_format/src/mock_backend.c
index f827b1c02e4..cdf5788dd6c 100644
--- a/tests/subsys/logging/log_switch_format/src/mock_backend.c
+++ b/tests/subsys/logging/log_switch_format/src/mock_backend.c
@@ -5,7 +5,7 @@
  */
 
 #include "mock_backend.h"
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/logging/log_core.h>
 #include <zephyr/logging/log_backend_std.h>
 #include <stdlib.h>
diff --git a/tests/subsys/logging/log_syst/src/main.c b/tests/subsys/logging/log_syst/src/main.c
index 3f87888e6a4..13d2a312448 100644
--- a/tests/subsys/logging/log_syst/src/main.c
+++ b/tests/subsys/logging/log_syst/src/main.c
@@ -17,9 +17,9 @@
 #include <zephyr/logging/log_backend_std.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log_output.h>
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <stdbool.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdlib.h>
 
 /** Hex string corresponding to "Debug message example, %d, %d, %d", 1, 2, 3.
diff --git a/tests/subsys/logging/log_syst/src/mock_backend.c b/tests/subsys/logging/log_syst/src/mock_backend.c
index 69bfa835766..3c9054b4b93 100644
--- a/tests/subsys/logging/log_syst/src/mock_backend.c
+++ b/tests/subsys/logging/log_syst/src/mock_backend.c
@@ -5,7 +5,7 @@
  */
 
 #include "mock_backend.h"
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/logging/log_core.h>
 #include <zephyr/logging/log_backend_std.h>
 #include <stdlib.h>
diff --git a/tests/subsys/mgmt/ec_host_cmd/src/main.c b/tests/subsys/mgmt/ec_host_cmd/src/main.c
index f5c35f386e6..30d12b79f41 100644
--- a/tests/subsys/mgmt/ec_host_cmd/src/main.c
+++ b/tests/subsys/mgmt/ec_host_cmd/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/drivers/ec_host_cmd_periph/ec_host_cmd_simulator.h>
 #include <zephyr/mgmt/ec_host_cmd.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* Variables used to record what is "sent" to host for verification. */
 K_SEM_DEFINE(send_called, 0, 1);
diff --git a/tests/subsys/mgmt/smp_reassembly/src/main.c b/tests/subsys/mgmt/smp_reassembly/src/main.c
index 6e8bed3eaed..2997ed5b592 100644
--- a/tests/subsys/mgmt/smp_reassembly/src/main.c
+++ b/tests/subsys/mgmt/smp_reassembly/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/net/buf.h>
 #include <zephyr/mgmt/mcumgr/smp.h>
diff --git a/tests/subsys/mgmt/zcbor_bulk/src/main.c b/tests/subsys/mgmt/zcbor_bulk/src/main.c
index 000233f48a7..1029c3e16a4 100644
--- a/tests/subsys/mgmt/zcbor_bulk/src/main.c
+++ b/tests/subsys/mgmt/zcbor_bulk/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/byteorder.h>
 #include <zcbor_common.h>
 #include <zcbor_decode.h>
diff --git a/tests/subsys/modbus/src/test_modbus.h b/tests/subsys/modbus/src/test_modbus.h
index 5303a04c4b0..0f38d7d908d 100644
--- a/tests/subsys/modbus/src/test_modbus.h
+++ b/tests/subsys/modbus/src/test_modbus.h
@@ -8,7 +8,7 @@
 #define __TEST_MODBUS_H__
 
 #include <zephyr/drivers/uart.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/modbus/modbus.h>
 
 #define MB_TEST_BAUDRATE_LOW	9600
diff --git a/tests/subsys/openthread/radio_test.c b/tests/subsys/openthread/radio_test.c
index 9febc78a593..3d01edab6b4 100644
--- a/tests/subsys/openthread/radio_test.c
+++ b/tests/subsys/openthread/radio_test.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/zephyr.h>
 #include <errno.h>
diff --git a/tests/subsys/pm/device_power_domains/src/main.c b/tests/subsys/pm/device_power_domains/src/main.c
index 5f210124c75..94a3cc7d6f7 100644
--- a/tests/subsys/pm/device_power_domains/src/main.c
+++ b/tests/subsys/pm/device_power_domains/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/device_runtime.h>
 
diff --git a/tests/subsys/pm/device_runtime_api/src/main.c b/tests/subsys/pm/device_runtime_api/src/main.c
index 64287c00d67..16ee3f32ce8 100644
--- a/tests/subsys/pm/device_runtime_api/src/main.c
+++ b/tests/subsys/pm/device_runtime_api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/device_runtime.h>
 
diff --git a/tests/subsys/pm/device_wakeup_api/src/main.c b/tests/subsys/pm/device_wakeup_api/src/main.c
index 60ef9ae6ea1..31009c5d22a 100644
--- a/tests/subsys/pm/device_wakeup_api/src/main.c
+++ b/tests/subsys/pm/device_wakeup_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/pm/pm.h>
 #include <zephyr/pm/device.h>
 
diff --git a/tests/subsys/pm/policy_api/src/main.c b/tests/subsys/pm/policy_api/src/main.c
index 3956fb6f47f..a41fd500ae8 100644
--- a/tests/subsys/pm/policy_api/src/main.c
+++ b/tests/subsys/pm/policy_api/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/pm/policy.h>
 #include <zephyr/sys/time_units.h>
 #include <zephyr/sys_clock.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #ifdef CONFIG_PM_POLICY_DEFAULT
 /**
diff --git a/tests/subsys/pm/power_domain/src/main.c b/tests/subsys/pm/power_domain/src/main.c
index e4989126110..f4c952d980e 100644
--- a/tests/subsys/pm/power_domain/src/main.c
+++ b/tests/subsys/pm/power_domain/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/device_runtime.h>
 
diff --git a/tests/subsys/pm/power_mgmt/src/main.c b/tests/subsys/pm/power_mgmt/src/main.c
index e348f946664..a4bb1af4ce5 100644
--- a/tests/subsys/pm/power_mgmt/src/main.c
+++ b/tests/subsys/pm/power_mgmt/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/types.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/device_runtime.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <ksched.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
diff --git a/tests/subsys/pm/power_mgmt_multicore/src/main.c b/tests/subsys/pm/power_mgmt_multicore/src/main.c
index 14d1a4cf710..10f55e87ae5 100644
--- a/tests/subsys/pm/power_mgmt_multicore/src/main.c
+++ b/tests/subsys/pm/power_mgmt_multicore/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/kernel.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/pm/pm.h>
 
 BUILD_ASSERT(CONFIG_MP_NUM_CPUS == 2, "Invalid number of cpus");
diff --git a/tests/subsys/pm/power_mgmt_soc/src/main.c b/tests/subsys/pm/power_mgmt_soc/src/main.c
index b03dd07494b..0b3fc5be847 100644
--- a/tests/subsys/pm/power_mgmt_soc/src/main.c
+++ b/tests/subsys/pm/power_mgmt_soc/src/main.c
@@ -7,8 +7,8 @@
 #define LOG_LEVEL LOG_LEVEL_INF
 #include <zephyr/logging/log.h>
 #include <zephyr/zephyr.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 LOG_MODULE_DECLARE(brd_pm_test);
 #include "power_mgmt.h"
 
diff --git a/tests/subsys/pm/power_mgmt_soc/src/power_mgmt.c b/tests/subsys/pm/power_mgmt_soc/src/power_mgmt.c
index 71f32f0d886..c301b76c0a3 100644
--- a/tests/subsys/pm/power_mgmt_soc/src/power_mgmt.c
+++ b/tests/subsys/pm/power_mgmt_soc/src/power_mgmt.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/kernel.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/pm/pm.h>
 #include <zephyr/logging/log.h>
 #define LOG_LEVEL LOG_LEVEL_DBG
diff --git a/tests/subsys/pm/power_states_api/src/main.c b/tests/subsys/pm/power_states_api/src/main.c
index 0398d9260bd..fe41b0bfa69 100644
--- a/tests/subsys/pm/power_states_api/src/main.c
+++ b/tests/subsys/pm/power_states_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/pm/pm.h>
 
 /* Last state has not declared a minimum residency, so it should be
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/kernel_apis.c b/tests/subsys/portability/cmsis_rtos_v1/src/kernel_apis.c
index e86d63ef2af..c109217ee0e 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/kernel_apis.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/kernel_apis.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/mailq.c b/tests/subsys/portability/cmsis_rtos_v1/src/mailq.c
index a3452d3f685..c9af92e59e8 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/mailq.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/mailq.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/main.c b/tests/subsys/portability/cmsis_rtos_v1/src/main.c
index 4ba2cc4fb0b..80a3c07d24d 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/main.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/mempool.c b/tests/subsys/portability/cmsis_rtos_v1/src/mempool.c
index 493f08595bc..825a7a76e41 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/mempool.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/mempool.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/msgq.c b/tests/subsys/portability/cmsis_rtos_v1/src/msgq.c
index 522467d60de..68c94d41950 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/msgq.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/msgq.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/mutex.c b/tests/subsys/portability/cmsis_rtos_v1/src/mutex.c
index 7ba3e5e5ebe..3f53b81105b 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/mutex.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/mutex.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/semaphore.c b/tests/subsys/portability/cmsis_rtos_v1/src/semaphore.c
index d07f8b09019..7dc7dfda030 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/semaphore.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/semaphore.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/signal.c b/tests/subsys/portability/cmsis_rtos_v1/src/signal.c
index 849c82781c6..ea31b7b9a2c 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/signal.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/signal.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/thread_apis.c b/tests/subsys/portability/cmsis_rtos_v1/src/thread_apis.c
index 6485533f5ed..b7e90a51337 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/thread_apis.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/thread_apis.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/thread_instance.c b/tests/subsys/portability/cmsis_rtos_v1/src/thread_instance.c
index fa0b9982a6e..cdbe3b17796 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/thread_instance.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/thread_instance.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/timer.c b/tests/subsys/portability/cmsis_rtos_v1/src/timer.c
index 042392a1d69..a7f6bf23efa 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/timer.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/timer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <cmsis_os.h>
 
 #define ONESHOT_TIME	1000
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/event_flags.c b/tests/subsys/portability/cmsis_rtos_v2/src/event_flags.c
index 98e7e90f6e1..bc1277f1bcc 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/event_flags.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/event_flags.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/kernel.c b/tests/subsys/portability/cmsis_rtos_v2/src/kernel.c
index 9efd6f6e41e..670810f99aa 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/kernel.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/kernel.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <cmsis_os2.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/kernel.h>
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/main.c b/tests/subsys/portability/cmsis_rtos_v2/src/main.c
index a646d266046..9856cc70417 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/main.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/mempool.c b/tests/subsys/portability/cmsis_rtos_v2/src/mempool.c
index acbeec09572..14445879978 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/mempool.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/mempool.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/msgq.c b/tests/subsys/portability/cmsis_rtos_v2/src/msgq.c
index f8d86acc19f..97759db9728 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/msgq.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/msgq.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/mutex.c b/tests/subsys/portability/cmsis_rtos_v2/src/mutex.c
index 9060f664c89..fdbdf7ebe54 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/mutex.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/mutex.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/semaphore.c b/tests/subsys/portability/cmsis_rtos_v2/src/semaphore.c
index c5fdf7f7d6a..76973f26867 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/semaphore.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/semaphore.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/thread_apis.c b/tests/subsys/portability/cmsis_rtos_v2/src/thread_apis.c
index c638fed22f5..b0174ce0c87 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/thread_apis.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/thread_apis.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/thread_flags.c b/tests/subsys/portability/cmsis_rtos_v2/src/thread_flags.c
index 700027f1624..61e1ad065b8 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/thread_flags.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/thread_flags.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/timer.c b/tests/subsys/portability/cmsis_rtos_v2/src/timer.c
index 90395627caa..dbc7137b3ce 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/timer.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/timer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <cmsis_os2.h>
 
 #define ONESHOT_TIME_TICKS      100
diff --git a/tests/subsys/rtio/rtio_api/src/main.c b/tests/subsys/rtio/rtio_api/src/main.c
index e4a338bb2b9..010a4114112 100644
--- a/tests/subsys/rtio/rtio_api/src/main.c
+++ b/tests/subsys/rtio/rtio_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/rtio/rtio_spsc.h>
diff --git a/tests/subsys/sd/sdmmc/src/main.c b/tests/subsys/sd/sdmmc/src/main.c
index b245ce527ef..0814d14ff6f 100644
--- a/tests/subsys/sd/sdmmc/src/main.c
+++ b/tests/subsys/sd/sdmmc/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/sd/sdmmc.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/disk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 
 #define SECTOR_COUNT 32
diff --git a/tests/subsys/settings/fcb/src/settings_test.h b/tests/subsys/settings/fcb/src/settings_test.h
index 5a7af91c9ac..0241cc8ee46 100644
--- a/tests/subsys/settings/fcb/src/settings_test.h
+++ b/tests/subsys/settings/fcb/src/settings_test.h
@@ -10,7 +10,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/settings/settings.h>
 #include <zephyr/storage/flash_map.h>
diff --git a/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c b/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c
index 627abdd7c6b..29228a3ffdb 100644
--- a/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c
+++ b/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/reboot.h>
diff --git a/tests/subsys/settings/fs/include/settings_test_fs.h b/tests/subsys/settings/fs/include/settings_test_fs.h
index 0d11b40659b..12167436d89 100644
--- a/tests/subsys/settings/fs/include/settings_test_fs.h
+++ b/tests/subsys/settings/fs/include/settings_test_fs.h
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/fs/fs.h>
 
 #include <zephyr/settings/settings.h>
diff --git a/tests/subsys/settings/functional/src/settings_basic_test.c b/tests/subsys/settings/functional/src/settings_basic_test.c
index d5e674968ed..76459163e44 100644
--- a/tests/subsys/settings/functional/src/settings_basic_test.c
+++ b/tests/subsys/settings/functional/src/settings_basic_test.c
@@ -10,7 +10,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <errno.h>
 #include <zephyr/settings/settings.h>
 #include <zephyr/logging/log.h>
diff --git a/tests/subsys/settings/nvs/src/settings_test.h b/tests/subsys/settings/nvs/src/settings_test.h
index cf8301b4440..1a23ccbeffa 100644
--- a/tests/subsys/settings/nvs/src/settings_test.h
+++ b/tests/subsys/settings/nvs/src/settings_test.h
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/settings/settings.h>
 
diff --git a/tests/subsys/shell/shell/src/main.c b/tests/subsys/shell/shell/src/main.c
index 9dce1fd39e3..5c30f2cf32e 100644
--- a/tests/subsys/shell/shell/src/main.c
+++ b/tests/subsys/shell/shell/src/main.c
@@ -10,7 +10,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/shell/shell.h>
 #include <zephyr/shell/shell_dummy.h>
diff --git a/tests/subsys/shell/shell_flash/src/shell_flash_test.c b/tests/subsys/shell/shell_flash/src/shell_flash_test.c
index 9ad77521301..55e4bed88e1 100644
--- a/tests/subsys/shell/shell_flash/src/shell_flash_test.c
+++ b/tests/subsys/shell/shell_flash/src/shell_flash_test.c
@@ -10,7 +10,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/device.h>
 
 #include <zephyr/drivers/flash.h>
diff --git a/tests/subsys/shell/shell_history/src/shell_history_test.c b/tests/subsys/shell/shell_history/src/shell_history_test.c
index 8fc636f76e4..2bf6254dcc2 100644
--- a/tests/subsys/shell/shell_history/src/shell_history_test.c
+++ b/tests/subsys/shell/shell_history/src/shell_history_test.c
@@ -10,7 +10,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/shell/shell_history.h>
 
diff --git a/tests/subsys/storage/flash_map/src/main.c b/tests/subsys/storage/flash_map/src/main.c
index 3660117054b..5c10ea1fcae 100644
--- a/tests/subsys/storage/flash_map/src/main.c
+++ b/tests/subsys/storage/flash_map/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/storage/flash_map.h>
 
diff --git a/tests/subsys/storage/stream/stream_flash/src/main.c b/tests/subsys/storage/stream/stream_flash/src/main.c
index 59f8d50f13c..968b3eaded9 100644
--- a/tests/subsys/storage/stream/stream_flash/src/main.c
+++ b/tests/subsys/storage/stream/stream_flash/src/main.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <zephyr/types.h>
 #include <stdbool.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/settings/settings.h>
 
diff --git a/tests/subsys/tracing/tracing_api/src/main.c b/tests/subsys/tracing/tracing_api/src/main.c
index 0b74aca650b..0a3ac6ae6fb 100644
--- a/tests/subsys/tracing/tracing_api/src/main.c
+++ b/tests/subsys/tracing/tracing_api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <zephyr/logging/log.h>
 #include <tracing_buffer.h>
diff --git a/tests/subsys/usb/bos/src/test_bos.c b/tests/subsys/usb/bos/src/test_bos.c
index 38cee0eedbe..1bd4d9f46cb 100644
--- a/tests/subsys/usb/bos/src/test_bos.c
+++ b/tests/subsys/usb/bos/src/test_bos.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/usb/usb_device.h>
diff --git a/tests/subsys/usb/desc_sections/src/desc_sections.c b/tests/subsys/usb/desc_sections/src/desc_sections.c
index 98b50463339..e0efa4e1152 100644
--- a/tests/subsys/usb/desc_sections/src/desc_sections.c
+++ b/tests/subsys/usb/desc_sections/src/desc_sections.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/usb/usb_device.h>
diff --git a/tests/subsys/usb/device/src/main.c b/tests/subsys/usb/device/src/main.c
index 2075cf2bc5c..220fe1f7406 100644
--- a/tests/subsys/usb/device/src/main.c
+++ b/tests/subsys/usb/device/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/usb/usb_device.h>
diff --git a/tests/subsys/usb/os_desc/src/usb_osdesc.c b/tests/subsys/usb/os_desc/src/usb_osdesc.c
index c405ff4f373..4764fdf69ba 100644
--- a/tests/subsys/usb/os_desc/src/usb_osdesc.c
+++ b/tests/subsys/usb/os_desc/src/usb_osdesc.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/usb/usb_device.h>
diff --git a/tests/unit/cbprintf/main.c b/tests/unit/cbprintf/main.c
index 6cf9d5aad5a..3771278259d 100644
--- a/tests/unit/cbprintf/main.c
+++ b/tests/unit/cbprintf/main.c
@@ -6,7 +6,7 @@
 
 #define CONFIG_CBPRINTF_LIBC_SUBSTS 1
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>
diff --git a/tests/unit/crc/main.c b/tests/unit/crc/main.c
index f05701b0e4b..04a83a8ee4c 100644
--- a/tests/unit/crc/main.c
+++ b/tests/unit/crc/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/crc.h>
 #include "../../../lib/os/crc8_sw.c"
 #include "../../../lib/os/crc16_sw.c"
diff --git a/tests/unit/intmath/main.c b/tests/unit/intmath/main.c
index 2dbe65c7ecb..f152b95a5b4 100644
--- a/tests/unit/intmath/main.c
+++ b/tests/unit/intmath/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* Built-time math test.  Zephyr code depends on a standard C ABI with
  * 2's complement signed math.  As this isn't technically guaranteed
diff --git a/tests/unit/list/dlist.c b/tests/unit/list/dlist.c
index 1184a775981..92a40273ffb 100644
--- a/tests/unit/list/dlist.c
+++ b/tests/unit/list/dlist.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/dlist.h>
 
 static sys_dlist_t test_list;
diff --git a/tests/unit/list/main.c b/tests/unit/list/main.c
index 8bc260ebe98..a9642dd9b87 100644
--- a/tests/unit/list/main.c
+++ b/tests/unit/list/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 extern void test_slist(void);
 extern void test_sflist(void);
diff --git a/tests/unit/list/sflist.c b/tests/unit/list/sflist.c
index 4b036ae8737..6ee1c83f54b 100644
--- a/tests/unit/list/sflist.c
+++ b/tests/unit/list/sflist.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/sflist.h>
 
 static sys_sflist_t test_list;
diff --git a/tests/unit/list/slist.c b/tests/unit/list/slist.c
index 150b25b79c9..0f9bb2c00dc 100644
--- a/tests/unit/list/slist.c
+++ b/tests/unit/list/slist.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/slist.h>
 
 static sys_slist_t test_list;
diff --git a/tests/unit/math_extras/tests.inc b/tests/unit/math_extras/tests.inc
index 742165b6704..cf807ce8f3b 100644
--- a/tests/unit/math_extras/tests.inc
+++ b/tests/unit/math_extras/tests.inc
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/math_extras.h>
 #include <inttypes.h>
 
diff --git a/tests/unit/net_timeout/main.c b/tests/unit/net_timeout/main.c
index 56703f97c55..ba865fe05f3 100644
--- a/tests/unit/net_timeout/main.c
+++ b/tests/unit/net_timeout/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <string.h>
 #include <inttypes.h>
 #include <zephyr/net/net_timeout.h>
diff --git a/tests/unit/rbtree/main.c b/tests/unit/rbtree/main.c
index a20c34a6f3f..ecdba9b3aa0 100644
--- a/tests/unit/rbtree/main.c
+++ b/tests/unit/rbtree/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/rb.h>
 
 #include "../../../lib/os/rb.c"
diff --git a/tests/unit/timeutil/main.c b/tests/unit/timeutil/main.c
index 95b4944c250..d6e6573d77c 100644
--- a/tests/unit/timeutil/main.c
+++ b/tests/unit/timeutil/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "timeutil_test.h"
 #include "../../../lib/os/timeutil.c"
 
diff --git a/tests/unit/timeutil/test_gmtime.c b/tests/unit/timeutil/test_gmtime.c
index 21608517684..5daa1aa2206 100644
--- a/tests/unit/timeutil/test_gmtime.c
+++ b/tests/unit/timeutil/test_gmtime.c
@@ -7,7 +7,7 @@
 /* Tests that gmtime matches gmtime_r */
 
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "timeutil_test.h"
 
 void test_gmtime(void)
diff --git a/tests/unit/timeutil/test_s32.c b/tests/unit/timeutil/test_s32.c
index 6333892bbde..b28fb28eba5 100644
--- a/tests/unit/timeutil/test_s32.c
+++ b/tests/unit/timeutil/test_s32.c
@@ -6,7 +6,7 @@
 
 /* Tests where time_t is a 32-bit value */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "timeutil_test.h"
 
 static const struct timeutil_test_data tests[] = {
diff --git a/tests/unit/timeutil/test_s64.c b/tests/unit/timeutil/test_s64.c
index 4dce98545a6..94c339b015e 100644
--- a/tests/unit/timeutil/test_s64.c
+++ b/tests/unit/timeutil/test_s64.c
@@ -7,7 +7,7 @@
 /* Tests where time_t requires a 64-bit value */
 
 #include <errno.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "timeutil_test.h"
 
 static const struct timeutil_test_data tests[] = {
diff --git a/tests/unit/timeutil/test_sync.c b/tests/unit/timeutil/test_sync.c
index 9ff2619f13c..bf43d9c4ede 100644
--- a/tests/unit/timeutil/test_sync.c
+++ b/tests/unit/timeutil/test_sync.c
@@ -7,7 +7,7 @@
 /* Tests for the time_sync data structures */
 
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "timeutil_test.h"
 
 static const struct timeutil_sync_config cfg1 = {
diff --git a/tests/unit/util/main.c b/tests/unit/util/main.c
index 3c09e97feca..5cd3060a0d0 100644
--- a/tests/unit/util/main.c
+++ b/tests/unit/util/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/util.h>
 #include <string.h>
 
diff --git a/tests/unit/winstream/main.c b/tests/unit/winstream/main.c
index 35640383037..9d4af1bb375 100644
--- a/tests/unit/winstream/main.c
+++ b/tests/unit/winstream/main.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2021 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/winstream.h>
 
 /* This, uh, seems to be the standard way to unit test library code.
diff --git a/tests/ztest/base/src/main.cpp b/tests/ztest/base/src/main.cpp
index b332179e6f9..29c8a24689f 100644
--- a/tests/ztest/base/src/main.cpp
+++ b/tests/ztest/base/src/main.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 struct cpp_fixture {
 	int x;
diff --git a/tests/ztest/base/src/main_userspace.c b/tests/ztest/base/src/main_userspace.c
index ef443d97b2a..365d0460b9d 100644
--- a/tests/ztest/base/src/main_userspace.c
+++ b/tests/ztest/base/src/main_userspace.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/kernel.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_USER(framework_tests, test_userspace_is_user)
 {
diff --git a/tests/ztest/error_hook/README.txt b/tests/ztest/error_hook/README.txt
index de9292395b2..5ca44e9e330 100644
--- a/tests/ztest/error_hook/README.txt
+++ b/tests/ztest/error_hook/README.txt
@@ -41,7 +41,7 @@ Step4: Call ztest_set_fault_valid(true) before where your target function
 
 Step1: Add CONFIG_ZTEST_ASSERT_HOOK=y into prj.conf
 
-Step2: Include <ztest_error_hook.h> in your C code.
+Step2: Include <zephyr/ztest_error_hook.h> in your C code.
 
 Step3: (optional) Define a hook function call ztest_post_assert_fail_hook().
 
diff --git a/tests/ztest/error_hook/src/main.c b/tests/ztest/error_hook/src/main.c
index 376184d7764..b335e3cce45 100644
--- a/tests/ztest/error_hook/src/main.c
+++ b/tests/ztest/error_hook/src/main.c
@@ -7,8 +7,8 @@
 #include <zephyr/irq_offload.h>
 #include <zephyr/syscall_handler.h>
 
-#include <ztest.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest.h>
+#include <zephyr/ztest_error_hook.h>
 
 #define STACK_SIZE (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define THREAD_TEST_PRIORITY 5
diff --git a/tests/ztest/register/src/main.c b/tests/ztest/register/src/main.c
index 683a2a41d97..66f23fd02a7 100644
--- a/tests/ztest/register/src/main.c
+++ b/tests/ztest/register/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "common.h"
 
 #define num_registered_suites (_ztest_suite_node_list_end - _ztest_suite_node_list_start)
diff --git a/tests/ztest/register/src/test_null_predicate.c b/tests/ztest/register/src/test_null_predicate.c
index aadb0147cab..f3639ba8b14 100644
--- a/tests/ztest/register/src/test_null_predicate.c
+++ b/tests/ztest/register/src/test_null_predicate.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "common.h"
 
 static void test_stub(void)
diff --git a/tests/ztest/register/src/test_step_0.c b/tests/ztest/register/src/test_step_0.c
index 1ab31bc5612..56764445de6 100644
--- a/tests/ztest/register/src/test_step_0.c
+++ b/tests/ztest/register/src/test_step_0.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "common.h"
 
 static void test(void)
diff --git a/tests/ztest/register/src/test_step_1.c b/tests/ztest/register/src/test_step_1.c
index 4a3538f5e81..d0c0f0b26e7 100644
--- a/tests/ztest/register/src/test_step_1.c
+++ b/tests/ztest/register/src/test_step_1.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "common.h"
 
 static void test(void)
diff --git a/tests/ztest/register/src/test_step_all.c b/tests/ztest/register/src/test_step_all.c
index 0851ad35985..da3b6df933a 100644
--- a/tests/ztest/register/src/test_step_all.c
+++ b/tests/ztest/register/src/test_step_all.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "common.h"
 
 static void test(void)
diff --git a/tests/ztest/ztress/src/main.c b/tests/ztest/ztress/src/main.c
index 017715053fb..58320a8c0b8 100644
--- a/tests/ztest/ztress/src/main.c
+++ b/tests/ztest/ztress/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <ztress.h>
+#include <zephyr/ztest.h>
+#include <zephyr/ztress.h>
 
 volatile int ztress_dummy;