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 1cfdccffbba..70c40ca646e 100644
--- a/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c
+++ b/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
-#include <sys/reboot.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/zephyr.h>
+#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>
 
diff --git a/tests/arch/arm/arm_interrupt/src/arm_interrupt.c b/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
index 858ef94c914..0e387dde86c 100644
--- a/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
+++ b/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 static volatile int test_flag;
 static volatile int expected_reason = -1;
@@ -377,7 +377,7 @@ void test_arm_interrupt(void)
 }
 
 #if defined(CONFIG_USERSPACE)
-#include <syscall_handler.h>
+#include <zephyr/syscall_handler.h>
 #include "test_syscalls.h"
 
 void z_impl_test_arm_user_interrupt_syscall(void)
diff --git a/tests/arch/arm/arm_interrupt/src/test_syscalls.h b/tests/arch/arm/arm_interrupt/src/test_syscalls.h
index 9a2bdafdc8f..3de0d1b09e4 100644
--- a/tests/arch/arm/arm_interrupt/src/test_syscalls.h
+++ b/tests/arch/arm/arm_interrupt/src/test_syscalls.h
@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 __syscall void test_arm_user_interrupt_syscall(void);
 
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 0fa3c437b4f..cacfc92e86b 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
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 /* Offset for the Direct interrupt used in this test. */
 #define DIRECT_ISR_OFFSET (CONFIG_NUM_IRQS - 1)
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 6521eef0cb7..9468a6dc545 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
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 #if defined(CONFIG_ARM_SECURE_FIRMWARE) && \
 	defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
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 0bcc6694b32..2b3fc7936be 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
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 static volatile int test_flag;
 
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 ea03c25d4f1..4f314a48393 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
@@ -5,9 +5,9 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <linker/sections.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_mem_protect/src/main.c b/tests/arch/arm/arm_mem_protect/src/main.c
index 38395f8e52c..6b4e633a5ff 100644
--- a/tests/arch/arm/arm_mem_protect/src/main.c
+++ b/tests/arch/arm/arm_mem_protect/src/main.c
@@ -3,8 +3,8 @@
  * Copyright (c) 2021 Lexmark International, Inc.
  */
 
-#include <zephyr.h>
-#include <syscall_handler.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/syscall_handler.h>
 #include <ztest.h>
 
 ZTEST_BMEM char user_stack[256];
diff --git a/tests/arch/arm/arm_no_multithreading/src/main.c b/tests/arch/arm/arm_no_multithreading/src/main.c
index 198d7f8dae0..a827258bc0f 100644
--- a/tests/arch/arm/arm_no_multithreading/src/main.c
+++ b/tests/arch/arm/arm_no_multithreading/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys/printk.h>
-#include <sys/__assert.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 #if !defined(CONFIG_CPU_CORTEX_M)
   #error test can only run on Cortex-M MCUs
diff --git a/tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c b/tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c
index 74948fbf2e1..5130b33db86 100644
--- a/tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c
+++ b/tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <linker/linker-defs.h>
-#include <syscall_handler.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/syscall_handler.h>
 
 static volatile int test_flag;
 
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 feffb0f10d3..a7a1d59f0f9 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
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
-#include <sys/reboot.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/zephyr.h>
+#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>
 
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 3fee52d2640..3a9847a5293 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
@@ -5,11 +5,11 @@
  */
 
 #include <ztest.h>
-#include <linker/linker-defs.h>
-#include <syscall_handler.h>
-#include <toolchain.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/toolchain.h>
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 extern uint32_t _vector_table;
 extern uint32_t __vector_relay_handler;
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 20e046f7953..bb983c76938 100644
--- a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
+++ b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
@@ -5,9 +5,9 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <kernel_structs.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/kernel_structs.h>
 #include <offsets_short_arch.h>
 #include <ksched.h>
 
@@ -28,7 +28,7 @@
 static struct k_thread user_thread;
 static K_THREAD_STACK_DEFINE(user_thread_stack, 1024);
 
-#include <syscall_handler.h>
+#include <zephyr/syscall_handler.h>
 #include "test_syscalls.h"
 
 void z_impl_test_arm_user_syscall(void)
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 2dacbc025d4..a5cfc679e1a 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
@@ -5,9 +5,9 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <kernel_structs.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/kernel_structs.h>
 #include <offsets_short_arch.h>
 #include <ksched.h>
 
diff --git a/tests/arch/arm/arm_thread_swap/src/test_syscalls.h b/tests/arch/arm/arm_thread_swap/src/test_syscalls.h
index 60a21f9908a..f365f6896b4 100644
--- a/tests/arch/arm/arm_thread_swap/src/test_syscalls.h
+++ b/tests/arch/arm/arm_thread_swap/src/test_syscalls.h
@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 __syscall void test_arm_user_syscall(void);
 __syscall void test_arm_cpu_write_reg(void);
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 c84abb0e92a..5db588b9b9b 100644
--- a/tests/arch/arm/arm_thread_swap_tz/src/main.c
+++ b/tests/arch/arm/arm_thread_swap_tz/src/main.c
@@ -6,7 +6,7 @@
 
 #include <ztest.h>
 #include <psa/crypto.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #ifndef EXC_RETURN_S
 /* bit [6] stack used to push registers: 0=Non-secure 1=Secure */
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 766b2eb2a9b..30c519aa742 100644
--- a/tests/arch/arm/arm_tz_wrap_func/src/main.c
+++ b/tests/arch/arm/arm_tz_wrap_func/src/main.c
@@ -6,7 +6,7 @@
 
 #include <ztest.h>
 #include <aarch32/cortex_m/tz_ns.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 static bool expect_preface;
 static bool expect_postface;
diff --git a/tests/arch/arm64/arm64_gicv3_its/src/main.c b/tests/arch/arm64/arm64_gicv3_its/src/main.c
index af1791400ae..afaa45fea4b 100644
--- a/tests/arch/arm64/arm64_gicv3_its/src/main.c
+++ b/tests/arch/arm64/arm64_gicv3_its/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <device.h>
-#include <drivers/interrupt_controller/gicv3_its.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/interrupt_controller/gicv3_its.h>
 
 #define DT_DRV_COMPAT   arm_gic_v3_its
 
diff --git a/tests/arch/arm64/arm64_high_addresses/src/main.c b/tests/arch/arm64/arm64_high_addresses/src/main.c
index 1638cec6d9d..ccd0b58453b 100644
--- a/tests/arch/arm64/arm64_high_addresses/src/main.c
+++ b/tests/arch/arm64/arm64_high_addresses/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdio.h>
 #define USER_STACKSIZE	2048
 
diff --git a/tests/arch/arm64/arm64_psci/src/main.c b/tests/arch/arm64/arm64_psci/src/main.c
index 7c680227c2c..0d15ea97773 100644
--- a/tests/arch/arm64/arm64_psci/src/main.c
+++ b/tests/arch/arm64/arm64_psci/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <drivers/pm_cpu_ops/psci.h>
-#include <drivers/pm_cpu_ops.h>
+#include <zephyr/drivers/pm_cpu_ops/psci.h>
+#include <zephyr/drivers/pm_cpu_ops.h>
 
 void test_psci_func(void)
 {
diff --git a/tests/arch/common/semihost/src/main.c b/tests/arch/common/semihost/src/main.c
index 34e6f06ab7b..7885a389231 100644
--- a/tests/arch/common/semihost/src/main.c
+++ b/tests/arch/common/semihost/src/main.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <arch/common/semihost.h>
+#include <zephyr/arch/common/semihost.h>
 
 static void test_file_ops(void)
 {
diff --git a/tests/arch/x86/cpu_scrubs_regs/src/main.c b/tests/arch/x86/cpu_scrubs_regs/src/main.c
index 652a8b3e7f7..a7bae1e42c3 100644
--- a/tests/arch/x86/cpu_scrubs_regs/src/main.c
+++ b/tests/arch/x86/cpu_scrubs_regs/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <syscall_handler.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/syscall_handler.h>
 #include <ztest.h>
 #include "test_syscalls.h"
 
diff --git a/tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h b/tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h
index 5b296002c83..bb7a711c798 100644
--- a/tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h
+++ b/tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h
@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 __syscall void test_cpu_write_reg(void);
 
diff --git a/tests/arch/x86/info/src/acpi.c b/tests/arch/x86/info/src/acpi.c
index 783e15ba884..5df99d9b3d4 100644
--- a/tests/arch/x86/info/src/acpi.c
+++ b/tests/arch/x86/info/src/acpi.c
@@ -3,8 +3,8 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr.h>
-#include <arch/x86/acpi.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/arch/x86/acpi.h>
 
 static void vtd_dev_scope_info(struct acpi_dmar_dev_scope *dev_scope)
 {
diff --git a/tests/arch/x86/info/src/main.c b/tests/arch/x86/info/src/main.c
index 7fb52e01f5d..ea16950c62d 100644
--- a/tests/arch/x86/info/src/main.c
+++ b/tests/arch/x86/info/src/main.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include "info.h"
 
 __weak void multiboot(void)
diff --git a/tests/arch/x86/info/src/memmap.c b/tests/arch/x86/info/src/memmap.c
index 483a0c04489..8eb0a31f9de 100644
--- a/tests/arch/x86/info/src/memmap.c
+++ b/tests/arch/x86/info/src/memmap.c
@@ -3,8 +3,8 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr.h>
-#include <arch/x86/memmap.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/arch/x86/memmap.h>
 
 void memmap(void)
 {
diff --git a/tests/arch/x86/info/src/multiboot.c b/tests/arch/x86/info/src/multiboot.c
index 71b366f5bd8..43febc8e6bb 100644
--- a/tests/arch/x86/info/src/multiboot.c
+++ b/tests/arch/x86/info/src/multiboot.c
@@ -3,8 +3,8 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr.h>
-#include <arch/x86/multiboot.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/arch/x86/multiboot.h>
 
 void multiboot(void)
 {
diff --git a/tests/arch/x86/info/src/timer.c b/tests/arch/x86/info/src/timer.c
index 1d0d29e6c49..e0156146ad9 100644
--- a/tests/arch/x86/info/src/timer.c
+++ b/tests/arch/x86/info/src/timer.c
@@ -3,9 +3,9 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr.h>
-#include <device.h>
-#include <drivers/counter.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/counter.h>
 
 #define NR_SAMPLES 10	/* sample timer 10 times */
 
diff --git a/tests/arch/x86/nmi/src/main.c b/tests/arch/x86/nmi/src/main.c
index 6dc6df3c617..fd19bc72252 100644
--- a/tests/arch/x86/nmi/src/main.c
+++ b/tests/arch/x86/nmi/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <tc_util.h>
 
diff --git a/tests/arch/x86/pagetables/src/main.c b/tests/arch/x86/pagetables/src/main.c
index 4947be81512..5ec74fcec7c 100644
--- a/tests/arch/x86/pagetables/src/main.c
+++ b/tests/arch/x86/pagetables/src/main.c
@@ -9,12 +9,12 @@
  * x86-specific tests for MMU features and page tables
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <tc_util.h>
-#include <arch/x86/mmustructs.h>
+#include <zephyr/arch/x86/mmustructs.h>
 #include <x86_mmu.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 #include <mmu.h>
 #include "main.h"
 
diff --git a/tests/arch/x86/static_idt/src/main.c b/tests/arch/x86/static_idt/src/main.c
index 929f576f6db..669be15466b 100644
--- a/tests/arch/x86/static_idt/src/main.c
+++ b/tests/arch/x86/static_idt/src/main.c
@@ -10,10 +10,10 @@
  *  Ensures interrupt and exception stubs are installed correctly.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <tc_util.h>
-#include <arch/x86/ia32/segmentation.h>
+#include <zephyr/arch/x86/ia32/segmentation.h>
 
 #include <kernel_internal.h>
 #if defined(__GNUC__)
diff --git a/tests/arch/xtensa_asm2/src/main.c b/tests/arch/xtensa_asm2/src/main.c
index b1642aff05c..ed7f6268c20 100644
--- a/tests/arch/xtensa_asm2/src/main.c
+++ b/tests/arch/xtensa_asm2/src/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include <xtensa-asm2.h>
 
 #ifdef CONFIG_MULTITHREADING
diff --git a/tests/benchmarks/app_kernel/src/master.h b/tests/benchmarks/app_kernel/src/master.h
index f581f6455ef..8cff489398e 100644
--- a/tests/benchmarks/app_kernel/src/master.h
+++ b/tests/benchmarks/app_kernel/src/master.h
@@ -9,7 +9,7 @@
 #ifndef _MASTER_H
 #define _MASTER_H
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <stdio.h>
 
@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 
 /* uncomment the define below to use floating point arithmetic */
diff --git a/tests/benchmarks/app_kernel/src/memmap_b.c b/tests/benchmarks/app_kernel/src/memmap_b.c
index 8e6872872a7..7f50ff73f26 100644
--- a/tests/benchmarks/app_kernel/src/memmap_b.c
+++ b/tests/benchmarks/app_kernel/src/memmap_b.c
@@ -7,7 +7,7 @@
  */
 
 #include "master.h"
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #ifdef MEMMAP_BENCH
 
diff --git a/tests/benchmarks/app_kernel/src/receiver.h b/tests/benchmarks/app_kernel/src/receiver.h
index fae9bf7812c..8456658cc8a 100644
--- a/tests/benchmarks/app_kernel/src/receiver.h
+++ b/tests/benchmarks/app_kernel/src/receiver.h
@@ -9,7 +9,7 @@
 #ifndef _RECEIVER_H
 #define _RECEIVER_H
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include "config.h"
 #include "memcfg.h"
 #include "master.h"
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c b/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c
index 48b15aa656d..5ba7373eb42 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/benchmark_common.h"
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c b/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c
index 6adcf075b6d..c69d36cd196 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/benchmark_common.h"
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c b/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c
index a995247f8c7..2e4929b2351 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/benchmark_common.h"
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c b/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c
index 5b250a74a86..ff83174bc27 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/benchmark_common.h"
diff --git a/tests/benchmarks/cmsis_dsp/common/benchmark_common.h b/tests/benchmarks/cmsis_dsp/common/benchmark_common.h
index 5a5ffe6f71f..7318c72914d 100644
--- a/tests/benchmarks/cmsis_dsp/common/benchmark_common.h
+++ b/tests/benchmarks/cmsis_dsp/common/benchmark_common.h
@@ -8,12 +8,12 @@
 #define ZEPHYR_BENCHMARK_CMSIS_DSP_COMMON_BENCHMARK_COMMON_H_
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #if defined(CONFIG_CPU_CORTEX_M_HAS_DWT)
 /* Use cycle counting on the Cortex-M devices that support DWT */
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 static ALWAYS_INLINE void benchmark_begin(uint32_t *irq_key, uint32_t *timestamp)
 {
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 59c83c25053..1d54d187963 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
@@ -11,7 +11,7 @@
  */
 
 #include <ztest.h>
-#include <sys/dlist.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 cd0efe50a95..1c0727e6f75 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
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <sys/rb.h>
+#include <zephyr/sys/rb.h>
 
 #define TREE_SIZE 512
 /* zephyr can't do floating-point arithmetic,
diff --git a/tests/benchmarks/footprints/src/footprint.h b/tests/benchmarks/footprints/src/footprint.h
index ba44a18b0a7..a304f1be73e 100644
--- a/tests/benchmarks/footprints/src/footprint.h
+++ b/tests/benchmarks/footprints/src/footprint.h
@@ -7,9 +7,9 @@
 #ifndef _FOOTPRINT_H_
 #define _FOOTPRINT_H_
 
-#include <kernel.h>
-#include <zephyr.h>
-#include <app_memory/app_memdomain.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/app_memory/app_memdomain.h>
 
 K_THREAD_STACK_EXTERN(my_stack_area);
 K_THREAD_STACK_EXTERN(my_stack_area_0);
diff --git a/tests/benchmarks/footprints/src/heap.c b/tests/benchmarks/footprints/src/heap.c
index 4568747fe58..5f246017753 100644
--- a/tests/benchmarks/footprints/src/heap.c
+++ b/tests/benchmarks/footprints/src/heap.c
@@ -10,8 +10,8 @@
  * @brief Measure time
  *
  */
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
 
 #include "footprint.h"
diff --git a/tests/benchmarks/footprints/src/libc.c b/tests/benchmarks/footprints/src/libc.c
index 58a0ea0a6b3..5208d283be4 100644
--- a/tests/benchmarks/footprints/src/libc.c
+++ b/tests/benchmarks/footprints/src/libc.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
 
 #include "footprint.h"
diff --git a/tests/benchmarks/footprints/src/main.c b/tests/benchmarks/footprints/src/main.c
index 7867548d821..1e751d34ca8 100644
--- a/tests/benchmarks/footprints/src/main.c
+++ b/tests/benchmarks/footprints/src/main.c
@@ -10,10 +10,10 @@
  * @brief Measure time
  *
  */
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
-#include <sys/libc-hooks.h>
+#include <zephyr/sys/libc-hooks.h>
 #include "footprint.h"
 
 #ifdef CONFIG_USERSPACE
diff --git a/tests/benchmarks/footprints/src/mutex.c b/tests/benchmarks/footprints/src/mutex.c
index b3383565a65..c9c0ec4fb3d 100644
--- a/tests/benchmarks/footprints/src/mutex.c
+++ b/tests/benchmarks/footprints/src/mutex.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 
 #include "footprint.h"
 
diff --git a/tests/benchmarks/footprints/src/pm_device.c b/tests/benchmarks/footprints/src/pm_device.c
index 9db0a3524c3..0ba9db57675 100644
--- a/tests/benchmarks/footprints/src/pm_device.c
+++ b/tests/benchmarks/footprints/src/pm_device.c
@@ -9,9 +9,9 @@
  * @brief Stub driver to measure the footprint impact of power management
  *
  */
-#include <device.h>
-#include <pm/device.h>
-#include <pm/device_runtime.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 
 #define DUMMY_PM_DRIVER_NAME	"dummy_pm_driver"
 #define DUMMY_DRIVER_NAME	"dummy_driver"
diff --git a/tests/benchmarks/footprints/src/semaphore.c b/tests/benchmarks/footprints/src/semaphore.c
index f439878af9d..ff918f2ccc0 100644
--- a/tests/benchmarks/footprints/src/semaphore.c
+++ b/tests/benchmarks/footprints/src/semaphore.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
 
 #include "footprint.h"
diff --git a/tests/benchmarks/footprints/src/system_thread.c b/tests/benchmarks/footprints/src/system_thread.c
index d80f51bb0df..e1d0bb68ef4 100644
--- a/tests/benchmarks/footprints/src/system_thread.c
+++ b/tests/benchmarks/footprints/src/system_thread.c
@@ -10,8 +10,8 @@
  * @brief Measure time
  *
  */
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
 
 #include "footprint.h"
diff --git a/tests/benchmarks/footprints/src/timer.c b/tests/benchmarks/footprints/src/timer.c
index 22b05b7f992..3376c044b19 100644
--- a/tests/benchmarks/footprints/src/timer.c
+++ b/tests/benchmarks/footprints/src/timer.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
 
 #include "footprint.h"
diff --git a/tests/benchmarks/footprints/src/userspace.c b/tests/benchmarks/footprints/src/userspace.c
index 5b6039987be..aa8262e7512 100644
--- a/tests/benchmarks/footprints/src/userspace.c
+++ b/tests/benchmarks/footprints/src/userspace.c
@@ -9,11 +9,11 @@
  * @brief Measure time
  *
  */
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
-#include <syscall_handler.h>
-#include <app_memory/app_memdomain.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/app_memory/app_memdomain.h>
 
 #include "footprint.h"
 #include "userspace.h"
diff --git a/tests/benchmarks/footprints/src/workq.c b/tests/benchmarks/footprints/src/workq.c
index d8b86f2758d..10b88f0f8c5 100644
--- a/tests/benchmarks/footprints/src/workq.c
+++ b/tests/benchmarks/footprints/src/workq.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <zephyr.h>
-#include <syscall_handler.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/syscall_handler.h>
 
 #include "footprint.h"
 
diff --git a/tests/benchmarks/latency_measure/src/coop_ctx_switch.c b/tests/benchmarks/latency_measure/src/coop_ctx_switch.c
index 1a0f09e5add..c3b244e3c9f 100644
--- a/tests/benchmarks/latency_measure/src/coop_ctx_switch.c
+++ b/tests/benchmarks/latency_measure/src/coop_ctx_switch.c
@@ -16,8 +16,8 @@
  * forth by yielding the cpu. When counter reaches the maximal value, threads
  * stop and the average time of context switch is displayed.
  */
-#include <kernel.h>
-#include <timing/timing.h>
+#include <zephyr/kernel.h>
+#include <zephyr/timing/timing.h>
 #include "utils.h"
 
 /* number of context switches */
diff --git a/tests/benchmarks/latency_measure/src/heap_malloc_free.c b/tests/benchmarks/latency_measure/src/heap_malloc_free.c
index f21a90b79a0..d61f785320a 100644
--- a/tests/benchmarks/latency_measure/src/heap_malloc_free.c
+++ b/tests/benchmarks/latency_measure/src/heap_malloc_free.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <timing/timing.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/timing/timing.h>
 #include "utils.h"
 
 #define TEST_COUNT 100
diff --git a/tests/benchmarks/latency_measure/src/int_to_thread.c b/tests/benchmarks/latency_measure/src/int_to_thread.c
index 66ace001945..072568c6acd 100644
--- a/tests/benchmarks/latency_measure/src/int_to_thread.c
+++ b/tests/benchmarks/latency_measure/src/int_to_thread.c
@@ -14,10 +14,10 @@
  * handler back to the interrupted thread.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include "utils.h"
 
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 
 static volatile int flag_var;
 
diff --git a/tests/benchmarks/latency_measure/src/int_to_thread_evt.c b/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
index cc159f8949b..c87b13ee0e2 100644
--- a/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
+++ b/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
@@ -15,8 +15,8 @@
  * interrupted.
  */
 
-#include <zephyr.h>
-#include <irq_offload.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/irq_offload.h>
 
 #include "utils.h"
 
diff --git a/tests/benchmarks/latency_measure/src/mutex_lock_unlock.c b/tests/benchmarks/latency_measure/src/mutex_lock_unlock.c
index cd39162bcd8..2a8d11773af 100644
--- a/tests/benchmarks/latency_measure/src/mutex_lock_unlock.c
+++ b/tests/benchmarks/latency_measure/src/mutex_lock_unlock.c
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <timing/timing.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/timing/timing.h>
 #include "utils.h"
 
 /* the number of mutex lock/unlock cycles */
diff --git a/tests/benchmarks/latency_measure/src/sema_test_signal_release.c b/tests/benchmarks/latency_measure/src/sema_test_signal_release.c
index e7214214a7f..8baad213078 100644
--- a/tests/benchmarks/latency_measure/src/sema_test_signal_release.c
+++ b/tests/benchmarks/latency_measure/src/sema_test_signal_release.c
@@ -12,8 +12,8 @@
  * mutex being tested.
  */
 
-#include <zephyr.h>
-#include <timing/timing.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/timing/timing.h>
 #include "utils.h"
 
 /* the number of semaphore give/take cycles */
diff --git a/tests/benchmarks/latency_measure/src/thread.c b/tests/benchmarks/latency_measure/src/thread.c
index 0d843ccf06e..5fd6b413aee 100644
--- a/tests/benchmarks/latency_measure/src/thread.c
+++ b/tests/benchmarks/latency_measure/src/thread.c
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <timing/timing.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/timing/timing.h>
 #include "utils.h"
 
 #define STACK_SIZE (512 + 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 6f6d43a32e6..325762dd2df 100644
--- a/tests/benchmarks/latency_measure/src/thread_switch_yield.c
+++ b/tests/benchmarks/latency_measure/src/thread_switch_yield.c
@@ -11,8 +11,8 @@
  * context switch.
  */
 
-#include <zephyr.h>
-#include <timing/timing.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/timing/timing.h>
 #include <stdlib.h>
 #include "timestamp.h"
 #include "utils.h" /* PRINT () and other macros */
diff --git a/tests/benchmarks/latency_measure/src/utils.h b/tests/benchmarks/latency_measure/src/utils.h
index 28ca0572a99..9bff41e8f9c 100644
--- a/tests/benchmarks/latency_measure/src/utils.h
+++ b/tests/benchmarks/latency_measure/src/utils.h
@@ -11,8 +11,8 @@
  * used in latency measurement.
  */
 
-#include <timing/timing.h>
-#include <sys/printk.h>
+#include <zephyr/timing/timing.h>
+#include <zephyr/sys/printk.h>
 #include <stdio.h>
 #include "timestamp.h"
 
diff --git a/tests/benchmarks/mbedtls/src/benchmark.c b/tests/benchmarks/mbedtls/src/benchmark.c
index 8028a97b472..7629c587a00 100644
--- a/tests/benchmarks/mbedtls/src/benchmark.c
+++ b/tests/benchmarks/mbedtls/src/benchmark.c
@@ -69,12 +69,12 @@
 #include "mbedtls/error.h"
 
 #include <zephyr/types.h>
-#include <sys/byteorder.h>
-#include <random/rand32.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/random/rand32.h>
 
 #include "kernel.h"
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #define  MBEDTLS_PRINT ((int(*)(const char *, ...)) printk)
 
 static void my_debug(void *ctx, int level,
diff --git a/tests/benchmarks/sched/src/main.c b/tests/benchmarks/sched/src/main.c
index fe354522070..c889a1a56e8 100644
--- a/tests/benchmarks/sched/src/main.c
+++ b/tests/benchmarks/sched/src/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
-#include <wait_q.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/wait_q.h>
 #include <ksched.h>
 
 /* This is a scheduler microbenchmark, designed to measure latencies
diff --git a/tests/benchmarks/sys_kernel/src/syskernel.c b/tests/benchmarks/sys_kernel/src/syskernel.c
index de2a5674409..cbd28c3fe5a 100644
--- a/tests/benchmarks/sys_kernel/src/syskernel.c
+++ b/tests/benchmarks/sys_kernel/src/syskernel.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <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 622036ec86a..9a6f4f57c9c 100644
--- a/tests/benchmarks/sys_kernel/src/syskernel.h
+++ b/tests/benchmarks/sys_kernel/src/syskernel.h
@@ -12,7 +12,7 @@
 #include <timestamp.h>
 
 #include <stdio.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 #define STACK_SIZE 2048
 #if CONFIG_SRAM_SIZE <= 32
diff --git a/tests/bluetooth/adv/src/main.c b/tests/bluetooth/adv/src/main.c
index a2aaf29e8d9..40512566921 100644
--- a/tests/bluetooth/adv/src/main.c
+++ b/tests/bluetooth/adv/src/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include <ztest.h>
 
diff --git a/tests/bluetooth/at/src/main.c b/tests/bluetooth/at/src/main.c
index e1d68a27c64..2687cb2c658 100644
--- a/tests/bluetooth/at/src/main.c
+++ b/tests/bluetooth/at/src/main.c
@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
 #include "subsys/bluetooth/host/at.h"
 
diff --git a/tests/bluetooth/bluetooth/src/bluetooth.c b/tests/bluetooth/bluetooth/src/bluetooth.c
index 6d1463760e4..5d7c7acc3c0 100644
--- a/tests/bluetooth/bluetooth/src/bluetooth.c
+++ b/tests/bluetooth/bluetooth/src/bluetooth.c
@@ -6,14 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <errno.h>
 #include <tc_util.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #define EXPECTED_ERROR -ENOSYS
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_advx/src/main.c b/tests/bluetooth/bsim_bt/bsim_test_advx/src/main.c
index b99ca5f4925..b16a03d442d 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_advx/src/main.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_advx/src/main.c
@@ -9,11 +9,11 @@
 #include <stddef.h>
 
 #include <zephyr/types.h>
-#include <sys/printk.h>
-#include <sys/util.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include "ll.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c
index 44b896cd289..886a413bef6 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c
@@ -14,15 +14,15 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/sys/byteorder.h>
 
 static struct bt_conn *default_conn;
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c
index e2cc6621bd9..3dbbc0da8c1 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c
@@ -14,18 +14,18 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/services/bas.h>
-#include <bluetooth/services/hrs.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/services/bas.h>
+#include <zephyr/bluetooth/services/hrs.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 static struct bt_conn *default_conn;
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_broadcaster_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_broadcaster_test.c
index 1682b5425af..92a1b626171 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_broadcaster_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_broadcaster_test.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/bluetooth.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_client_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_client_test.c
index 34aa1f9a879..742ccb6eeeb 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_client_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_client_test.c
@@ -6,9 +6,9 @@
 
 #ifdef CONFIG_BT_BASS_CLIENT
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/audio/bass.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/audio/bass.h>
 #include "../../../../../subsys/bluetooth/host/hci_core.h"
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_test.c
index 290a88f84ad..a3a1cead659 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_test.c
@@ -5,7 +5,7 @@
  */
 
 #ifdef CONFIG_BT_BASS
-#include <bluetooth/audio/bass.h>
+#include <zephyr/bluetooth/audio/bass.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/broadcast_sink_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/broadcast_sink_test.c
index 76ecd869679..3e5759ed0df 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/broadcast_sink_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/broadcast_sink_test.c
@@ -6,8 +6,8 @@
 
 #if defined(CONFIG_BT_AUDIO_BROADCAST_SINK)
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/audio.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/broadcast_source_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/broadcast_source_test.c
index 3dea78e8dea..abff3af0076 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/broadcast_source_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/broadcast_source_test.c
@@ -6,8 +6,8 @@
 
 #if defined(CONFIG_BT_AUDIO_BROADCAST_SOURCE)
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/audio.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/common.h b/tests/bluetooth/bsim_bt/bsim_test_audio/src/common.h
index de2c7c8d5bd..ebc8cecf0ad 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/common.h
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/common.h
@@ -20,14 +20,14 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <sys_clock.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys_clock.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #define WAIT_SECONDS 30                         /* seconds */
 #define WAIT_TIME (WAIT_SECONDS * USEC_PER_SEC) /* microseconds*/
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_client_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_client_test.c
index 3bd42b84565..7fcde011254 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_client_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_client_test.c
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #ifdef CONFIG_BT_CSIS_CLIENT
-#include <bluetooth/addr.h>
-#include <bluetooth/audio/csis.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/audio/csis.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_test.c
index e672ffbeb8e..54198cddf63 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_test.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #ifdef CONFIG_BT_CSIS
-#include <bluetooth/audio/csis.h>
+#include <zephyr/bluetooth/audio/csis.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/has_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/has_test.c
index 42e0f5cfd0c..36881a5a113 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/has_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/has_test.c
@@ -5,8 +5,8 @@
  */
 
 #ifdef CONFIG_BT_HAS
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/has.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/has.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/mcc_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/mcc_test.c
index 8c7f12058ea..b692eb8b32b 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/mcc_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/mcc_test.c
@@ -6,24 +6,24 @@
 
 #ifdef CONFIG_BT_MCC
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <sys/byteorder.h>
-#include <sys/sem.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/sem.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
-#include <bluetooth/audio/mcc.h>
+#include <zephyr/bluetooth/audio/mcc.h>
 
-#include <bluetooth/audio/media_proxy.h>
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/audio/media_proxy.h>
+#include <zephyr/bluetooth/services/ots.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/mcs_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/mcs_test.c
index 57894d9ff91..60216d2c915 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/mcs_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/mcs_test.c
@@ -6,20 +6,20 @@
 
 #ifdef CONFIG_BT_MCS
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
-#include <bluetooth/audio/media_proxy.h>
+#include <zephyr/bluetooth/audio/media_proxy.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/media_controller_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/media_controller_test.c
index 18de58cac37..af0543df151 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/media_controller_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/media_controller_test.c
@@ -6,24 +6,24 @@
 
 #ifdef CONFIG_BT_MCS
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <sys/byteorder.h>
-#include <sys/sem.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/sem.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
-#include <bluetooth/audio/mcc.h>
+#include <zephyr/bluetooth/audio/mcc.h>
 
-#include <bluetooth/audio/media_proxy.h>
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/audio/media_proxy.h>
+#include <zephyr/bluetooth/services/ots.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_client_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_client_test.c
index 0ac822671f8..907f487bd20 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_client_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_client_test.c
@@ -6,8 +6,8 @@
 
 #ifdef CONFIG_BT_MICS_CLIENT
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/mics.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/mics.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/tbs_client_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/tbs_client_test.c
index 282d26a1d61..2c8e278a1e5 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/tbs_client_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/tbs_client_test.c
@@ -7,7 +7,7 @@
 
 #ifdef CONFIG_BT_TBS_CLIENT
 
-#include <bluetooth/audio/tbs.h>
+#include <zephyr/bluetooth/audio/tbs.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/tbs_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/tbs_test.c
index 89c6d5e854b..0a2042facb9 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/tbs_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/tbs_test.c
@@ -6,7 +6,7 @@
  */
 
 #ifdef CONFIG_BT_TBS
-#include <bluetooth/audio/tbs.h>
+#include <zephyr/bluetooth/audio/tbs.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_client_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_client_test.c
index d2f9c891605..73f775589a3 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_client_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_client_test.c
@@ -6,9 +6,9 @@
 
 #if defined(CONFIG_BT_AUDIO_UNICAST_CLIENT)
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/audio.h>
-#include <bluetooth/audio/capabilities.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/capabilities.h>
 #include "common.h"
 #include "unicast_common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_common.h b/tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_common.h
index 3a02c7e0625..3804f5b1d15 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_common.h
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_common.h
@@ -9,8 +9,8 @@
 #ifndef ZEPHYR_TEST_BSIM_BT_AUDIO_TEST_UNICAST_COMMON_
 #define ZEPHYR_TEST_BSIM_BT_AUDIO_TEST_UNICAST_COMMON_
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/audio.h>
 
 void print_hex(const uint8_t *ptr, size_t len);
 void print_codec(const struct bt_codec *codec);
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_server_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_server_test.c
index 4102c79db90..ee651389ff4 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_server_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_server_test.c
@@ -6,9 +6,9 @@
 
 #if defined(CONFIG_BT_AUDIO_UNICAST_SERVER)
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/audio.h>
-#include <bluetooth/audio/capabilities.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/capabilities.h>
 #include "common.h"
 #include "unicast_common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/vcs_client_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/vcs_client_test.c
index a1cd64014e3..e4561b4ccc1 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/vcs_client_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/vcs_client_test.c
@@ -6,8 +6,8 @@
 
 #ifdef CONFIG_BT_VCS_CLIENT
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/vcs.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/vcs.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_eatt/src/common.h b/tests/bluetooth/bsim_bt/bsim_test_eatt/src/common.h
index 21aedc75474..54733ce951c 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_eatt/src/common.h
+++ b/tests/bluetooth/bsim_bt/bsim_test_eatt/src/common.h
@@ -9,13 +9,13 @@
 #include <stddef.h>
 
 #include <zephyr/types.h>
-#include <sys/printk.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/att.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/att.h>
 
 #include "bs_types.h"
 #include "bs_tracing.h"
diff --git a/tests/bluetooth/bsim_bt/bsim_test_eatt/src/main_reconfigure.c b/tests/bluetooth/bsim_bt/bsim_test_eatt/src/main_reconfigure.c
index b9400622e97..839534ef9a9 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_eatt/src/main_reconfigure.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_eatt/src/main_reconfigure.c
@@ -8,7 +8,7 @@
 
 #include "common.h"
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 CREATE_FLAG(flag_reconfigured);
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/client_test.c b/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/client_test.c
index ef981576e6d..d091eb825f8 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/client_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/client_test.c
@@ -14,10 +14,10 @@
  * on EATT channels.
  */
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/att.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/att.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/common.c b/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/common.c
index 5ed87daaacc..1df3895fc3e 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/common.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/common.c
@@ -5,7 +5,7 @@
  */
 
 #include "common.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_MODULE_NAME common
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/common.h b/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/common.h
index 6647dbd55d4..a51e231fecc 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/common.h
+++ b/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/common.h
@@ -16,13 +16,13 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 #include "bs_pc_backchannel.h"
 
 extern enum bst_result_t bst_result;
diff --git a/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/server_test.c b/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/server_test.c
index 1c4cf3fb01d..93e62ab2de6 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/server_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/server_test.c
@@ -5,8 +5,8 @@
  */
 
 #include "common.h"
-#include <bluetooth/conn.h>
-#include <bluetooth/att.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/att.h>
 
 extern enum bst_result_t bst_result;
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_gatt/src/common.h b/tests/bluetooth/bsim_bt/bsim_test_gatt/src/common.h
index 423f653f475..cea64309b96 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_gatt/src/common.h
+++ b/tests/bluetooth/bsim_bt/bsim_test_gatt/src/common.h
@@ -16,13 +16,13 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
 extern enum bst_result_t bst_result;
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_gatt/src/gatt_client_test.c b/tests/bluetooth/bsim_bt/bsim_test_gatt/src/gatt_client_test.c
index 394d2b6aa62..3b535965209 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_gatt/src/gatt_client_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_gatt/src/gatt_client_test.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_gatt_caching/src/common.h b/tests/bluetooth/bsim_bt/bsim_test_gatt_caching/src/common.h
index 2c28ad9f18a..364aec3015b 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_gatt_caching/src/common.h
+++ b/tests/bluetooth/bsim_bt/bsim_test_gatt_caching/src/common.h
@@ -17,13 +17,13 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
 extern enum bst_result_t bst_result;
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_gatt_caching/src/gatt_client_test.c b/tests/bluetooth/bsim_bt/bsim_test_gatt_caching/src/gatt_client_test.c
index 8c6fba7a240..2493fc08a22 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_gatt_caching/src/gatt_client_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_gatt_caching/src/gatt_client_test.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_iso/src/main.c b/tests/bluetooth/bsim_bt/bsim_test_iso/src/main.c
index 49caf0bda61..0504132ba3d 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_iso/src/main.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_iso/src/main.c
@@ -8,13 +8,13 @@
 
 #include <stddef.h>
 
-#include <sys/byteorder.h>
-#include <sys/printk.h>
-#include <sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/iso.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/iso.h>
 
 #include "subsys/bluetooth/host/hci_core.h"
 #include "subsys/bluetooth/controller/include/ll.h"
diff --git a/tests/bluetooth/bsim_bt/bsim_test_l2cap/src/common.c b/tests/bluetooth/bsim_bt/bsim_test_l2cap/src/common.c
index d60c36ae32a..648b58f271b 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_l2cap/src/common.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_l2cap/src/common.c
@@ -8,7 +8,7 @@
 
 #define LOG_MODULE_NAME common
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_DBG);
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_l2cap/src/common.h b/tests/bluetooth/bsim_bt/bsim_test_l2cap/src/common.h
index 85ebf75f7f4..a399786bfd2 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_l2cap/src/common.h
+++ b/tests/bluetooth/bsim_bt/bsim_test_l2cap/src/common.h
@@ -9,12 +9,12 @@
 #include <stddef.h>
 
 #include <zephyr/types.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/l2cap.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/l2cap.h>
 #include "bs_types.h"
 #include "bs_tracing.h"
 #include "bstests.h"
diff --git a/tests/bluetooth/bsim_bt/bsim_test_l2cap/src/main_l2cap_ecred.c b/tests/bluetooth/bsim_bt/bsim_test_l2cap/src/main_l2cap_ecred.c
index 64096d79ac4..19a18712508 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_l2cap/src/main_l2cap_ecred.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_l2cap/src/main_l2cap_ecred.c
@@ -9,7 +9,7 @@
 #include "common.h"
 
 #define LOG_MODULE_NAME main_l2cap_ecred
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_DBG);
 
 extern enum bst_result_t bst_result;
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/mesh_test.c b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/mesh_test.c
index a2e49934d55..d51dd669c01 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/mesh_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/mesh_test.c
@@ -7,7 +7,7 @@
 
 #define LOG_MODULE_NAME mesh_test
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 /* Max number of messages that can be pending on RX at the same time */
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/mesh_test.h b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/mesh_test.h
index adcb2ac7008..ca5f37a6234 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/mesh_test.h
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/mesh_test.h
@@ -19,11 +19,11 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define TEST_MOD_ID 0x8888
 #define TEST_MSG_OP_1  BT_MESH_MODEL_OP_1(0x0f)
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/settings_test_backend.c b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/settings_test_backend.c
index 72455947558..e0a22781441 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/settings_test_backend.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/settings_test_backend.c
@@ -18,7 +18,7 @@
 #include "argparse.h"
 
 #define LOG_MODULE_NAME settings_test_backend
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #define SETTINGS_FILE setting_file
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_access.c b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_access.c
index b3f62e0996e..6e0850ff2d7 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_access.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_access.c
@@ -10,7 +10,7 @@
 
 #define LOG_MODULE_NAME test_access
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
 
 #define GROUP_ADDR 0xc000
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_beacon.c b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_beacon.c
index ee365096964..19704abcf7d 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_beacon.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_beacon.c
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <kernel.h>
-#include <bluetooth/hci.h>
+#include <zephyr/kernel.h>
+#include <zephyr/bluetooth/hci.h>
 #include "mesh_test.h"
 #include "mesh/adv.h"
 #include "mesh/net.h"
@@ -15,7 +15,7 @@
 
 #define LOG_MODULE_NAME test_beacon
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
 
 #define GROUP_ADDR 0xc000
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_friendship.c b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_friendship.c
index 7159c8660f3..408bdc3c755 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_friendship.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_friendship.c
@@ -6,12 +6,12 @@
 #include "mesh_test.h"
 #include "mesh/net.h"
 #include "mesh/transport.h"
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include "argparse.h"
 
 #define LOG_MODULE_NAME test_friendship
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 /*
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_heartbeat.c b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_heartbeat.c
index 01e29827bc5..00be5683e20 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_heartbeat.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_heartbeat.c
@@ -11,7 +11,7 @@
 
 #define LOG_MODULE_NAME test_heartbeat
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #define WAIT_TIME 60 /*seconds*/
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_iv_index.c b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_iv_index.c
index a0adfe7067e..1c3a7cbc2c2 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_iv_index.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_iv_index.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include "mesh_test.h"
 #include "mesh/net.h"
 
 #define LOG_MODULE_NAME test_ivi
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
 
 #define WAIT_TIME 60 /*seconds*/
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_persistence.c b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_persistence.c
index 3e5d0d7c50f..65d0d7c5f84 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_persistence.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_persistence.c
@@ -6,8 +6,8 @@
 
 #include "mesh_test.h"
 #include "settings_test_backend.h"
-#include <bluetooth/mesh.h>
-#include <sys/reboot.h>
+#include <zephyr/bluetooth/mesh.h>
+#include <zephyr/sys/reboot.h>
 #include "mesh/net.h"
 #include "mesh/app_keys.h"
 #include "mesh/crypto.h"
@@ -15,7 +15,7 @@
 
 #define LOG_MODULE_NAME test_persistence
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #define WAIT_TIME 60 /*seconds*/
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_provision.c b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_provision.c
index 1c258f9a03d..b755d6ec208 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_provision.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_provision.c
@@ -15,11 +15,11 @@
 #include <tinycrypt/ecc.h>
 #include <tinycrypt/ecc_dh.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 #define LOG_MODULE_NAME mesh_prov
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 /*
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_replay_cache.c b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_replay_cache.c
index d2b3aa5bf2f..c78e22e2191 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_replay_cache.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_replay_cache.c
@@ -10,7 +10,7 @@
 
 #define LOG_MODULE_NAME test_rpc
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
 
 #define WAIT_TIME 60 /*seconds*/
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_scanner.c b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_scanner.c
index eac017bf0af..cd3cc5d0368 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_scanner.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_scanner.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include "mesh_test.h"
 #include "mesh/net.h"
 #include "mesh/adv.h"
@@ -12,7 +12,7 @@
 
 #define LOG_MODULE_NAME test_scanner
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #define WAIT_TIME 60 /*seconds*/
diff --git a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_transport.c b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_transport.c
index 552d0f68fbd..3ddb45fb82a 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_transport.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_mesh/src/test_transport.c
@@ -6,7 +6,7 @@
 #include "mesh_test.h"
 #include "mesh/net.h"
 #include "mesh/transport.h"
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 /*
  * Transport layer tests:
diff --git a/tests/bluetooth/bsim_bt/bsim_test_multiple/src/main.c b/tests/bluetooth/bsim_bt/bsim_test_multiple/src/main.c
index c712eb84717..3d45768670c 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_multiple/src/main.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_multiple/src/main.c
@@ -8,10 +8,10 @@
 
 #include <stddef.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <sys/printk.h>
-#include <sys/util.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
 
 #include "bs_types.h"
 #include "bs_tracing.h"
diff --git a/tests/bluetooth/bsim_bt/bsim_test_notify/src/common.h b/tests/bluetooth/bsim_bt/bsim_test_notify/src/common.h
index e1aab83790a..601b9da0341 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_notify/src/common.h
+++ b/tests/bluetooth/bsim_bt/bsim_test_notify/src/common.h
@@ -16,13 +16,13 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
 extern enum bst_result_t bst_result;
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_notify/src/gatt_client_test.c b/tests/bluetooth/bsim_bt/bsim_test_notify/src/gatt_client_test.c
index 4e51c71c154..d4a1e12cd87 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_notify/src/gatt_client_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_notify/src/gatt_client_test.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/gatt_macs.h b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/gatt_macs.h
index bfff93365e7..beb27bae9f7 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/gatt_macs.h
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/gatt_macs.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 /** @def BT_GATT_H_ATTRIBUTE
  *  @brief Attribute Declaration Macro.
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_1.c
index ba9d3959c4b..3cb295b6d3c 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_1.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 1'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_2.c
index cf12a22d80a..a9943186ea6 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_2.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 2'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_3.c
index d55e02a8bf1..59280135273 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_3.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 3'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_1.c
index 10ea1f8e4a2..e5efad48367 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_1.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 1'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_2.c
index da3bf5f24ea..a7fe107ec2d 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_2.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 2'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_3.c
index 4f44615edd6..c2fea34a77d 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_3.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 3'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_1.c
index 62ec64d3070..fb477d0532b 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_1.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 1'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_2.c
index a55402d76bc..a9dfe763c3f 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_2.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 2'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_3.c
index f74329637a8..25993efe6ca 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_3.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 3'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_1.c
index 492c698030b..fe105c4a6e1 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_1.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 1'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_2.c
index 74fe41eab13..47e283df272 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_2.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 2'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_3.c
index 1589821a1e0..95a6cc79d25 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_3.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 3'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_1.c
index a42e8cc012e..20667231884 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_1.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 1'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_2.c
index 1abdea061b4..81b532ffd73 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_2.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 2'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_3.c
index a7353b426bf..7fc945f3656 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_3.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 3'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_1.c
index 83676b53cd4..6d67b1a5b2d 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_1.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 1'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_2.c
index 0005ded90d3..43b80fe06f0 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_2.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 2'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_3.c
index deb1d448083..b283ffdb1c9 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_3.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 3'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_1.c
index 1c71fca9148..c705ec7059b 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_1.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 1'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_2.c
index 487e569dc11..52b30af6b5f 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_2.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 2'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_3.c
index 61ed43e7979..d2f7c09f438 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_3.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 3'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_1.c
index 998e92246c3..f530f7b2300 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_1.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 1'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_2.c
index 5318abb5f26..396b2618f9a 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_2.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 2'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_3.c
index be725afc79f..b4ad53d3ab4 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_3.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 3'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_1.c
index b2b24159674..c172f51d4ba 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_1.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 1'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_2.c
index 936a52dc6b1..eee549e03c5 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_2.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 2'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_3.c
index 288669bfdc4..8bd93576390 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_3.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 3'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_e_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_e_2.c
index 3750c6a6f5b..118fbf4f17e 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_e_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_e_2.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 2'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_e_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_e_3.c
index 594d4e801fc..0a29329d732 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_e_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_e_3.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 3'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_f_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_f_1.c
index 60d3fab5d4a..9a29a8a9deb 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_f_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_f_1.c
@@ -9,10 +9,10 @@
  *  This code is auto-generated from the Excel Workbook
  *  'GATT_Test_Databases.xlsm' Sheet: 'Large Database 1'
  */
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "gatt_macs.h"
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/main.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/main.c
index 977fbf1c4d6..45a9d8476c0 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/main.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/main.c
@@ -8,17 +8,17 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include <gatt/services.h>
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c
index 2015214b336..a146bd05746 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c
@@ -8,19 +8,19 @@
  * @brief HCI interface application
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
-#include <sys/byteorder.h>
-#include <debug/stack.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/debug/stack.h>
 
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/hci_vs.h>
-#include <bluetooth/hci_raw.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/hci_vs.h>
+#include <zephyr/bluetooth/hci_raw.h>
 
 #include "edtt_driver.h"
 #include "bs_tracing.h"
@@ -32,7 +32,7 @@
 #define LOG_LEVEL CONFIG_BT_LOG_LEVEL
 #endif
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(hci_test_app);
 
 static uint16_t waiting_opcode;
diff --git a/tests/bluetooth/controller/common/src/helper_pdu.c b/tests/bluetooth/controller/common/src/helper_pdu.c
index f703acbab60..a931c479411 100644
--- a/tests/bluetooth/controller/common/src/helper_pdu.c
+++ b/tests/bluetooth/controller/common/src/helper_pdu.c
@@ -8,10 +8,10 @@
 #include "zephyr/types.h"
 #include "ztest.h"
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 
diff --git a/tests/bluetooth/controller/common/src/helper_util.c b/tests/bluetooth/controller/common/src/helper_util.c
index 446fcb7c502..5922402f197 100644
--- a/tests/bluetooth/controller/common/src/helper_util.c
+++ b/tests/bluetooth/controller/common/src/helper_util.c
@@ -9,9 +9,9 @@
 #include "ztest.h"
 #include <stdlib.h>
 
-#include <bluetooth/hci.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 
diff --git a/tests/bluetooth/controller/ctrl_api/src/main.c b/tests/bluetooth/controller/ctrl_api/src/main.c
index 32c392725be..d307e60aa0e 100644
--- a/tests/bluetooth/controller/ctrl_api/src/main.c
+++ b/tests/bluetooth/controller/ctrl_api/src/main.c
@@ -8,10 +8,10 @@
 #include <ztest.h>
 #include "kconfig.h"
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/ctrl_chmu/src/main.c b/tests/bluetooth/controller/ctrl_chmu/src/main.c
index 66b8c7c8eef..c9fe5ee579b 100644
--- a/tests/bluetooth/controller/ctrl_chmu/src/main.c
+++ b/tests/bluetooth/controller/ctrl_chmu/src/main.c
@@ -10,10 +10,10 @@
 
 #define ULL_LLCP_UNITTEST
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/ctrl_conn_update/src/main.c b/tests/bluetooth/controller/ctrl_conn_update/src/main.c
index 0aabd2e4287..7fa9beb7131 100644
--- a/tests/bluetooth/controller/ctrl_conn_update/src/main.c
+++ b/tests/bluetooth/controller/ctrl_conn_update/src/main.c
@@ -9,10 +9,10 @@
 
 #define ULL_LLCP_UNITTEST
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/ctrl_cte_req/src/main.c b/tests/bluetooth/controller/ctrl_cte_req/src/main.c
index d05547e9cbc..7474890401b 100644
--- a/tests/bluetooth/controller/ctrl_cte_req/src/main.c
+++ b/tests/bluetooth/controller/ctrl_cte_req/src/main.c
@@ -8,10 +8,10 @@
 #include <ztest.h>
 #include "kconfig.h"
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.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 fb595e6a68b..2f6204d3969 100644
--- a/tests/bluetooth/controller/ctrl_data_length_update/src/main.c
+++ b/tests/bluetooth/controller/ctrl_data_length_update/src/main.c
@@ -5,15 +5,15 @@
  */
 
 #include <zephyr/types.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <ztest.h>
 
 #define ULL_LLCP_UNITTEST
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/ctrl_encrypt/src/main.c b/tests/bluetooth/controller/ctrl_encrypt/src/main.c
index bc1766371f3..c9f2488e694 100644
--- a/tests/bluetooth/controller/ctrl_encrypt/src/main.c
+++ b/tests/bluetooth/controller/ctrl_encrypt/src/main.c
@@ -10,10 +10,10 @@
 
 #define ULL_LLCP_UNITTEST
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/src/main.c b/tests/bluetooth/controller/ctrl_feature_exchange/src/main.c
index 0615bee027d..64b7cb18f69 100644
--- a/tests/bluetooth/controller/ctrl_feature_exchange/src/main.c
+++ b/tests/bluetooth/controller/ctrl_feature_exchange/src/main.c
@@ -5,16 +5,16 @@
  */
 
 #include <zephyr/types.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
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 660a3a2ca7e..cd873c4d582 100644
--- a/tests/bluetooth/controller/ctrl_feature_exchange/src/main_hci.c
+++ b/tests/bluetooth/controller/ctrl_feature_exchange/src/main_hci.c
@@ -5,16 +5,16 @@
  */
 
 #include <zephyr/types.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/ctrl_hci/src/main.c b/tests/bluetooth/controller/ctrl_hci/src/main.c
index 4bf6946e19d..67745d83b0f 100644
--- a/tests/bluetooth/controller/ctrl_hci/src/main.c
+++ b/tests/bluetooth/controller/ctrl_hci/src/main.c
@@ -5,16 +5,16 @@
  */
 
 #include <zephyr/types.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/ctrl_invalid/src/main.c b/tests/bluetooth/controller/ctrl_invalid/src/main.c
index 134ea17f7ef..832b0d72932 100644
--- a/tests/bluetooth/controller/ctrl_invalid/src/main.c
+++ b/tests/bluetooth/controller/ctrl_invalid/src/main.c
@@ -7,10 +7,10 @@
 #include <zephyr/types.h>
 #include <ztest.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/ctrl_le_ping/src/main.c b/tests/bluetooth/controller/ctrl_le_ping/src/main.c
index 779fd3e99c4..f59e4514725 100644
--- a/tests/bluetooth/controller/ctrl_le_ping/src/main.c
+++ b/tests/bluetooth/controller/ctrl_le_ping/src/main.c
@@ -8,10 +8,10 @@
 #include <ztest.h>
 #include "kconfig.h"
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.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 a9a615f074d..51b4bb8dd2e 100644
--- a/tests/bluetooth/controller/ctrl_min_used_chans/src/main.c
+++ b/tests/bluetooth/controller/ctrl_min_used_chans/src/main.c
@@ -8,10 +8,10 @@
 #include <ztest.h>
 #include "kconfig.h"
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/ctrl_phy_update/src/main.c b/tests/bluetooth/controller/ctrl_phy_update/src/main.c
index 1a999794081..5bd4e7fe243 100644
--- a/tests/bluetooth/controller/ctrl_phy_update/src/main.c
+++ b/tests/bluetooth/controller/ctrl_phy_update/src/main.c
@@ -10,10 +10,10 @@
 
 #define ULL_LLCP_UNITTEST
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/ctrl_terminate/src/main.c b/tests/bluetooth/controller/ctrl_terminate/src/main.c
index 6c11a5fb4a2..c9dd4079899 100644
--- a/tests/bluetooth/controller/ctrl_terminate/src/main.c
+++ b/tests/bluetooth/controller/ctrl_terminate/src/main.c
@@ -9,10 +9,10 @@
 #include <ztest.h>
 #include "kconfig.h"
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.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 5769f1b6a23..2228bc33960 100644
--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/src/main.c
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/src/main.c
@@ -10,10 +10,10 @@
 
 #define ULL_LLCP_UNITTEST
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/ctrl_unsupported/src/main.c b/tests/bluetooth/controller/ctrl_unsupported/src/main.c
index 9cef0db297d..ca5be6e9c29 100644
--- a/tests/bluetooth/controller/ctrl_unsupported/src/main.c
+++ b/tests/bluetooth/controller/ctrl_unsupported/src/main.c
@@ -7,10 +7,10 @@
 #include <zephyr/types.h>
 #include <ztest.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/ctrl_version/src/main.c b/tests/bluetooth/controller/ctrl_version/src/main.c
index 3ebec73ff08..c749b4c6cb5 100644
--- a/tests/bluetooth/controller/ctrl_version/src/main.c
+++ b/tests/bluetooth/controller/ctrl_version/src/main.c
@@ -8,10 +8,10 @@
 #include <ztest.h>
 #include "kconfig.h"
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 #include "hal/ccm.h"
 
 #include "util/util.h"
diff --git a/tests/bluetooth/controller/mock_ctrl/src/ll.c b/tests/bluetooth/controller/mock_ctrl/src/ll.c
index 9bb05b98634..b3121450334 100644
--- a/tests/bluetooth/controller/mock_ctrl/src/ll.c
+++ b/tests/bluetooth/controller/mock_ctrl/src/ll.c
@@ -9,10 +9,10 @@
 #include <ztest.h>
 #include "kconfig.h"
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 
diff --git a/tests/bluetooth/controller/mock_ctrl/src/lll.c b/tests/bluetooth/controller/mock_ctrl/src/lll.c
index f2d246fb7a5..f82ce46a839 100644
--- a/tests/bluetooth/controller/mock_ctrl/src/lll.c
+++ b/tests/bluetooth/controller/mock_ctrl/src/lll.c
@@ -9,10 +9,10 @@
 #include <ztest.h>
 #include "kconfig.h"
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 
diff --git a/tests/bluetooth/controller/mock_ctrl/src/lll_conn.c b/tests/bluetooth/controller/mock_ctrl/src/lll_conn.c
index 754f76702c7..94394d899bb 100644
--- a/tests/bluetooth/controller/mock_ctrl/src/lll_conn.c
+++ b/tests/bluetooth/controller/mock_ctrl/src/lll_conn.c
@@ -7,9 +7,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/tests/bluetooth/controller/mock_ctrl/src/ull.c b/tests/bluetooth/controller/mock_ctrl/src/ull.c
index c830ff3e3c5..48923b1c6ee 100644
--- a/tests/bluetooth/controller/mock_ctrl/src/ull.c
+++ b/tests/bluetooth/controller/mock_ctrl/src/ull.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/types.h>
 
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include "hal/cpu_vendor_hal.h"
 #include "hal/ccm.h"
diff --git a/tests/bluetooth/ctrl_sw_privacy/src/main.c b/tests/bluetooth/ctrl_sw_privacy/src/main.c
index 1faf236bacc..0bc1a5579ba 100644
--- a/tests/bluetooth/ctrl_sw_privacy/src/main.c
+++ b/tests/bluetooth/ctrl_sw_privacy/src/main.c
@@ -8,10 +8,10 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 void test_ctrl_sw_privacy(void)
 {
diff --git a/tests/bluetooth/ctrl_user_ext/src/hci_user_ext.c b/tests/bluetooth/ctrl_user_ext/src/hci_user_ext.c
index 5e6cd2a7cf1..7144913a21b 100644
--- a/tests/bluetooth/ctrl_user_ext/src/hci_user_ext.c
+++ b/tests/bluetooth/ctrl_user_ext/src/hci_user_ext.c
@@ -6,9 +6,9 @@
 
 #if defined(CONFIG_BT_CTLR_USER_EXT)
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
 #include "util/memq.h"
 #include "ll_sw/pdu.h"
diff --git a/tests/bluetooth/ctrl_user_ext/src/main.c b/tests/bluetooth/ctrl_user_ext/src/main.c
index 6b474934409..6396182bdb1 100644
--- a/tests/bluetooth/ctrl_user_ext/src/main.c
+++ b/tests/bluetooth/ctrl_user_ext/src/main.c
@@ -8,10 +8,10 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 void test_ctrl_user_ext(void)
 {
diff --git a/tests/bluetooth/df/common/src/bt_common.c b/tests/bluetooth/df/common/src/bt_common.c
index 8fad2258803..5e897435e18 100644
--- a/tests/bluetooth/df/common/src/bt_common.c
+++ b/tests/bluetooth/df/common/src/bt_common.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 #include "bt_common.h"
 
diff --git a/tests/bluetooth/df/common/src/bt_conn_common.c b/tests/bluetooth/df/common/src/bt_conn_common.c
index 46955669a12..f9eeed32fb1 100644
--- a/tests/bluetooth/df/common/src/bt_conn_common.c
+++ b/tests/bluetooth/df/common/src/bt_conn_common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
diff --git a/tests/bluetooth/df/common/src/hci_vendor_stub.c b/tests/bluetooth/df/common/src/hci_vendor_stub.c
index 3bb71d56c25..d1f7f5f4f48 100644
--- a/tests/bluetooth/df/common/src/hci_vendor_stub.c
+++ b/tests/bluetooth/df/common/src/hci_vendor_stub.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/addr.h>
-#include <bluetooth/hci_vs.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/hci_vs.h>
 
 /**
  * @brief This is a stub of a function that provides static address.
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 3db45d573ba..6cd6d782374 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
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 #include <host/hci_core.h>
 
 #include <bt_conn_common.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 bdd1983fc67..183a5c3211b 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
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 #include <host/hci_core.h>
 
 #include <bt_conn_common.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 d8c29735cd5..017786d5237 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
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 #include <host/hci_core.h>
 
 #include <bt_conn_common.h>
diff --git a/tests/bluetooth/df/connectionless_cte_chains/src/common.c b/tests/bluetooth/df/connectionless_cte_chains/src/common.c
index 60a28a093ad..eb56ba09707 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/src/common.c
+++ b/tests/bluetooth/df/connectionless_cte_chains/src/common.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 #include <host/hci_core.h>
 
 #include "util/util.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 4322730c9e0..415909243aa 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
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 #include <host/hci_core.h>
 
 #include "util/util.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 831c1034e7c..ceb14c74867 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
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 #include <host/hci_core.h>
 
 #include "util/util.h"
diff --git a/tests/bluetooth/df/connectionless_cte_rx/src/common.c b/tests/bluetooth/df/connectionless_cte_rx/src/common.c
index 05572574075..af460bc3b54 100644
--- a/tests/bluetooth/df/connectionless_cte_rx/src/common.c
+++ b/tests/bluetooth/df/connectionless_cte_rx/src/common.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
 #include <host/hci_core.h>
 
 #include <util/util.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 b9a7022e6c0..d77b31334d6 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
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 #include <host/hci_core.h>
 
 #include "common.h"
diff --git a/tests/bluetooth/df/connectionless_cte_tx/src/common.c b/tests/bluetooth/df/connectionless_cte_tx/src/common.c
index 6dd791b1831..325ae6eb548 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/src/common.c
+++ b/tests/bluetooth/df/connectionless_cte_tx/src/common.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/direction.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/direction.h>
 #include <host/hci_core.h>
 
 #include "common.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 10460107e9b..fa3495a038c 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
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 #include <host/hci_core.h>
 
 #include "common.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 6c2c79e79cd..4bc95a18cc5 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
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 #include <host/hci_core.h>
 
 #include "common.h"
diff --git a/tests/bluetooth/gatt/src/main.c b/tests/bluetooth/gatt/src/main.c
index 1f8e713306b..75eb997c129 100644
--- a/tests/bluetooth/gatt/src/main.c
+++ b/tests/bluetooth/gatt/src/main.c
@@ -6,13 +6,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gatt.h>
 
 /* Custom Service Variables */
 static struct bt_uuid_128 test_uuid = BT_UUID_INIT_128(
diff --git a/tests/bluetooth/hci_codecs_info/src/main.c b/tests/bluetooth/hci_codecs_info/src/main.c
index c85612cb01c..4b5bc703e04 100644
--- a/tests/bluetooth/hci_codecs_info/src/main.c
+++ b/tests/bluetooth/hci_codecs_info/src/main.c
@@ -6,12 +6,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 
 #define NUM_STD_CODECS 3
 static const struct bt_hci_std_codec_info_v2 std_codecs[NUM_STD_CODECS] = {
diff --git a/tests/bluetooth/hci_prop_evt/src/main.c b/tests/bluetooth/hci_prop_evt/src/main.c
index 637896cd751..cd055ef08a8 100644
--- a/tests/bluetooth/hci_prop_evt/src/main.c
+++ b/tests/bluetooth/hci_prop_evt/src/main.c
@@ -6,17 +6,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <errno.h>
 #include <tc_util.h>
 #include <ztest.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <drivers/bluetooth/hci_driver.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
+#include <zephyr/sys/byteorder.h>
 
 /* HCI Proprietary vendor event */
 const uint8_t hci_prop_evt_prefix[2] = { 0xAB, 0xBA };
diff --git a/tests/bluetooth/host_long_adv_recv/src/main.c b/tests/bluetooth/host_long_adv_recv/src/main.c
index 14164705f7d..b99c7ddc101 100644
--- a/tests/bluetooth/host_long_adv_recv/src/main.c
+++ b/tests/bluetooth/host_long_adv_recv/src/main.c
@@ -6,20 +6,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <errno.h>
 #include <tc_util.h>
 #include <ztest.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <drivers/bluetooth/hci_driver.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
+#include <zephyr/sys/byteorder.h>
 
 #define LOG_LEVEL CONFIG_BT_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(host_test_app);
 
 struct test_adv_report {
diff --git a/tests/bluetooth/init/src/main.c b/tests/bluetooth/init/src/main.c
index 6597e7632cb..819e1384021 100644
--- a/tests/bluetooth/init/src/main.c
+++ b/tests/bluetooth/init/src/main.c
@@ -8,10 +8,10 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 void test_init(void)
 {
diff --git a/tests/bluetooth/l2cap/src/main.c b/tests/bluetooth/l2cap/src/main.c
index 3aa06ba82bf..30fdeaa0851 100644
--- a/tests/bluetooth/l2cap/src/main.c
+++ b/tests/bluetooth/l2cap/src/main.c
@@ -6,13 +6,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/l2cap.h>
 
 static int l2cap_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan)
 {
diff --git a/tests/bluetooth/ll_settings/src/main.c b/tests/bluetooth/ll_settings/src/main.c
index 67363c38aae..27c6b9c66c5 100644
--- a/tests/bluetooth/ll_settings/src/main.c
+++ b/tests/bluetooth/ll_settings/src/main.c
@@ -6,11 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
 #include "ll_settings.h"
 
diff --git a/tests/bluetooth/mesh/src/main.c b/tests/bluetooth/mesh/src/main.c
index 6ec24d527b2..c6b60ceb54e 100644
--- a/tests/bluetooth/mesh/src/main.c
+++ b/tests/bluetooth/mesh/src/main.c
@@ -6,10 +6,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #include "board.h"
 
diff --git a/tests/bluetooth/mesh/src/microbit.c b/tests/bluetooth/mesh/src/microbit.c
index 4a644bbd84d..9186b4c207d 100644
--- a/tests/bluetooth/mesh/src/microbit.c
+++ b/tests/bluetooth/mesh/src/microbit.c
@@ -6,11 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
-#include <display/mb_display.h>
+#include <zephyr/display/mb_display.h>
 
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #include "board.h"
 
diff --git a/tests/bluetooth/mesh_shell/src/main.c b/tests/bluetooth/mesh_shell/src/main.c
index 4ce74baa51a..1017e3184d9 100644
--- a/tests/bluetooth/mesh_shell/src/main.c
+++ b/tests/bluetooth/mesh_shell/src/main.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include <stdlib.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/mesh.h>
-#include <bluetooth/mesh/shell.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/mesh.h>
+#include <zephyr/bluetooth/mesh/shell.h>
 
 static struct bt_mesh_cfg_cli cfg_cli;
 
diff --git a/tests/bluetooth/shell/src/main.c b/tests/bluetooth/shell/src/main.c
index 1cae7fbc13e..15ace788fb9 100644
--- a/tests/bluetooth/shell/src/main.c
+++ b/tests/bluetooth/shell/src/main.c
@@ -17,18 +17,18 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/printk.h>
-#include <sys/byteorder.h>
-#include <zephyr.h>
-#include <usb/usb_device.h>
-#include <drivers/uart.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/drivers/uart.h>
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/services/hrs.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/services/hrs.h>
 
 #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
 
diff --git a/tests/bluetooth/tester/src/bttester.c b/tests/bluetooth/tester/src/bttester.c
index 8af5f554844..0dcd3b14945 100644
--- a/tests/bluetooth/tester/src/bttester.c
+++ b/tests/bluetooth/tester/src/bttester.c
@@ -6,18 +6,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/types.h>
-#include <device.h>
-#include <drivers/uart.h>
-#include <toolchain.h>
-#include <bluetooth/bluetooth.h>
-#include <sys/byteorder.h>
-#include <drivers/console/uart_pipe.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/console/uart_pipe.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
diff --git a/tests/bluetooth/tester/src/bttester.h b/tests/bluetooth/tester/src/bttester.h
index d49b664f762..74ab120c0df 100644
--- a/tests/bluetooth/tester/src/bttester.h
+++ b/tests/bluetooth/tester/src/bttester.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/util.h>
-#include <bluetooth/addr.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/bluetooth/addr.h>
 
 #define BTP_MTU 1024
 #define BTP_DATA_MAX_SIZE (BTP_MTU - sizeof(struct btp_hdr))
diff --git a/tests/bluetooth/tester/src/gap.c b/tests/bluetooth/tester/src/gap.c
index 24b67b7364e..0273c4d297a 100644
--- a/tests/bluetooth/tester/src/gap.c
+++ b/tests/bluetooth/tester/src/gap.c
@@ -6,22 +6,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/atomic.h>
+#include <zephyr/sys/atomic.h>
 #include <zephyr/types.h>
 #include <string.h>
 
-#include <toolchain.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/hci.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci.h>
 
-#include <sys/byteorder.h>
-#include <net/buf.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/net/buf.h>
 
 #include <hci_core.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester_gap
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
diff --git a/tests/bluetooth/tester/src/gatt.c b/tests/bluetooth/tester/src/gatt.c
index 237250de9a3..401f65e475f 100644
--- a/tests/bluetooth/tester/src/gatt.c
+++ b/tests/bluetooth/tester/src/gatt.c
@@ -10,18 +10,18 @@
 #include <string.h>
 #include <errno.h>
 
-#include <toolchain.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/l2cap.h>
-#include <sys/byteorder.h>
-#include <sys/printk.h>
-#include <sys/__assert.h>
-#include <net/buf.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/net/buf.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester_gatt
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
diff --git a/tests/bluetooth/tester/src/l2cap.c b/tests/bluetooth/tester/src/l2cap.c
index fe30bfec184..78ad6fa889d 100644
--- a/tests/bluetooth/tester/src/l2cap.c
+++ b/tests/bluetooth/tester/src/l2cap.c
@@ -6,14 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 #include <errno.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/att.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/att.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester_l2cap
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
diff --git a/tests/bluetooth/tester/src/main.c b/tests/bluetooth/tester/src/main.c
index c39e15aed9e..74e1bc84d88 100644
--- a/tests/bluetooth/tester/src/main.c
+++ b/tests/bluetooth/tester/src/main.c
@@ -6,11 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester_main
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
diff --git a/tests/bluetooth/tester/src/mesh.c b/tests/bluetooth/tester/src/mesh.c
index 8d29429509e..ac6d8d28518 100644
--- a/tests/bluetooth/tester/src/mesh.c
+++ b/tests/bluetooth/tester/src/mesh.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 #include <assert.h>
 #include <errno.h>
-#include <bluetooth/mesh.h>
-#include <bluetooth/testing.h>
-#include <bluetooth/mesh/cfg.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/mesh.h>
+#include <zephyr/bluetooth/testing.h>
+#include <zephyr/bluetooth/mesh/cfg.h>
+#include <zephyr/sys/byteorder.h>
 #include <app_keys.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester_mesh
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
diff --git a/tests/bluetooth/uuid/src/main.c b/tests/bluetooth/uuid/src/main.c
index 48fc533acc0..dce913c68db 100644
--- a/tests/bluetooth/uuid/src/main.c
+++ b/tests/bluetooth/uuid/src/main.c
@@ -6,11 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <ztest.h>
 
-#include <bluetooth/uuid.h>
+#include <zephyr/bluetooth/uuid.h>
 
 static struct bt_uuid_16 uuid_16 = BT_UUID_INIT_16(0xffff);
 
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 1ed73951ec3..85149e5bbdd 100644
--- a/tests/boards/altera_max10/i2c_master/src/i2c_master.c
+++ b/tests/boards/altera_max10/i2c_master/src/i2c_master.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/i2c.h>
-#include <zephyr.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 /*
diff --git a/tests/boards/altera_max10/msgdma/src/dma.c b/tests/boards/altera_max10/msgdma/src/dma.c
index 852f05cc93e..be355a86e3f 100644
--- a/tests/boards/altera_max10/msgdma/src/dma.c
+++ b/tests/boards/altera_max10/msgdma/src/dma.c
@@ -7,8 +7,8 @@
 #include <ztest.h>
 #include <soc.h>
 #include <kernel_arch_func.h>
-#include <device.h>
-#include <drivers/dma.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/dma.h>
 
 #define DMA_BUFF_SIZE		1024
 
diff --git a/tests/boards/altera_max10/qspi/src/qspi_flash.c b/tests/boards/altera_max10/qspi/src/qspi_flash.c
index 4cb563b41be..a1bae90b851 100644
--- a/tests/boards/altera_max10/qspi/src/qspi_flash.c
+++ b/tests/boards/altera_max10/qspi/src/qspi_flash.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <drivers/flash.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/device.h>
 #include <ztest.h>
 
 #define MAX_NUM_OF_SECTORS		1024
diff --git a/tests/boards/altera_max10/sysid/src/sysid.c b/tests/boards/altera_max10/sysid/src/sysid.c
index 7c0f375c28d..a3ae3383cbf 100644
--- a/tests/boards/altera_max10/sysid/src/sysid.c
+++ b/tests/boards/altera_max10/sysid/src/sysid.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <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 de1988cf5a8..4efd243f080 100644
--- a/tests/boards/espressif_esp32/cache_coex/src/cache_coex.c
+++ b/tests/boards/espressif_esp32/cache_coex/src/cache_coex.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <devicetree.h>
-#include <sys/printk.h>
-#include <drivers/flash.h>
-#include <random/rand32.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/random/rand32.h>
 #include <soc/soc_memory_layout.h>
 
 /* definitions used in Flash & RAM operations */
diff --git a/tests/boards/intel_adsp/hda/src/dma.c b/tests/boards/intel_adsp/hda/src/dma.c
index 20e6291844a..23343208690 100644
--- a/tests/boards/intel_adsp/hda/src/dma.c
+++ b/tests/boards/intel_adsp/hda/src/dma.c
@@ -3,10 +3,10 @@
  */
 
 #include "arch/xtensa/cache.h"
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 #include <cavs_ipc.h>
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #include "tests.h"
 
 #define IPC_TIMEOUT K_MSEC(500)
diff --git a/tests/boards/intel_adsp/hda/src/main.c b/tests/boards/intel_adsp/hda/src/main.c
index 04481494723..976ac763a7b 100644
--- a/tests/boards/intel_adsp/hda/src/main.c
+++ b/tests/boards/intel_adsp/hda/src/main.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2022 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <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 e2ed657e2e2..5f244648c91 100644
--- a/tests/boards/intel_adsp/hda/src/smoke.c
+++ b/tests/boards/intel_adsp/hda/src/smoke.c
@@ -3,10 +3,10 @@
  */
 
 #include "arch/xtensa/cache.h"
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 #include <cavs_ipc.h>
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "tests.h"
 
 #define HDA_HOST_IN_BASE DT_PROP_BY_IDX(DT_NODELABEL(hda_host_in), reg, 0)
diff --git a/tests/boards/intel_adsp/hda/src/tests.h b/tests/boards/intel_adsp/hda/src/tests.h
index dd7dae33b78..26d8d2bc533 100644
--- a/tests/boards/intel_adsp/hda/src/tests.h
+++ b/tests/boards/intel_adsp/hda/src/tests.h
@@ -8,7 +8,7 @@
 #include <cavs_ipc.h>
 #include <cavstool.h>
 #include <stdint.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include <ztest.h>
 
 void test_hda_host_in_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 ea37a7cc3dc..fab23004445 100644
--- a/tests/boards/intel_adsp/hda_log/src/logger.c
+++ b/tests/boards/intel_adsp/hda_log/src/logger.c
@@ -2,10 +2,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log_backend_cavs_hda.h>
-#include <logging/log_backend.h>
-#include <logging/log_ctrl.h>
-#include <kernel.h>
+#include <zephyr/logging/log_backend_cavs_hda.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <ztest.h>
 #include <cavs_ipc.h>
@@ -14,7 +14,7 @@
 #define CHANNEL 6
 #define HOST_BUF_SIZE 512
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(hda_test, LOG_LEVEL_DBG);
 
 #define IPC_TIMEOUT K_MSEC(500)
diff --git a/tests/boards/intel_adsp/hda_log/src/main.c b/tests/boards/intel_adsp/hda_log/src/main.c
index ac240484bde..0268a187ea6 100644
--- a/tests/boards/intel_adsp/hda_log/src/main.c
+++ b/tests/boards/intel_adsp/hda_log/src/main.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2022 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <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 8a779a20c60..bceba67f5ee 100644
--- a/tests/boards/intel_adsp/hda_log/src/tests.h
+++ b/tests/boards/intel_adsp/hda_log/src/tests.h
@@ -7,7 +7,7 @@
 #include <cavs_ipc.h>
 #include <cavstool.h>
 #include <stdint.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include <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 9c5f1860b87..bc2078e623f 100644
--- a/tests/boards/intel_adsp/mm/src/main.c
+++ b/tests/boards/intel_adsp/mm/src/main.c
@@ -5,13 +5,13 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <toolchain.h>
-#include <sys/printk.h>
-#include <sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
 
-#include <drivers/mm/system_mm.h>
+#include <zephyr/drivers/mm/system_mm.h>
 
 #include <soc.h>
 #include <cavs-mem.h>
diff --git a/tests/boards/intel_adsp/smoke/src/cpus.c b/tests/boards/intel_adsp/smoke/src/cpus.c
index 9e1a1dae7b7..2f5c7694727 100644
--- a/tests/boards/intel_adsp/smoke/src/cpus.c
+++ b/tests/boards/intel_adsp/smoke/src/cpus.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <stdlib.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <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 49d440c53ff..acc736834fd 100644
--- a/tests/boards/intel_adsp/smoke/src/hostipc.c
+++ b/tests/boards/intel_adsp/smoke/src/hostipc.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2022 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <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 1e80686547d..3856344c667 100644
--- a/tests/boards/intel_adsp/smoke/src/ipm.c
+++ b/tests/boards/intel_adsp/smoke/src/ipm.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-#include <drivers/ipm.h>
+#include <zephyr/drivers/ipm.h>
 #include "tests.h"
 
 #define IPM_DEV device_get_binding("ipm_cavs_host")
diff --git a/tests/boards/intel_adsp/smoke/src/main.c b/tests/boards/intel_adsp/smoke/src/main.c
index 51498613714..6ec18736bea 100644
--- a/tests/boards/intel_adsp/smoke/src/main.c
+++ b/tests/boards/intel_adsp/smoke/src/main.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2022 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <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 993477a1c7a..3cdf60b3ac9 100644
--- a/tests/boards/intel_adsp/smoke/src/smpboot.c
+++ b/tests/boards/intel_adsp/smoke/src/smpboot.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include "tests.h"
 
diff --git a/tests/boards/intel_adsp/ssp/src/main.c b/tests/boards/intel_adsp/ssp/src/main.c
index 5dc702b3745..b2b4d5c57ee 100644
--- a/tests/boards/intel_adsp/ssp/src/main.c
+++ b/tests/boards/intel_adsp/ssp/src/main.c
@@ -5,15 +5,15 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <toolchain.h>
-#include <sys/printk.h>
-#include <sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
 
-#include <device.h>
-#include <drivers/dai.h>
-#include <drivers/dma.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/dai.h>
+#include <zephyr/drivers/dma.h>
 #include <soc.h>
 
 /* sof ssp bespoke data */
diff --git a/tests/boards/intel_s1000_crb/cache/src/cache_test.c b/tests/boards/intel_s1000_crb/cache/src/cache_test.c
index 0f3d46b1516..e139560828f 100644
--- a/tests/boards/intel_s1000_crb/cache/src/cache_test.c
+++ b/tests/boards/intel_s1000_crb/cache/src/cache_test.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cache_test);
 
 #define LP_SRAM_BASE		0xBE800000
diff --git a/tests/boards/intel_s1000_crb/main/src/dma_test.c b/tests/boards/intel_s1000_crb/main/src/dma_test.c
index 8cd413babc7..ae16cd08cdb 100644
--- a/tests/boards/intel_s1000_crb/main/src/dma_test.c
+++ b/tests/boards/intel_s1000_crb/main/src/dma_test.c
@@ -26,11 +26,11 @@
  *     be printed on to the console. No error should be seen.
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
-#include <device.h>
-#include <drivers/dma.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/dma.h>
 
 #include <string.h>
 #include <xtensa/hal.h>
diff --git a/tests/boards/intel_s1000_crb/main/src/gpio_test.c b/tests/boards/intel_s1000_crb/main/src/gpio_test.c
index d5022b2e410..065671447e3 100644
--- a/tests/boards/intel_s1000_crb/main/src/gpio_test.c
+++ b/tests/boards/intel_s1000_crb/main/src/gpio_test.c
@@ -27,11 +27,11 @@
  * "
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 
 #define GPIO_OUT_PIN            23
 #define GPIO_INT_PIN            24
diff --git a/tests/boards/intel_s1000_crb/main/src/i2c_test.c b/tests/boards/intel_s1000_crb/main/src/i2c_test.c
index 61cada6311c..b45d6a1d361 100644
--- a/tests/boards/intel_s1000_crb/main/src/i2c_test.c
+++ b/tests/boards/intel_s1000_crb/main/src/i2c_test.c
@@ -27,11 +27,11 @@
  * "
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
-#include <device.h>
-#include <drivers/i2c.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
 
 #define I2C_DEV                 "I2C_0"
 #define I2C_ADDR_LED_MAT0       0x65
diff --git a/tests/boards/intel_s1000_crb/main/src/i2s_test.c b/tests/boards/intel_s1000_crb/main/src/i2s_test.c
index 33d3cbdb848..ef4ab8bd4ff 100644
--- a/tests/boards/intel_s1000_crb/main/src/i2s_test.c
+++ b/tests/boards/intel_s1000_crb/main/src/i2s_test.c
@@ -20,11 +20,11 @@
  * start operation is triggered
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
-#include <device.h>
-#include <drivers/i2s.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2s.h>
 
 #define I2S_DEV_NAME "I2S_3"
 #define NUM_I2S_BUFFERS 4
diff --git a/tests/boards/intel_s1000_crb/main/src/main.c b/tests/boards/intel_s1000_crb/main/src/main.c
index e60fa47fdcd..358fffc8258 100644
--- a/tests/boards/intel_s1000_crb/main/src/main.c
+++ b/tests/boards/intel_s1000_crb/main/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 void test_flash(void);
 
diff --git a/tests/boards/intel_s1000_crb/main/src/spi_flash.c b/tests/boards/intel_s1000_crb/main/src/spi_flash.c
index 8a69e9f6757..506eecffc31 100644
--- a/tests/boards/intel_s1000_crb/main/src/spi_flash.c
+++ b/tests/boards/intel_s1000_crb/main/src/spi_flash.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <drivers/flash.h>
-#include <storage/flash_map.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/device.h>
 #include <stdio.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test_flash);
 
 #define FLASH_TEST_REGION_OFFSET 0x3F0000
diff --git a/tests/boards/intel_s1000_crb/main/src/test_hid.c b/tests/boards/intel_s1000_crb/main/src/test_hid.c
index 16f91a8ac01..a6294e0220b 100644
--- a/tests/boards/intel_s1000_crb/main/src/test_hid.c
+++ b/tests/boards/intel_s1000_crb/main/src/test_hid.c
@@ -5,13 +5,13 @@
  */
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(main);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <usb/usb_device.h>
-#include <usb/class/usb_hid.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_hid.h>
 
 #define REPORT_ID_1	0x01
 #define REPORT_ID_2	0x02
diff --git a/tests/boards/mec15xxevb_assy6853/i2c_api/src/main.c b/tests/boards/mec15xxevb_assy6853/i2c_api/src/main.c
index 344394d62b3..c903b96688b 100644
--- a/tests/boards/mec15xxevb_assy6853/i2c_api/src/main.c
+++ b/tests/boards/mec15xxevb_assy6853/i2c_api/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/i2c.h>
-#include <zephyr.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #define I2C_DEV_NAME DT_LABEL(DT_ALIAS(i2c1))
diff --git a/tests/boards/mec15xxevb_assy6853/qspi/src/main.c b/tests/boards/mec15xxevb_assy6853/qspi/src/main.c
index 6e69d8823af..8ba782a2a92 100644
--- a/tests/boards/mec15xxevb_assy6853/qspi/src/main.c
+++ b/tests/boards/mec15xxevb_assy6853/qspi/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 
 #define TEST_FREQ_HZ 24000000U
 #define W25Q128_JEDEC_ID 0x001840efU
diff --git a/tests/boards/native_posix/cpu_wait/src/main.c b/tests/boards/native_posix/cpu_wait/src/main.c
index 95b5ef7f91c..157df73f104 100644
--- a/tests/boards/native_posix/cpu_wait/src/main.c
+++ b/tests/boards/native_posix/cpu_wait/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tests/boards/native_posix/rtc/src/main.c b/tests/boards/native_posix/rtc/src/main.c
index 3cc64757138..f0083907650 100644
--- a/tests/boards/native_posix/rtc/src/main.c
+++ b/tests/boards/native_posix/rtc/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tests/boot/uefi/src/main.c b/tests/boot/uefi/src/main.c
index 6c5c8a27dc6..6e1ba6a64fc 100644
--- a/tests/boot/uefi/src/main.c
+++ b/tests/boot/uefi/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
 void main(void)
 {
diff --git a/tests/crypto/crypto_hash/src/main.c b/tests/crypto/crypto_hash/src/main.c
index 50eff9851a0..d2cc6d255d6 100644
--- a/tests/crypto/crypto_hash/src/main.c
+++ b/tests/crypto/crypto_hash/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <crypto/crypto.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 b1c006c855e..c7217a3f900 100644
--- a/tests/crypto/mbedtls/src/main.c
+++ b/tests/crypto/mbedtls/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <app_memory/partitions.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 c1bd1c40473..fb0c937ecae 100644
--- a/tests/crypto/mbedtls/src/mbedtls.c
+++ b/tests/crypto/mbedtls/src/mbedtls.c
@@ -7,15 +7,15 @@
  *  This file is part of mbed TLS (https://tls.mbed.org)
  */
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #define  MBEDTLS_PRINT (int(*)(const char *, ...)) printk
 
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <zephyr.h>
-#include <linker/sections.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/linker/sections.h>
 #include <errno.h>
 
 #include <tc_util.h>
diff --git a/tests/crypto/rand32/src/main.c b/tests/crypto/rand32/src/main.c
index 54a796d901a..5f7c2750290 100644
--- a/tests/crypto/rand32/src/main.c
+++ b/tests/crypto/rand32/src/main.c
@@ -15,7 +15,7 @@
 
 #include <ztest.h>
 #include <kernel_internal.h>
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
 #define N_VALUES 10
 
diff --git a/tests/crypto/tinycrypt/src/aes.c b/tests/crypto/tinycrypt/src/aes.c
index ea75dd5b50c..66c64327626 100644
--- a/tests/crypto/tinycrypt/src/aes.c
+++ b/tests/crypto/tinycrypt/src/aes.c
@@ -53,7 +53,7 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include <ztest.h>
 
 #define NUM_OF_NIST_KEYS 16
diff --git a/tests/crypto/tinycrypt/src/ecc_dsa.c b/tests/crypto/tinycrypt/src/ecc_dsa.c
index d248863ad05..fec455be635 100644
--- a/tests/crypto/tinycrypt/src/ecc_dsa.c
+++ b/tests/crypto/tinycrypt/src/ecc_dsa.c
@@ -66,8 +66,8 @@
 #include <tinycrypt/sha256.h>
 #include <test_utils.h>
 #include "test_ecc_utils.h"
-#include <sys/util.h>
-#include <random/rand32.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/random/rand32.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/crypto/tinycrypt/src/test_ecc_utils.c b/tests/crypto/tinycrypt/src/test_ecc_utils.c
index eb1a3804e02..25a700a3201 100644
--- a/tests/crypto/tinycrypt/src/test_ecc_utils.c
+++ b/tests/crypto/tinycrypt/src/test_ecc_utils.c
@@ -58,7 +58,7 @@
 
 #include "test_ecc_utils.h"
 #include <tinycrypt/constants.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/drivers/adc/adc_api/src/main.c b/tests/drivers/adc/adc_api/src/main.c
index fa5c0f2be2d..5629bb00f7c 100644
--- a/tests/drivers/adc/adc_api/src/main.c
+++ b/tests/drivers/adc/adc_api/src/main.c
@@ -6,7 +6,7 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 extern void test_adc_sample_one_channel(void);
diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c
index 2dce0e1b453..b5f91cec9d2 100644
--- a/tests/drivers/adc/adc_api/src/test_adc.c
+++ b/tests/drivers/adc/adc_api/src/test_adc.c
@@ -6,8 +6,8 @@
  */
 
 
-#include <drivers/adc.h>
-#include <zephyr.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #if defined(CONFIG_SHIELD_MIKROE_ADC_CLICK)
diff --git a/tests/drivers/adc/adc_dma/src/main.c b/tests/drivers/adc/adc_dma/src/main.c
index 942db23cc43..18ff72f20d8 100644
--- a/tests/drivers/adc/adc_dma/src/main.c
+++ b/tests/drivers/adc/adc_dma/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 extern void test_adc_sample_one_channel(void);
diff --git a/tests/drivers/adc/adc_dma/src/test_adc.c b/tests/drivers/adc/adc_dma/src/test_adc.c
index f6f43af2988..7e0f625211e 100644
--- a/tests/drivers/adc/adc_dma/src/test_adc.c
+++ b/tests/drivers/adc/adc_dma/src/test_adc.c
@@ -7,9 +7,9 @@
  */
 
 
-#include <drivers/adc.h>
-#include <drivers/counter.h>
-#include <zephyr.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/zephyr.h>
 #include <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 44c147f98fb..b6c1ad4a63c 100644
--- a/tests/drivers/adc/adc_emul/src/main.c
+++ b/tests/drivers/adc/adc_emul/src/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/adc.h>
-#include <drivers/adc/adc_emul.h>
-#include <zephyr.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/adc/adc_emul.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #define ADC_DEVICE_NAME		DT_LABEL(DT_INST(0, zephyr_adc_emul))
diff --git a/tests/drivers/bbram/emul/src/main.c b/tests/drivers/bbram/emul/src/main.c
index 06351804231..2cef09ac28c 100644
--- a/tests/drivers/bbram/emul/src/main.c
+++ b/tests/drivers/bbram/emul/src/main.c
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/bbram.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/bbram.h>
 #include <string.h>
 #include <ztest.h>
 
diff --git a/tests/drivers/can/api/src/main.c b/tests/drivers/can/api/src/main.c
index b723305c30b..e607aebe284 100644
--- a/tests/drivers/can/api/src/main.c
+++ b/tests/drivers/can/api/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/can.h>
+#include <zephyr/drivers/can.h>
 #include <ztest.h>
 
 /**
diff --git a/tests/drivers/can/canfd/src/main.c b/tests/drivers/can/canfd/src/main.c
index eba58197967..db0b31c5d22 100644
--- a/tests/drivers/can/canfd/src/main.c
+++ b/tests/drivers/can/canfd/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/can.h>
+#include <zephyr/drivers/can.h>
 #include <ztest.h>
 
 /**
diff --git a/tests/drivers/can/stm32/src/main.c b/tests/drivers/can/stm32/src/main.c
index 6a0f0f26a7b..6c365dec133 100644
--- a/tests/drivers/can/stm32/src/main.c
+++ b/tests/drivers/can/stm32/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/can.h>
+#include <zephyr/drivers/can.h>
 #include <ztest.h>
 
 /**
diff --git a/tests/drivers/can/timing/src/main.c b/tests/drivers/can/timing/src/main.c
index f363fee4ea8..a5ed56c3092 100644
--- a/tests/drivers/can/timing/src/main.c
+++ b/tests/drivers/can/timing/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/can.h>
+#include <zephyr/drivers/can.h>
 #include <ztest.h>
 #include <strings.h>
 
diff --git a/tests/drivers/can/utilities/src/main.c b/tests/drivers/can/utilities/src/main.c
index c6ce9a30720..2041bb7b0b5 100644
--- a/tests/drivers/can/utilities/src/main.c
+++ b/tests/drivers/can/utilities/src/main.c
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/can.h>
-#include <logging/log.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/logging/log.h>
 #include <ztest.h>
 
 LOG_MODULE_REGISTER(can_utilities, LOG_LEVEL_ERR);
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 1be6a371e14..1703d23a86a 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
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-#include <drivers/clock_control.h>
-#include <logging/log.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
 
 #if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_clock)
-#include <drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #endif
 
 struct device_subsys_data {
diff --git a/tests/drivers/clock_control/nrf_clock_calibration/src/mock_temp_nrf5.c b/tests/drivers/clock_control/nrf_clock_calibration/src/mock_temp_nrf5.c
index 93aca4b7099..9e164b8a941 100644
--- a/tests/drivers/clock_control/nrf_clock_calibration/src/mock_temp_nrf5.c
+++ b/tests/drivers/clock_control/nrf_clock_calibration/src/mock_temp_nrf5.c
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <device.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
 
 /* Mock of internal temperature sensor. */
 #ifdef CONFIG_TEMP_NRF5
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 133a37f16b1..366f264b752 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
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include <hal/nrf_clock.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
 
 #ifndef CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC
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 5f079da6fb9..be4b4ef4ed0 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
@@ -5,7 +5,7 @@
  */
 #include <ztest.h>
 #include <hal/nrf_clock.h>
-#include <drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 
 static nrf_clock_lfclk_t type;
 static bool on;
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 459401b55b2..37d3b4bbd87 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
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-#include <drivers/entropy.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include <hal/nrf_clock.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
 
 #define TEST_TIME_MS 10000
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 79afd4d0f59..e52d307276d 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
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-#include <drivers/clock_control.h>
-#include <logging/log.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
 
-#include <drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 
 static struct onoff_manager *get_mgr(void)
 {
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common/src/test_stm32_clock_configuration.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common/src/test_stm32_clock_configuration.c
index c214fccc22b..a014bf33520 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common/src/test_stm32_clock_configuration.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common/src/test_stm32_clock_configuration.c
@@ -6,10 +6,10 @@
 
 #include <ztest.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <stm32_ll_rcc.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
 
 #if defined(CONFIG_SOC_SERIES_STM32WBX) || \
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 7dda18dbe4b..a64b7fd360b 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
@@ -6,9 +6,9 @@
 
 #include <ztest.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <logging/log.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
 
 static void test_sysclk_freq(void)
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 3a2af7b5469..7cf5d6f3bd2 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
@@ -6,9 +6,9 @@
 
 #include <ztest.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <logging/log.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
 
 static void test_hclk_freq(void)
diff --git a/tests/drivers/console/src/main.c b/tests/drivers/console/src/main.c
index 2571555ae98..b086c4b5117 100644
--- a/tests/drivers/console/src/main.c
+++ b/tests/drivers/console/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
 void main(void)
 {
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 95509b03f98..93f8ab9a82c 100644
--- a/tests/drivers/counter/counter_basic_api/src/test_counter.c
+++ b/tests/drivers/counter/counter_basic_api/src/test_counter.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #include <ztest.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
 
 static struct k_sem top_cnt_sem;
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 e0775a29573..42c591d2291 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
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #include <ztest.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <hal/nrf_rtc.h>
 LOG_MODULE_REGISTER(test);
 
diff --git a/tests/drivers/counter/counter_seconds/src/main.c b/tests/drivers/counter/counter_seconds/src/main.c
index 692501c82b2..8d5d0c60295 100644
--- a/tests/drivers/counter/counter_seconds/src/main.c
+++ b/tests/drivers/counter/counter_seconds/src/main.c
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 /*
  * Basic test to ensure that the clock is ticking at roughly 1Hz.
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 be8708a88ba..5e2116ff5bc 100644
--- a/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c
+++ b/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/counter.h>
-#include <drivers/rtc/maxim_ds3231.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/drivers/rtc/maxim_ds3231.h>
 #include <ztest.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
 
 static struct k_sem top_cnt_sem;
diff --git a/tests/drivers/dac/dac_api/src/main.c b/tests/drivers/dac/dac_api/src/main.c
index 1967cdf143f..18f45a01338 100644
--- a/tests/drivers/dac/dac_api/src/main.c
+++ b/tests/drivers/dac/dac_api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 extern void test_dac_write_value(void);
diff --git a/tests/drivers/dac/dac_api/src/test_dac.c b/tests/drivers/dac/dac_api/src/test_dac.c
index 189dc34e067..240fd75cd61 100644
--- a/tests/drivers/dac/dac_api/src/test_dac.c
+++ b/tests/drivers/dac/dac_api/src/test_dac.c
@@ -5,8 +5,8 @@
  */
 
 
-#include <drivers/dac.h>
-#include <zephyr.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #if defined(CONFIG_BOARD_NUCLEO_F091RC) || \
diff --git a/tests/drivers/dac/dac_loopback/src/main.c b/tests/drivers/dac/dac_loopback/src/main.c
index 9ccbd5a57e0..6540dd4ca59 100644
--- a/tests/drivers/dac/dac_loopback/src/main.c
+++ b/tests/drivers/dac/dac_loopback/src/main.c
@@ -11,7 +11,7 @@
  * @}
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <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 d9fb6c4ccee..6598649cd2b 100644
--- a/tests/drivers/dac/dac_loopback/src/test_dac.c
+++ b/tests/drivers/dac/dac_loopback/src/test_dac.c
@@ -12,9 +12,9 @@
  * @}
  */
 
-#include <drivers/dac.h>
-#include <drivers/adc.h>
-#include <zephyr.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 /*
diff --git a/tests/drivers/disk/src/main.c b/tests/drivers/disk/src/main.c
index 5eaf0bd9e96..9370faa0638 100644
--- a/tests/drivers/disk/src/main.c
+++ b/tests/drivers/disk/src/main.c
@@ -9,10 +9,10 @@
  * this test with an disk that has useful data
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <storage/disk_access.h>
-#include <device.h>
+#include <zephyr/storage/disk_access.h>
+#include <zephyr/device.h>
 
 #if IS_ENABLED(CONFIG_DISK_DRIVER_SDMMC)
 #define DISK_NAME CONFIG_SDMMC_VOLUME_NAME
diff --git a/tests/drivers/dma/chan_blen_transfer/src/main.c b/tests/drivers/dma/chan_blen_transfer/src/main.c
index 409327e44c1..33c6c1316e1 100644
--- a/tests/drivers/dma/chan_blen_transfer/src/main.c
+++ b/tests/drivers/dma/chan_blen_transfer/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 extern void test_dma_m2m_chan0_burst8(void);
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 803204de00d..bd9ddd64526 100644
--- a/tests/drivers/dma/chan_blen_transfer/src/test_dma.c
+++ b/tests/drivers/dma/chan_blen_transfer/src/test_dma.c
@@ -16,8 +16,8 @@
  *   -# Data is transferred correctly from src to dest
  */
 
-#include <zephyr.h>
-#include <drivers/dma.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/dma.h>
 #include <ztest.h>
 
 #define DMA_DEVICE_NAME CONFIG_DMA_TRANSFER_DRV_NAME
diff --git a/tests/drivers/dma/chan_link_transfer/src/main.c b/tests/drivers/dma/chan_link_transfer/src/main.c
index a5b082ddaa0..2300f8b7782 100644
--- a/tests/drivers/dma/chan_link_transfer/src/main.c
+++ b/tests/drivers/dma/chan_link_transfer/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 extern void test_dma_m2m_chan0_1_major_link(void);
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 3aa404adecf..0f92dea9b6a 100644
--- a/tests/drivers/dma/chan_link_transfer/src/test_dma.c
+++ b/tests/drivers/dma/chan_link_transfer/src/test_dma.c
@@ -17,8 +17,8 @@
  *   -# Data is transferred correctly from src to dest
  */
 
-#include <zephyr.h>
-#include <drivers/dma.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/dma.h>
 #include <ztest.h>
 
 #define DMA_DEVICE_NAME CONFIG_DMA_LINK_TRANSFER_DRV_NAME
diff --git a/tests/drivers/dma/loop_transfer/src/main.c b/tests/drivers/dma/loop_transfer/src/main.c
index 1b03d1c8e2d..4d6b8bdcf88 100644
--- a/tests/drivers/dma/loop_transfer/src/main.c
+++ b/tests/drivers/dma/loop_transfer/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 extern void test_dma_m2m_loop(void);
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 218f18c34d1..a14a5f733a4 100644
--- a/tests/drivers/dma/loop_transfer/src/test_dma_loop.c
+++ b/tests/drivers/dma/loop_transfer/src/test_dma_loop.c
@@ -21,10 +21,10 @@
  *   -# Data is transferred correctly from src to dest, for each loop
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <device.h>
-#include <drivers/dma.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/dma.h>
 #include <ztest.h>
 
 /* in millisecond */
diff --git a/tests/drivers/dma/scatter_gather/src/main.c b/tests/drivers/dma/scatter_gather/src/main.c
index 68bcffdc47a..79562f03484 100644
--- a/tests/drivers/dma/scatter_gather/src/main.c
+++ b/tests/drivers/dma/scatter_gather/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 extern void test_dma_m2m_sg(void);
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 20b058e010c..3fac3d5aaf0 100644
--- a/tests/drivers/dma/scatter_gather/src/test_dma_sg.c
+++ b/tests/drivers/dma/scatter_gather/src/test_dma_sg.c
@@ -17,8 +17,8 @@
  *      software intervention.
  */
 
-#include <kernel.h>
-#include <drivers/dma.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/dma.h>
 #include <ztest.h>
 
 #define XFERS 2
diff --git a/tests/drivers/eeprom/src/main.c b/tests/drivers/eeprom/src/main.c
index 1bbcc3bc287..f0f728e5033 100644
--- a/tests/drivers/eeprom/src/main.c
+++ b/tests/drivers/eeprom/src/main.c
@@ -6,9 +6,9 @@
 
 #include <ztest.h>
 #include <ztest_test.h>
-#include <drivers/eeprom.h>
-#include <drivers/i2c.h>
-#include <device.h>
+#include <zephyr/drivers/eeprom.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/device.h>
 
 /* There is no obvious way to pass this to tests, so use a global */
 ZTEST_BMEM static const char *eeprom_label;
diff --git a/tests/drivers/entropy/api/src/main.c b/tests/drivers/entropy/api/src/main.c
index ced8027f7bb..d2880a8dd9a 100644
--- a/tests/drivers/entropy/api/src/main.c
+++ b/tests/drivers/entropy/api/src/main.c
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <bluetooth/bluetooth.h>
-#include <drivers/entropy.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/drivers/entropy.h>
 #include <ztest.h>
 
 /*
diff --git a/tests/drivers/espi/src/test_acpi.c b/tests/drivers/espi/src/test_acpi.c
index b2ccdaba615..9b62d4c70d6 100644
--- a/tests/drivers/espi/src/test_acpi.c
+++ b/tests/drivers/espi/src/test_acpi.c
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/espi.h>
-#include <drivers/espi_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/espi_emul.h>
 #include <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 4e25cc0f85b..8f2f5645437 100644
--- a/tests/drivers/flash/src/main.c
+++ b/tests/drivers/flash/src/main.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/flash.h>
-#include <devicetree.h>
-#include <storage/flash_map.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/storage/flash_map.h>
 
 #if (CONFIG_NORDIC_QSPI_NOR - 0)
 #define NORDIC_QSPI_NOR_NODE DT_INST(0, nordic_qspi_nor)
diff --git a/tests/drivers/flash_simulator/src/main.c b/tests/drivers/flash_simulator/src/main.c
index a5825019136..f5403d4cfbb 100644
--- a/tests/drivers/flash_simulator/src/main.c
+++ b/tests/drivers/flash_simulator/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <drivers/flash.h>
-#include <device.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/device.h>
 
 /* configuration derived from DT */
 #ifdef CONFIG_ARCH_POSIX
@@ -277,7 +277,7 @@ static void test_get_erase_value(void)
 		      FLASH_SIMULATOR_ERASE_VALUE);
 }
 
-#include <drivers/flash/flash_simulator.h>
+#include <zephyr/drivers/flash/flash_simulator.h>
 
 static void test_get_mock(void)
 {
diff --git a/tests/drivers/gpio/gpio_api_1pin/src/test_config.c b/tests/drivers/gpio/gpio_api_1pin/src/test_config.c
index 0df0b56ea93..105ff0931c4 100644
--- a/tests/drivers/gpio/gpio_api_1pin/src/test_config.c
+++ b/tests/drivers/gpio/gpio_api_1pin/src/test_config.c
@@ -6,7 +6,7 @@
 
 
 #include <limits.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include "test_gpio_api.h"
 
 #define TEST_GPIO_MAX_SINGLE_ENDED_RISE_FALL_TIME_MS    100
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 ae6b0359665..5e0c6c3f950 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
@@ -7,8 +7,8 @@
 #ifndef TEST_GPIO_API_H_
 #define TEST_GPIO_API_H_
 
-#include <zephyr.h>
-#include <drivers/gpio.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
 #include <ztest.h>
 
 #if DT_NODE_HAS_PROP(DT_ALIAS(led0), gpios)
diff --git a/tests/drivers/gpio/gpio_api_1pin/src/test_pin.c b/tests/drivers/gpio/gpio_api_1pin/src/test_pin.c
index f11f6480ca8..12ee2a74b48 100644
--- a/tests/drivers/gpio/gpio_api_1pin/src/test_pin.c
+++ b/tests/drivers/gpio/gpio_api_1pin/src/test_pin.c
@@ -6,7 +6,7 @@
 
 
 #include <limits.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include "test_gpio_api.h"
 
 static void pin_get_raw_and_verify(const struct device *port,
diff --git a/tests/drivers/gpio/gpio_api_1pin/src/test_pin_interrupt.c b/tests/drivers/gpio/gpio_api_1pin/src/test_pin_interrupt.c
index 39211054694..1d39acf66c1 100644
--- a/tests/drivers/gpio/gpio_api_1pin/src/test_pin_interrupt.c
+++ b/tests/drivers/gpio/gpio_api_1pin/src/test_pin_interrupt.c
@@ -6,7 +6,7 @@
 
 
 #include <limits.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include "test_gpio_api.h"
 
 struct gpio_callback gpio_cb;
diff --git a/tests/drivers/gpio/gpio_api_1pin/src/test_port.c b/tests/drivers/gpio/gpio_api_1pin/src/test_port.c
index 04b505637c5..cbb9b4634c7 100644
--- a/tests/drivers/gpio/gpio_api_1pin/src/test_port.c
+++ b/tests/drivers/gpio/gpio_api_1pin/src/test_port.c
@@ -6,7 +6,7 @@
 
 
 #include <limits.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include "test_gpio_api.h"
 
 #define TEST_GPIO_PORT_VALUE_MAX         ((1LLU << GPIO_MAX_PINS_PER_PORT) - 1)
diff --git a/tests/drivers/gpio/gpio_basic_api/src/gpio_emul_callback.c b/tests/drivers/gpio/gpio_basic_api/src/gpio_emul_callback.c
index 0752795c648..74ffd3eca60 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/gpio_emul_callback.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/gpio_emul_callback.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
-#include <sys/util.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/zephyr.h>
 
 #include "test_gpio.h"
 
diff --git a/tests/drivers/gpio/gpio_basic_api/src/main.c b/tests/drivers/gpio/gpio_basic_api/src/main.c
index f1610440981..dd9e78c51e2 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/main.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/main.c
@@ -9,7 +9,7 @@
 
 /* Grotesque hack for pinmux boards */
 #if defined(CONFIG_BOARD_RV32M1_VEGA)
-#include <drivers/pinmux.h>
+#include <zephyr/drivers/pinmux.h>
 #include <fsl_port.h>
 #elif defined(CONFIG_BOARD_UDOO_NEO_FULL_M4)
 #include "device_imx.h"
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 afb70669fe6..0bad8486c98 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
@@ -7,9 +7,9 @@
 #ifndef __TEST_GPIO_H__
 #define __TEST_GPIO_H__
 
-#include <zephyr.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 #include <ztest.h>
 
 #if DT_NODE_HAS_STATUS(DT_INST(0, test_gpio_basic_api), okay)
diff --git a/tests/drivers/hwinfo/api/src/main.c b/tests/drivers/hwinfo/api/src/main.c
index 8b31745d040..c54e59c2549 100644
--- a/tests/drivers/hwinfo/api/src/main.c
+++ b/tests/drivers/hwinfo/api/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <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 4eb0a3e0868..42774cc3c46 100644
--- a/tests/drivers/i2c/i2c_api/src/main.c
+++ b/tests/drivers/i2c/i2c_api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 extern void test_i2c_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 dc75d44423b..0d3aee6f205 100644
--- a/tests/drivers/i2c/i2c_api/src/test_i2c.c
+++ b/tests/drivers/i2c/i2c_api/src/test_i2c.c
@@ -12,8 +12,8 @@
  * @}
  */
 
-#include <drivers/i2c.h>
-#include <zephyr.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_0), okay)
diff --git a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
index 20970fe85a7..47180b2bd9c 100644
--- a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
+++ b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <kernel.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(main);
 
 struct i2c_virtual_data {
diff --git a/tests/drivers/i2c/i2c_slave_api/src/main.c b/tests/drivers/i2c/i2c_slave_api/src/main.c
index a800d6da986..62a4bf02646 100644
--- a/tests/drivers/i2c/i2c_slave_api/src/main.c
+++ b/tests/drivers/i2c/i2c_slave_api/src/main.c
@@ -8,13 +8,13 @@
 #include <errno.h>
 #include <string.h>
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #include <stdio.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <drivers/i2c.h>
-#include <drivers/i2c/slave/eeprom.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c/slave/eeprom.h>
 
 #include <ztest.h>
 
diff --git a/tests/drivers/i2c/i2c_tca954x/src/main.c b/tests/drivers/i2c/i2c_tca954x/src/main.c
index 850e5822541..11187885cb1 100644
--- a/tests/drivers/i2c/i2c_tca954x/src/main.c
+++ b/tests/drivers/i2c/i2c_tca954x/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <device.h>
-#include <drivers/i2c.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
 
 #if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_channel_0), okay)
 #define I2C_0_CTRL_NODE_ID      DT_ALIAS(i2c_channel_0)
diff --git a/tests/drivers/i2s/i2s_api/src/common.c b/tests/drivers/i2s/i2s_api/src/common.c
index 96829eea057..404dd843950 100644
--- a/tests/drivers/i2s/i2s_api/src/common.c
+++ b/tests/drivers/i2s/i2s_api/src/common.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/i2s.h>
+#include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
 
 K_MEM_SLAB_DEFINE(rx_mem_slab, BLOCK_SIZE, NUM_RX_BLOCKS, 32);
diff --git a/tests/drivers/i2s/i2s_api/src/i2s_api_test.h b/tests/drivers/i2s/i2s_api/src/i2s_api_test.h
index ae8c427ea7f..0a03d939c68 100644
--- a/tests/drivers/i2s/i2s_api/src/i2s_api_test.h
+++ b/tests/drivers/i2s/i2s_api/src/i2s_api_test.h
@@ -8,8 +8,8 @@
 #ifndef I2S_API_TEST_H
 #define I2S_API_TEST_H
 
-#include <kernel.h>
-#include <drivers/i2s.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2s.h>
 
 void test_i2s_tx_transfer_configure_0(void);
 void test_i2s_rx_transfer_configure_0(void);
diff --git a/tests/drivers/i2s/i2s_api/src/main.c b/tests/drivers/i2s/i2s_api/src/main.c
index 71e43751aad..c8e150e2477 100644
--- a/tests/drivers/i2s/i2s_api/src/main.c
+++ b/tests/drivers/i2s/i2s_api/src/main.c
@@ -5,9 +5,9 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include "i2s_api_test.h"
 
 void test_main(void)
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 de377f62f0b..9c0a292aca6 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
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/i2s.h>
+#include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
 
 /* The test cases here are copied from test_i2s_loopback.c and adapted for use
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 a8e6e6c2d78..a23d290ca8d 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
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/i2s.h>
+#include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
 
 /* The test cases here are copied from test_i2s_states.c and adapted for use
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 f04de90fb35..4d8e24c9ec9 100644
--- a/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c
+++ b/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c
@@ -5,9 +5,9 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/i2s.h>
+#include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
 
 static ZTEST_DMEM const struct device *dev_i2s_rx;
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 bbe8f62c346..75ac6f26963 100644
--- a/tests/drivers/i2s/i2s_api/src/test_i2s_states.c
+++ b/tests/drivers/i2s/i2s_api/src/test_i2s_states.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/i2s.h>
+#include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
 
 static ZTEST_DMEM const struct device *dev_i2s_rx;
diff --git a/tests/drivers/i2s/i2s_speed/src/main.c b/tests/drivers/i2s/i2s_speed/src/main.c
index 1905f9e93a9..93aaa007a9f 100644
--- a/tests/drivers/i2s/i2s_speed/src/main.c
+++ b/tests/drivers/i2s/i2s_speed/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 void test_i2s_tx_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 6903fc78213..d27fb28e66f 100644
--- a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
+++ b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
@@ -5,9 +5,9 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/i2s.h>
+#include <zephyr/drivers/i2s.h>
 
 #define I2S_DEV_NAME_RX "I2S_0"
 #ifdef CONFIG_I2S_TEST_SEPARATE_DEVICES
diff --git a/tests/drivers/ipm/src/ipm_dummy.c b/tests/drivers/ipm/src/ipm_dummy.c
index 4b1fde5916d..a275a85cac7 100644
--- a/tests/drivers/ipm/src/ipm_dummy.c
+++ b/tests/drivers/ipm/src/ipm_dummy.c
@@ -6,13 +6,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <drivers/ipm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/ipm.h>
 #include <errno.h>
-#include <device.h>
-#include <init.h>
-#include <sys/printk.h>
-#include <irq_offload.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/irq_offload.h>
 
 #include "ipm_dummy.h"
 
diff --git a/tests/drivers/ipm/src/ipm_dummy.h b/tests/drivers/ipm/src/ipm_dummy.h
index ee8be601b4b..d5fe9acced7 100644
--- a/tests/drivers/ipm/src/ipm_dummy.h
+++ b/tests/drivers/ipm/src/ipm_dummy.h
@@ -8,9 +8,9 @@
 
 #ifndef _IPM_DUMMY_H_
 
-#include <zephyr.h>
-#include <device.h>
-#include <drivers/ipm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/ipm.h>
 
 /* Arbitrary */
 #define DUMMY_IPM_DATA_WORDS    4
diff --git a/tests/drivers/ipm/src/main.c b/tests/drivers/ipm/src/main.c
index 9819030283d..de6a0ab5658 100644
--- a/tests/drivers/ipm/src/main.c
+++ b/tests/drivers/ipm/src/main.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <drivers/ipm.h>
-#include <drivers/console/ipm_console.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/ipm.h>
+#include <zephyr/drivers/console/ipm_console.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <stdio.h>
 
 #include <tc_util.h>
diff --git a/tests/drivers/kscan/kscan_api/src/test_kscan.c b/tests/drivers/kscan/kscan_api/src/test_kscan.c
index 4717e592c28..d3ff62e490a 100644
--- a/tests/drivers/kscan/kscan_api/src/test_kscan.c
+++ b/tests/drivers/kscan/kscan_api/src/test_kscan.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <stdlib.h>
-#include <drivers/kscan.h>
-#include <zephyr.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #define KSCAN_DEV_NAME DT_LABEL(DT_ALIAS(kscan0))
diff --git a/tests/drivers/led/led_api/src/main.c b/tests/drivers/led/led_api/src/main.c
index 4eb3d628985..f88fd8f664d 100644
--- a/tests/drivers/led/led_api/src/main.c
+++ b/tests/drivers/led/led_api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <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 ac5b6ff89b8..728f9bdfcb7 100644
--- a/tests/drivers/led/led_api/src/test_led_api.c
+++ b/tests/drivers/led/led_api/src/test_led_api.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/led.h>
+#include <zephyr/drivers/led.h>
 
 #define BRIGHTNESS_MAX	100
 #define TEST_MAX_COLORS	8
diff --git a/tests/drivers/memc/stm32_sdram/src/main.c b/tests/drivers/memc/stm32_sdram/src/main.c
index 2b7804963d0..ea71088fe6d 100644
--- a/tests/drivers/memc/stm32_sdram/src/main.c
+++ b/tests/drivers/memc/stm32_sdram/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 /** Buffer size. */
diff --git a/tests/drivers/pinctrl/api/src/main.c b/tests/drivers/pinctrl/api/src/main.c
index 3f331b9f1a6..3ccd7489410 100644
--- a/tests/drivers/pinctrl/api/src/main.c
+++ b/tests/drivers/pinctrl/api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <ztest.h>
 
 #include "test_device.h"
diff --git a/tests/drivers/pinctrl/api/src/pinctrl_soc.h b/tests/drivers/pinctrl/api/src/pinctrl_soc.h
index 85195c2f318..a4fd49ab04c 100644
--- a/tests/drivers/pinctrl/api/src/pinctrl_soc.h
+++ b/tests/drivers/pinctrl/api/src/pinctrl_soc.h
@@ -12,7 +12,7 @@
 #ifndef ZEPHYR_TESTS_DRIVERS_PINCTRL_API_SRC_PINCTRL_SOC_H_
 #define ZEPHYR_TESTS_DRIVERS_PINCTRL_API_SRC_PINCTRL_SOC_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 
 /**
diff --git a/tests/drivers/pinctrl/api/src/pinctrl_test.c b/tests/drivers/pinctrl/api/src/pinctrl_test.c
index 0dff842f27f..30b4198863a 100644
--- a/tests/drivers/pinctrl/api/src/pinctrl_test.c
+++ b/tests/drivers/pinctrl/api/src/pinctrl_test.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <ztest.h>
 
 /* pinctrl test driver implemented as a mock */
diff --git a/tests/drivers/pinctrl/common/test_device.c b/tests/drivers/pinctrl/common/test_device.c
index fb8002a9abe..9de6685b307 100644
--- a/tests/drivers/pinctrl/common/test_device.c
+++ b/tests/drivers/pinctrl/common/test_device.c
@@ -8,8 +8,8 @@
 
 #include "test_device.h"
 
-#include <device.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pinctrl.h>
 
 int test_device_init(const struct device *dev)
 {
diff --git a/tests/drivers/pinctrl/common/test_device.h b/tests/drivers/pinctrl/common/test_device.h
index 769465ce8c2..9a9264834f9 100644
--- a/tests/drivers/pinctrl/common/test_device.h
+++ b/tests/drivers/pinctrl/common/test_device.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_TESTS_DRIVERS_PINCTRL_COMMON_TEST_DEVICE_H_
 #define ZEPHYR_TESTS_DRIVERS_PINCTRL_COMMON_TEST_DEVICE_H_
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 /** Custom pinctrl state "mystate". */
 #define PINCTRL_STATE_MYSTATE PINCTRL_STATE_PRIV_START
diff --git a/tests/drivers/pinctrl/gd32/src/main_af.c b/tests/drivers/pinctrl/gd32/src/main_af.c
index f38ed74c3b0..dae019624f3 100644
--- a/tests/drivers/pinctrl/gd32/src/main_af.c
+++ b/tests/drivers/pinctrl/gd32/src/main_af.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <ztest.h>
 
 /* pin configuration for test device */
diff --git a/tests/drivers/pinctrl/gd32/src/main_afio.c b/tests/drivers/pinctrl/gd32/src/main_afio.c
index 97ad8550eec..a917dd66453 100644
--- a/tests/drivers/pinctrl/gd32/src/main_afio.c
+++ b/tests/drivers/pinctrl/gd32/src/main_afio.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <ztest.h>
 
 /* pin configuration for test device */
diff --git a/tests/drivers/pinctrl/nrf/src/main.c b/tests/drivers/pinctrl/nrf/src/main.c
index b88979aa80d..4e48676bf1f 100644
--- a/tests/drivers/pinctrl/nrf/src/main.c
+++ b/tests/drivers/pinctrl/nrf/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <ztest.h>
 
 /* pin configuration for test device */
diff --git a/tests/drivers/pwm/pwm_api/src/main.c b/tests/drivers/pwm/pwm_api/src/main.c
index 5c0e59a3830..74d0f5a1c94 100644
--- a/tests/drivers/pwm/pwm_api/src/main.c
+++ b/tests/drivers/pwm/pwm_api/src/main.c
@@ -5,9 +5,9 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <device.h>
+#include <zephyr/device.h>
 
 const struct device *get_pwm_device(void);
 void test_pwm_usec(void);
diff --git a/tests/drivers/pwm/pwm_api/src/test_pwm.c b/tests/drivers/pwm/pwm_api/src/test_pwm.c
index f31b40a180d..6bbe8395b0e 100644
--- a/tests/drivers/pwm/pwm_api/src/test_pwm.c
+++ b/tests/drivers/pwm/pwm_api/src/test_pwm.c
@@ -23,10 +23,10 @@
  *	Always off  ->  Period : Pulse (1 : 0)  ->  0V
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <inttypes.h>
-#include <drivers/pwm.h>
-#include <zephyr.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #if DT_NODE_HAS_STATUS(DT_ALIAS(pwm_0), okay)
diff --git a/tests/drivers/pwm/pwm_loopback/src/main.c b/tests/drivers/pwm/pwm_loopback/src/main.c
index 871d4444281..1fe85243dee 100644
--- a/tests/drivers/pwm/pwm_loopback/src/main.c
+++ b/tests/drivers/pwm/pwm_loopback/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <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 60a1141c0e3..131191494a2 100644
--- a/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.c
+++ b/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <drivers/pwm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/pwm.h>
 #include <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 c82ec052bfc..b6b3eaaf189 100644
--- a/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.h
+++ b/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.h
@@ -7,8 +7,8 @@
 #ifndef __TEST_PWM_LOOPBACK_H__
 #define __TEST_PWM_LOOPBACK_H__
 
-#include <zephyr.h>
-#include <drivers/pwm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/pwm.h>
 #include <ztest.h>
 
 #define PWM_LOOPBACK_OUT_IDX 0
diff --git a/tests/drivers/regulator/fixed/src/main.c b/tests/drivers/regulator/fixed/src/main.c
index 26532f28afc..bbbb01190fc 100644
--- a/tests/drivers/regulator/fixed/src/main.c
+++ b/tests/drivers/regulator/fixed/src/main.c
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <drivers/gpio.h>
-#include <drivers/regulator.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/regulator.h>
 #include <ztest.h>
 
 #define REGULATOR_NODE DT_PATH(regulator)
diff --git a/tests/drivers/regulator/pmic/src/main.c b/tests/drivers/regulator/pmic/src/main.c
index 673d7417812..f0e085fdaa7 100644
--- a/tests/drivers/regulator/pmic/src/main.c
+++ b/tests/drivers/regulator/pmic/src/main.c
@@ -9,11 +9,11 @@
  * respectively.
  */
 
-#include <zephyr.h>
-#include <drivers/gpio.h>
-#include <drivers/adc.h>
-#include <drivers/regulator.h>
-#include <drivers/regulator/consumer.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/regulator.h>
+#include <zephyr/drivers/regulator/consumer.h>
 #include <ztest.h>
 
 #if !DT_NODE_EXISTS(DT_PATH(zephyr_user)) || \
diff --git a/tests/drivers/sensor/accel/src/main.c b/tests/drivers/sensor/accel/src/main.c
index 1faf3dd2ef4..f1357ea0691 100644
--- a/tests/drivers/sensor/accel/src/main.c
+++ b/tests/drivers/sensor/accel/src/main.c
@@ -12,7 +12,7 @@
  */
 
 #include <ztest.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 
 /* There is no obvious way to pass this to tests, so use a global */
 ZTEST_BMEM static const char *accel_label;
diff --git a/tests/drivers/sensor/generic/src/dummy_sensor.c b/tests/drivers/sensor/generic/src/dummy_sensor.c
index 08fbe933999..c8923d36e38 100644
--- a/tests/drivers/sensor/generic/src/dummy_sensor.c
+++ b/tests/drivers/sensor/generic/src/dummy_sensor.c
@@ -5,9 +5,9 @@
  */
 
 #include "dummy_sensor.h"
-#include <drivers/sensor.h>
-#include <device.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
 #include <ztest.h>
 
 LOG_MODULE_REGISTER(dummy_sensor, LOG_LEVEL_DBG);
diff --git a/tests/drivers/sensor/generic/src/dummy_sensor.h b/tests/drivers/sensor/generic/src/dummy_sensor.h
index 46643c04e01..4afb296b4e2 100644
--- a/tests/drivers/sensor/generic/src/dummy_sensor.h
+++ b/tests/drivers/sensor/generic/src/dummy_sensor.h
@@ -7,9 +7,9 @@
 #ifndef __TEST_DUMMY_SENSOR_H__
 #define __TEST_DUMMY_SENSOR_H__
 
-#include <zephyr.h>
-#include <device.h>
-#include <drivers/sensor.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
 #define DUMMY_SENSOR_NAME	"dummy_sensor"
 #define DUMMY_SENSOR_NAME_NO_TRIG	"dummy_sensor_no_trig"
 #define SENSOR_CHANNEL_NUM	5
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 30c16a3d7b9..3f536ce95cc 100644
--- a/tests/drivers/sensor/sbs_gauge/src/test_sbs_gauge.c
+++ b/tests/drivers/sensor/sbs_gauge/src/test_sbs_gauge.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/sensor.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 09d5b9fab06..4c307da3274 100644
--- a/tests/drivers/spi/dt_spec/src/main.c
+++ b/tests/drivers/spi/dt_spec/src/main.c
@@ -5,10 +5,10 @@
  */
 
 #include <ztest.h>
-#include <devicetree.h>
-#include <device.h>
-#include <drivers/spi.h>
-#include <logging/log.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(test, CONFIG_LOG_DEFAULT_LEVEL);
 
diff --git a/tests/drivers/spi/spi_loopback/src/spi.c b/tests/drivers/spi/spi_loopback/src/spi.c
index a290b343d23..fa6f5020813 100644
--- a/tests/drivers/spi/spi_loopback/src/spi.c
+++ b/tests/drivers/spi/spi_loopback/src/spi.c
@@ -5,16 +5,16 @@
  */
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main);
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 #include <string.h>
 #include <stdio.h>
 #include <ztest.h>
 
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 
 #define SPI_DRV_NAME	CONFIG_SPI_LOOPBACK_DRV_NAME
 #define SPI_SLAVE	CONFIG_SPI_LOOPBACK_SLAVE_NUMBER
diff --git a/tests/drivers/syscon/src/main.c b/tests/drivers/syscon/src/main.c
index 57ed2fa46d1..303abd395b8 100644
--- a/tests/drivers/syscon/src/main.c
+++ b/tests/drivers/syscon/src/main.c
@@ -2,9 +2,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/syscon.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/syscon.h>
 #include <ztest.h>
 
 uint8_t var_in_res0[DT_REG_SIZE(DT_NODELABEL(syscon))] __attribute((__section__(".res0")));
diff --git a/tests/drivers/timer/nrf_rtc_timer/src/main.c b/tests/drivers/timer/nrf_rtc_timer/src/main.c
index e2d3e1c1873..53affb03acd 100644
--- a/tests/drivers/timer/nrf_rtc_timer/src/main.c
+++ b/tests/drivers/timer/nrf_rtc_timer/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-#include <drivers/timer/nrf_rtc_timer.h>
+#include <zephyr/drivers/timer/nrf_rtc_timer.h>
 #include <hal/nrf_rtc.h>
 #include <hal/nrf_timer.h>
-#include <irq.h>
+#include <zephyr/irq.h>
 
 struct test_data {
 	uint64_t target_time;
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 e48fc3d133a..dd026b5f234 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart.h
+++ b/tests/drivers/uart/uart_async_api/src/test_uart.h
@@ -14,7 +14,7 @@
 #ifndef __TEST_UART_H__
 #define __TEST_UART_H__
 
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <ztest.h>
 
 /* RX and TX pins have to be connected together*/
diff --git a/tests/drivers/uart/uart_basic_api/src/main.c b/tests/drivers/uart/uart_basic_api/src/main.c
index 5f73d91922d..f599f429c7a 100644
--- a/tests/drivers/uart/uart_basic_api/src/main.c
+++ b/tests/drivers/uart/uart_basic_api/src/main.c
@@ -11,7 +11,7 @@
  * @}
  */
 
-#include <usb/usb_device.h>
+#include <zephyr/usb/usb_device.h>
 #include "test_uart.h"
 
 #ifdef CONFIG_SHELL
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 141e0e25216..554821b386e 100644
--- a/tests/drivers/uart/uart_basic_api/src/test_uart.h
+++ b/tests/drivers/uart/uart_basic_api/src/test_uart.h
@@ -15,7 +15,7 @@
 #ifndef __TEST_UART_H__
 #define __TEST_UART_H__
 
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <ztest.h>
 
 void test_uart_configure(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 20224fab244..1923cc2138f 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
+++ b/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
@@ -11,10 +11,10 @@
  * @}
  */
 
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <ztest.h>
-#include <drivers/counter.h>
-#include <random/rand32.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/random/rand32.h>
 /* RX and TX pins have to be connected together*/
 
 #if defined(CONFIG_BOARD_NRF52840DK_NRF52840)
diff --git a/tests/drivers/uart/uart_pm/src/main.c b/tests/drivers/uart/uart_pm/src/main.c
index 1c2f81857a8..7394b8b673f 100644
--- a/tests/drivers/uart/uart_pm/src/main.c
+++ b/tests/drivers/uart/uart_pm/src/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/uart.h>
-#include <device.h>
-#include <pm/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/device.h>
 #include <ztest.h>
 
 #if defined(CONFIG_BOARD_NRF52840DK_NRF52840)
diff --git a/tests/drivers/virtualization/ivshmem/src/ivshmem.c b/tests/drivers/virtualization/ivshmem/src/ivshmem.c
index b87dd87c947..af6c3919373 100644
--- a/tests/drivers/virtualization/ivshmem/src/ivshmem.c
+++ b/tests/drivers/virtualization/ivshmem/src/ivshmem.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
-#include <drivers/virtualization/ivshmem.h>
+#include <zephyr/drivers/virtualization/ivshmem.h>
 
 void test_ivshmem_plain(void)
 {
diff --git a/tests/drivers/watchdog/wdt_basic_api/src/main.c b/tests/drivers/watchdog/wdt_basic_api/src/main.c
index a792a87efa2..e74a9bc4d66 100644
--- a/tests/drivers/watchdog/wdt_basic_api/src/main.c
+++ b/tests/drivers/watchdog/wdt_basic_api/src/main.c
@@ -12,7 +12,7 @@
  * @}
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include "test_wdt.h"
 
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 c429789e599..e396595b59f 100644
--- a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
+++ b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
@@ -57,8 +57,8 @@
  * @}
  */
 
-#include <drivers/watchdog.h>
-#include <zephyr.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include "test_wdt.h"
 
diff --git a/tests/kernel/common/src/atomic.c b/tests/kernel/common/src/atomic.c
index 2587c2acfb5..317cd0412cd 100644
--- a/tests/kernel/common/src/atomic.c
+++ b/tests/kernel/common/src/atomic.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <sys/atomic.h>
+#include <zephyr/sys/atomic.h>
 
 /* convenience macro - return either 64-bit or 32-bit value */
 #define ATOMIC_WORD(val_if_64, val_if_32)                                                          \
diff --git a/tests/kernel/common/src/bitarray.c b/tests/kernel/common/src/bitarray.c
index 65b4321168f..563296ebbb0 100644
--- a/tests/kernel/common/src/bitarray.c
+++ b/tests/kernel/common/src/bitarray.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 #include <tc_util.h>
-#include <sys/bitarray.h>
-#include <sys/util.h>
+#include <zephyr/sys/bitarray.h>
+#include <zephyr/sys/util.h>
 
 #ifdef CONFIG_BIG_ENDIAN
 #define BIT_INDEX(bit)  ((3 - ((bit >> 3) & 0x3)) + 4*(bit >> 5))
diff --git a/tests/kernel/common/src/bitfield.c b/tests/kernel/common/src/bitfield.c
index 3058c192f00..02c7caf21f2 100644
--- a/tests/kernel/common/src/bitfield.c
+++ b/tests/kernel/common/src/bitfield.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 #include <tc_util.h>
 
diff --git a/tests/kernel/common/src/byteorder.c b/tests/kernel/common/src/byteorder.c
index 82a48fdbc8f..f175f3eb0ee 100644
--- a/tests/kernel/common/src/byteorder.c
+++ b/tests/kernel/common/src/byteorder.c
@@ -7,7 +7,7 @@
 
 #include <ztest.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 /**
  * @addtogroup kernel_common_tests
diff --git a/tests/kernel/common/src/errno.c b/tests/kernel/common/src/errno.c
index 1a3ae08180a..8c76edca71e 100644
--- a/tests/kernel/common/src/errno.c
+++ b/tests/kernel/common/src/errno.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
 
 /**
diff --git a/tests/kernel/common/src/irq_offload.c b/tests/kernel/common/src/irq_offload.c
index de406d03afe..e1da27d095f 100644
--- a/tests/kernel/common/src/irq_offload.c
+++ b/tests/kernel/common/src/irq_offload.c
@@ -12,10 +12,10 @@
  * context, on the IRQ stack.
  *
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <kernel_structs.h>
-#include <irq_offload.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/irq_offload.h>
 
 volatile uint32_t sentinel;
 #define SENTINEL_VALUE 0xDEADBEEF
diff --git a/tests/kernel/common/src/main.c b/tests/kernel/common/src/main.c
index 6bf1197a497..3e645b17370 100644
--- a/tests/kernel/common/src/main.c
+++ b/tests/kernel/common/src/main.c
@@ -6,8 +6,8 @@
 
 
 #include <ztest.h>
-#include <kernel_version.h>
-#include <sys/speculation.h>
+#include <zephyr/kernel_version.h>
+#include <zephyr/sys/speculation.h>
 #include "version.h"
 
 extern void test_byteorder_memcpy_swap(void);
diff --git a/tests/kernel/common/src/multilib.c b/tests/kernel/common/src/multilib.c
index 68133ed7f6f..dfe8e00665e 100644
--- a/tests/kernel/common/src/multilib.c
+++ b/tests/kernel/common/src/multilib.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
 #include <tc_util.h>
 #include <ztest.h>
diff --git a/tests/kernel/common/src/timeout_order.c b/tests/kernel/common/src/timeout_order.c
index 4306117f041..d03d1279c53 100644
--- a/tests/kernel/common/src/timeout_order.c
+++ b/tests/kernel/common/src/timeout_order.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys/printk.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
 #include <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 4a2ccfb561d..59afb18f106 100644
--- a/tests/kernel/condvar/condvar_api/src/main.c
+++ b/tests/kernel/condvar/condvar_api/src/main.c
@@ -6,7 +6,7 @@
 
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 #include <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 9bf0a57c569..c5e65453af3 100644
--- a/tests/kernel/context/src/main.c
+++ b/tests/kernel/context/src/main.c
@@ -21,10 +21,10 @@
  */
 
 #include <ztest.h>
-#include <kernel_structs.h>
-#include <arch/cpu.h>
-#include <irq_offload.h>
-#include <sys_clock.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/sys_clock.h>
 
 /*
  * Include soc.h from platform to get IRQ number.
diff --git a/tests/kernel/device/src/abstract_driver.c b/tests/kernel/device/src/abstract_driver.c
index 983e4e8b179..412dbbdaeab 100644
--- a/tests/kernel/device/src/abstract_driver.c
+++ b/tests/kernel/device/src/abstract_driver.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include "abstract_driver.h"
 
 #define MY_DRIVER_A	"my_driver_A"
diff --git a/tests/kernel/device/src/abstract_driver.h b/tests/kernel/device/src/abstract_driver.h
index ad785444c92..6471e4fda8c 100644
--- a/tests/kernel/device/src/abstract_driver.h
+++ b/tests/kernel/device/src/abstract_driver.h
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <device.h>
+#include <zephyr/device.h>
 
 /* define subsystem common API for drivers */
 typedef int (*subsystem_do_this_t)(const struct device *device, int foo,
diff --git a/tests/kernel/device/src/bad_driver.c b/tests/kernel/device/src/bad_driver.c
index 5e1fbb7a41a..701e13cb396 100644
--- a/tests/kernel/device/src/bad_driver.c
+++ b/tests/kernel/device/src/bad_driver.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 
 
 #define BAD_DRIVER_NAME	"bad_driver"
diff --git a/tests/kernel/device/src/dummy_driver.c b/tests/kernel/device/src/dummy_driver.c
index 8c1ba9ba116..e6f8dfe65de 100644
--- a/tests/kernel/device/src/dummy_driver.c
+++ b/tests/kernel/device/src/dummy_driver.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 
 
 #define DUMMY_DRIVER_NAME	"dummy_driver"
diff --git a/tests/kernel/device/src/main.c b/tests/kernel/device/src/main.c
index cd62e3090ca..d487ea5e64b 100644
--- a/tests/kernel/device/src/main.c
+++ b/tests/kernel/device/src/main.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <ztest.h>
-#include <sys/printk.h>
-#include <linker/sections.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 4ebbd4f3145..053f917f7e9 100644
--- a/tests/kernel/device/src/mmio.c
+++ b/tests/kernel/device/src/mmio.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <device.h>
+#include <zephyr/device.h>
 
 #define DT_DRV_COMPAT	fakedriver
 
diff --git a/tests/kernel/device/src/test_driver_init.c b/tests/kernel/device/src/test_driver_init.c
index 0b3401f69b5..9a5a620ae8c 100644
--- a/tests/kernel/device/src/test_driver_init.c
+++ b/tests/kernel/device/src/test_driver_init.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <ztest.h>
-#include <linker/sections.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 e5d186cfd9f..0768e1e4396 100644
--- a/tests/kernel/early_sleep/src/main.c
+++ b/tests/kernel/early_sleep/src/main.c
@@ -24,9 +24,9 @@
  * @}
  */
 
-#include <init.h>
-#include <arch/cpu.h>
-#include <sys_clock.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys_clock.h>
 #include <stdbool.h>
 #include <tc_util.h>
 #include <ztest.h>
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 c989383d988..25dba85277d 100644
--- a/tests/kernel/events/event_api/src/test_event_apis.c
+++ b/tests/kernel/events/event_api/src/test_event_apis.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <wait_q.h>
+#include <zephyr/wait_q.h>
 
 #define DELAY          K_MSEC(50)
 #define SHORT_TIMEOUT  K_MSEC(100)
diff --git a/tests/kernel/fatal/exception/src/main.c b/tests/kernel/fatal/exception/src/main.c
index 914d286ce8c..61098e67c00 100644
--- a/tests/kernel/fatal/exception/src/main.c
+++ b/tests/kernel/fatal/exception/src/main.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <tc_util.h>
-#include <kernel_structs.h>
-#include <irq_offload.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/irq_offload.h>
 #include <kswap.h>
 #include <assert.h>
 
 #if defined(CONFIG_USERSPACE)
-#include <sys/mem_manage.h>
-#include <syscall_handler.h>
+#include <zephyr/sys/mem_manage.h>
+#include <zephyr/syscall_handler.h>
 #include "test_syscalls.h"
 #endif
 
diff --git a/tests/kernel/fatal/exception/src/test_syscalls.h b/tests/kernel/fatal/exception/src/test_syscalls.h
index a3b337228b9..4c090002768 100644
--- a/tests/kernel/fatal/exception/src/test_syscalls.h
+++ b/tests/kernel/fatal/exception/src/test_syscalls.h
@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 __syscall void blow_up_priv_stack(void);
 
diff --git a/tests/kernel/fatal/message_capture/src/main.c b/tests/kernel/fatal/message_capture/src/main.c
index 95a38fbba75..adc1bc5e734 100644
--- a/tests/kernel/fatal/message_capture/src/main.c
+++ b/tests/kernel/fatal/message_capture/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
 static volatile int expected_reason = -1;
 
diff --git a/tests/kernel/fatal/no-multithreading/src/main.c b/tests/kernel/fatal/no-multithreading/src/main.c
index 7287357e0c4..0ccbb0d6915 100644
--- a/tests/kernel/fatal/no-multithreading/src/main.c
+++ b/tests/kernel/fatal/no-multithreading/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <tc_util.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <assert.h>
 
diff --git a/tests/kernel/fifo/fifo_api/src/test_fifo.h b/tests/kernel/fifo/fifo_api/src/test_fifo.h
index ff4182944ea..8b415662efe 100644
--- a/tests/kernel/fifo/fifo_api/src/test_fifo.h
+++ b/tests/kernel/fifo/fifo_api/src/test_fifo.h
@@ -8,7 +8,7 @@
 #define __TEST_FIFO_H__
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 
 typedef struct fdata {
 	sys_snode_t snode;
diff --git a/tests/kernel/fifo/fifo_timeout/src/main.c b/tests/kernel/fifo/fifo_timeout/src/main.c
index 2b778ed5aee..7541c8ce6a2 100644
--- a/tests/kernel/fifo/fifo_timeout/src/main.c
+++ b/tests/kernel/fifo/fifo_timeout/src/main.c
@@ -5,9 +5,9 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
 
 /*
  * @file
diff --git a/tests/kernel/fifo/fifo_usage/src/main.c b/tests/kernel/fifo/fifo_usage/src/main.c
index 3e573cdc2d7..88e3e17bb6c 100644
--- a/tests/kernel/fifo/fifo_usage/src/main.c
+++ b/tests/kernel/fifo/fifo_usage/src/main.c
@@ -33,7 +33,7 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 
 #define STACK_SIZE	(1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define LIST_LEN	4
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 b9dcc103a4e..a378ae34266 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
@@ -150,9 +150,9 @@ void test_k_float_disable_syscall(void)
 
 #if defined(CONFIG_ARM) && defined(CONFIG_DYNAMIC_INTERRUPTS)
 
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 #if defined(CONFIG_CPU_CORTEX_M)
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #else
 #include <interrupt_util.h>
 #endif
diff --git a/tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h b/tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h
index b4d91e3e84b..564a5b4a0c1 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h
@@ -16,7 +16,7 @@
 #error __FILE__ goes only with ARC GCC
 #endif
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include "float_context.h"
 
 /**
diff --git a/tests/kernel/fpu_sharing/generic/src/float_regs_arm64_gcc.h b/tests/kernel/fpu_sharing/generic/src/float_regs_arm64_gcc.h
index a582d41fa05..c2939738d79 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_regs_arm64_gcc.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_regs_arm64_gcc.h
@@ -12,7 +12,7 @@
 #ifndef _FLOAT_REGS_ARM64_GCC_H
 #define _FLOAT_REGS_ARM64_GCC_H
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include "float_context.h"
 
 /**
diff --git a/tests/kernel/fpu_sharing/generic/src/float_regs_arm_gcc.h b/tests/kernel/fpu_sharing/generic/src/float_regs_arm_gcc.h
index a82f2f5cf5d..49d3e20e373 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_regs_arm_gcc.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_regs_arm_gcc.h
@@ -17,7 +17,7 @@
 #error __FILE__ goes only with ARM GCC
 #endif
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include "float_context.h"
 
 /**
diff --git a/tests/kernel/fpu_sharing/generic/src/float_regs_riscv_gcc.h b/tests/kernel/fpu_sharing/generic/src/float_regs_riscv_gcc.h
index 758dccd7f12..60d46f9f57c 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_regs_riscv_gcc.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_regs_riscv_gcc.h
@@ -16,7 +16,7 @@
 #error __FILE__ goes only with RISCV GCC
 #endif
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include "float_context.h"
 
 #ifdef CONFIG_CPU_HAS_FPU_DOUBLE_PRECISION
diff --git a/tests/kernel/fpu_sharing/generic/src/float_regs_sparc.h b/tests/kernel/fpu_sharing/generic/src/float_regs_sparc.h
index a898908e941..a0457d54593 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_regs_sparc.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_regs_sparc.h
@@ -7,7 +7,7 @@
 #ifndef _FLOAT_REGS_SPARC_H
 #define _FLOAT_REGS_SPARC_H
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include "float_context.h"
 
 static inline void _load_all_float_registers(struct fp_register_set *regs)
diff --git a/tests/kernel/fpu_sharing/generic/src/float_regs_x86_gcc.h b/tests/kernel/fpu_sharing/generic/src/float_regs_x86_gcc.h
index 0795d173f61..eac75169bed 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_regs_x86_gcc.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_regs_x86_gcc.h
@@ -16,7 +16,7 @@
 #error __FILE__ goes only with x86 GCC
 #endif
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include "float_context.h"
 
 /**
diff --git a/tests/kernel/fpu_sharing/generic/src/load_store.c b/tests/kernel/fpu_sharing/generic/src/load_store.c
index 3927b05a888..872be6101e4 100644
--- a/tests/kernel/fpu_sharing/generic/src/load_store.c
+++ b/tests/kernel/fpu_sharing/generic/src/load_store.c
@@ -36,7 +36,7 @@
  */
 
 #include <ztest.h>
-#include <debug/gcov.h>
+#include <zephyr/debug/gcov.h>
 
 #if defined(CONFIG_X86)
 #if defined(__GNUC__)
diff --git a/tests/kernel/gen_isr_table/src/main.c b/tests/kernel/gen_isr_table/src/main.c
index be4394218a2..a0cd56a6a51 100644
--- a/tests/kernel/gen_isr_table/src/main.c
+++ b/tests/kernel/gen_isr_table/src/main.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <irq.h>
+#include <zephyr/irq.h>
 #include <tc_util.h>
-#include <sw_isr_table.h>
+#include <zephyr/sw_isr_table.h>
 #include <interrupt_util.h>
 
 extern uint32_t _irq_vector_table[];
diff --git a/tests/kernel/interrupt/src/interrupt_offload.c b/tests/kernel/interrupt/src/interrupt_offload.c
index c740ca0e414..21c60215dd1 100644
--- a/tests/kernel/interrupt/src/interrupt_offload.c
+++ b/tests/kernel/interrupt/src/interrupt_offload.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 #include <interrupt_util.h>
 
 #define STACK_SIZE	1024
diff --git a/tests/kernel/lifo/lifo_api/src/test_lifo.h b/tests/kernel/lifo/lifo_api/src/test_lifo.h
index 35469040b7d..c3f1c2874c6 100644
--- a/tests/kernel/lifo/lifo_api/src/test_lifo.h
+++ b/tests/kernel/lifo/lifo_api/src/test_lifo.h
@@ -8,7 +8,7 @@
 #define __TEST_LIFO_H__
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 
 typedef struct ldata {
 	sys_snode_t snode;
diff --git a/tests/kernel/lifo/lifo_usage/src/lifo_usage.h b/tests/kernel/lifo/lifo_usage/src/lifo_usage.h
index 1e53493d961..c250bb98cd4 100644
--- a/tests/kernel/lifo/lifo_usage/src/lifo_usage.h
+++ b/tests/kernel/lifo/lifo_usage/src/lifo_usage.h
@@ -6,7 +6,7 @@
 
 #ifndef __TEST_LIFO_USAGE_H__
 #define __TEST_LIFO_USAGE_H__
-#include <sys/slist.h>
+#include <zephyr/sys/slist.h>
 
 typedef struct ldata {
 	sys_snode_t snode;
diff --git a/tests/kernel/lifo/lifo_usage/src/main.c b/tests/kernel/lifo/lifo_usage/src/main.c
index 210c66905af..e0c4158f21f 100644
--- a/tests/kernel/lifo/lifo_usage/src/main.c
+++ b/tests/kernel/lifo/lifo_usage/src/main.c
@@ -6,7 +6,7 @@
 
 #include <ztest.h>
 #include "lifo_usage.h"
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #define STACK_SIZE (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define LIST_LEN 2
diff --git a/tests/kernel/mbox/mbox_usage/src/main.c b/tests/kernel/mbox/mbox_usage/src/main.c
index 6ccb8103225..28ab4b82dc9 100644
--- a/tests/kernel/mbox/mbox_usage/src/main.c
+++ b/tests/kernel/mbox/mbox_usage/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define MAIL_LEN 64
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 a8081993990..9cafc82ade4 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
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 #include "test_kheap.h"
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
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 7d663e11a8d..44048b39b92 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
@@ -6,8 +6,8 @@
 
 #include <ztest.h>
 #include <kernel_internal.h>
-#include <irq_offload.h>
-#include <sys/multi_heap.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/sys/multi_heap.h>
 #include "test_mheap.h"
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
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 8c8b1c0cbf5..d190c8d67d5 100644
--- a/tests/kernel/mem_heap/shared_multi_heap/src/main.c
+++ b/tests/kernel/mem_heap/shared_multi_heap/src/main.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <linker/linker-defs.h>
-#include <sys/mem_manage.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/sys/mem_manage.h>
 
-#include <multi_heap/shared_multi_heap.h>
+#include <zephyr/multi_heap/shared_multi_heap.h>
 
 #define DT_DRV_COMPAT		zephyr_memory_region
 
diff --git a/tests/kernel/mem_protect/demand_paging/src/main.c b/tests/kernel/mem_protect/demand_paging/src/main.c
index e9a1b2cc959..7d722bf0d47 100644
--- a/tests/kernel/mem_protect/demand_paging/src/main.c
+++ b/tests/kernel/mem_protect/demand_paging/src/main.c
@@ -5,10 +5,10 @@
  */
 
 #include <ztest.h>
-#include <sys/mem_manage.h>
-#include <timing/timing.h>
+#include <zephyr/sys/mem_manage.h>
+#include <zephyr/timing/timing.h>
 #include <mmu.h>
-#include <linker/sections.h>
+#include <zephyr/linker/sections.h>
 
 #ifdef CONFIG_BACKING_STORE_RAM_PAGES
 #define EXTRA_PAGES	(CONFIG_BACKING_STORE_RAM_PAGES - 1)
diff --git a/tests/kernel/mem_protect/futex/src/main.c b/tests/kernel/mem_protect/futex/src/main.c
index e6d2cb647d0..eae9434f598 100644
--- a/tests/kernel/mem_protect/futex/src/main.c
+++ b/tests/kernel/mem_protect/futex/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
-#include <sys/mutex.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 7309f14f268..059eb0db176 100644
--- a/tests/kernel/mem_protect/mem_map/src/main.c
+++ b/tests/kernel/mem_protect/mem_map/src/main.c
@@ -5,10 +5,10 @@
  */
 
 #include <ztest.h>
-#include <sys/mem_manage.h>
-#include <toolchain.h>
+#include <zephyr/sys/mem_manage.h>
+#include <zephyr/toolchain.h>
 #include <mmu.h>
-#include <linker/sections.h>
+#include <zephyr/linker/sections.h>
 
 /* 32-bit IA32 page tables have no mechanism to restrict execution */
 #if defined(CONFIG_X86) && !defined(CONFIG_X86_64) && !defined(CONFIG_X86_PAE)
diff --git a/tests/kernel/mem_protect/mem_protect/src/common.c b/tests/kernel/mem_protect/mem_protect/src/common.c
index 70b60f830b4..581c7472c92 100644
--- a/tests/kernel/mem_protect/mem_protect/src/common.c
+++ b/tests/kernel/mem_protect/mem_protect/src/common.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 ZTEST_BMEM volatile bool valid_fault;
diff --git a/tests/kernel/mem_protect/mem_protect/src/inherit.c b/tests/kernel/mem_protect/mem_protect/src/inherit.c
index 708376f381a..a0df0d78fa5 100644
--- a/tests/kernel/mem_protect/mem_protect/src/inherit.c
+++ b/tests/kernel/mem_protect/mem_protect/src/inherit.c
@@ -5,8 +5,8 @@
  */
 
 #include "mem_protect.h"
-#include <syscall_handler.h>
-#include <sys/libc-hooks.h> /* for z_libc_partition */
+#include <zephyr/syscall_handler.h>
+#include <zephyr/sys/libc-hooks.h> /* for z_libc_partition */
 
 /* function prototypes */
 static inline void dummy_start(struct k_timer *timer)
diff --git a/tests/kernel/mem_protect/mem_protect/src/kobject.c b/tests/kernel/mem_protect/mem_protect/src/kobject.c
index 8a59b93efc5..2f87e254739 100644
--- a/tests/kernel/mem_protect/mem_protect/src/kobject.c
+++ b/tests/kernel/mem_protect/mem_protect/src/kobject.c
@@ -5,7 +5,7 @@
  */
 
 #include "mem_protect.h"
-#include <syscall_handler.h>
+#include <zephyr/syscall_handler.h>
 
 /* Kernel objects */
 
diff --git a/tests/kernel/mem_protect/mem_protect/src/main.c b/tests/kernel/mem_protect/mem_protect/src/main.c
index 715268b8058..b72fb312be3 100644
--- a/tests/kernel/mem_protect/mem_protect/src/main.c
+++ b/tests/kernel/mem_protect/mem_protect/src/main.c
@@ -7,9 +7,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <string.h>
 #include <stdlib.h>
 #include "mem_protect.h"
diff --git a/tests/kernel/mem_protect/mem_protect/src/mem_domain.c b/tests/kernel/mem_protect/mem_protect/src/mem_domain.c
index 919236531e6..1eb97868821 100644
--- a/tests/kernel/mem_protect/mem_protect/src/mem_domain.c
+++ b/tests/kernel/mem_protect/mem_protect/src/mem_domain.c
@@ -6,7 +6,7 @@
 
 #include "mem_protect.h"
 #include <kernel_internal.h> /* For z_main_thread */
-#include <sys/libc-hooks.h> /* for z_libc_partition */
+#include <zephyr/sys/libc-hooks.h> /* for z_libc_partition */
 
 static struct k_thread child_thread;
 static K_THREAD_STACK_DEFINE(child_stack, 512 + CONFIG_TEST_EXTRA_STACK_SIZE);
diff --git a/tests/kernel/mem_protect/mem_protect/src/mem_partition.c b/tests/kernel/mem_protect/mem_protect/src/mem_partition.c
index 95a4d65f697..9709c9e99cb 100644
--- a/tests/kernel/mem_protect/mem_protect/src/mem_partition.c
+++ b/tests/kernel/mem_protect/mem_protect/src/mem_partition.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include "mem_protect.h"
 
 /* Add volatile to disable pre-calculation in compile stage in some
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 4991cbca2e8..d6d2d7f8210 100644
--- a/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
+++ b/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <kernel_structs.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 bbaaedc3b87..dc84b4d00b0 100644
--- a/tests/kernel/mem_protect/obj_validation/src/main.c
+++ b/tests/kernel/mem_protect/obj_validation/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <syscall_handler.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/syscall_handler.h>
 #include <ztest.h>
 #include <kernel_internal.h>
 
diff --git a/tests/kernel/mem_protect/protection/src/main.c b/tests/kernel/mem_protect/protection/src/main.c
index 933de4e5403..ddbbc05dc6e 100644
--- a/tests/kernel/mem_protect/protection/src/main.c
+++ b/tests/kernel/mem_protect/protection/src/main.c
@@ -7,9 +7,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <string.h>
 #include <stdlib.h>
 
@@ -34,7 +34,7 @@ void k_sys_fatal_error_handler(unsigned int reason, const z_arch_esf_t *pEsf)
 }
 
 #ifdef CONFIG_CPU_CORTEX_M
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 /* Must clear LSB of function address to access as data. */
 #define FUNC_TO_PTR(x) (void *)((uintptr_t)(x) & ~0x1)
 /* Must set LSB of function address to call in Thumb mode. */
diff --git a/tests/kernel/mem_protect/protection/src/targets.c b/tests/kernel/mem_protect/protection/src/targets.c
index 5a86be94be3..21c83b4ba12 100644
--- a/tests/kernel/mem_protect/protection/src/targets.c
+++ b/tests/kernel/mem_protect/protection/src/targets.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
 #include "targets.h"
 
diff --git a/tests/kernel/mem_protect/stack_random/src/main.c b/tests/kernel/mem_protect/stack_random/src/main.c
index b62a03dfc1d..e22caa1d498 100644
--- a/tests/kernel/mem_protect/stack_random/src/main.c
+++ b/tests/kernel/mem_protect/stack_random/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define STACKSIZE       2048
 #define THREAD_COUNT	64
diff --git a/tests/kernel/mem_protect/stackprot/src/main.c b/tests/kernel/mem_protect/stackprot/src/main.c
index a659006fdac..0cb1fb02114 100644
--- a/tests/kernel/mem_protect/stackprot/src/main.c
+++ b/tests/kernel/mem_protect/stackprot/src/main.c
@@ -6,7 +6,7 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 
diff --git a/tests/kernel/mem_protect/sys_sem/src/main.c b/tests/kernel/mem_protect/sys_sem/src/main.c
index 195260df10e..d9e8c91b06b 100644
--- a/tests/kernel/mem_protect/sys_sem/src/main.c
+++ b/tests/kernel/mem_protect/sys_sem/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
-#include <sys/sem.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/sys/sem.h>
 
 /* Macro declarations */
 #define SEM_INIT_VAL (0U)
diff --git a/tests/kernel/mem_protect/syscalls/src/main.c b/tests/kernel/mem_protect/syscalls/src/main.c
index a3211c4522f..f0d3c05b0d7 100644
--- a/tests/kernel/mem_protect/syscalls/src/main.c
+++ b/tests/kernel/mem_protect/syscalls/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <syscall_handler.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/syscall_handler.h>
 #include <ztest.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 #include "test_syscalls.h"
 #include <mmu.h>
 
diff --git a/tests/kernel/mem_protect/syscalls/src/test_syscalls.h b/tests/kernel/mem_protect/syscalls/src/test_syscalls.h
index 2c5d4db6f72..a5f2424cb57 100644
--- a/tests/kernel/mem_protect/syscalls/src/test_syscalls.h
+++ b/tests/kernel/mem_protect/syscalls/src/test_syscalls.h
@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 __syscall int string_alloc_copy(char *src);
 
diff --git a/tests/kernel/mem_protect/userspace/src/main.c b/tests/kernel/mem_protect/userspace/src/main.c
index c28b8eec6e3..fee1a449add 100644
--- a/tests/kernel/mem_protect/userspace/src/main.c
+++ b/tests/kernel/mem_protect/userspace/src/main.c
@@ -7,20 +7,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <string.h>
 #include <stdlib.h>
-#include <app_memory/app_memdomain.h>
-#include <sys/util.h>
-#include <debug/stack.h>
-#include <syscall_handler.h>
+#include <zephyr/app_memory/app_memdomain.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/syscall_handler.h>
 #include "test_syscall.h"
-#include <sys/libc-hooks.h> /* for z_libc_partition */
+#include <zephyr/sys/libc-hooks.h> /* for z_libc_partition */
 
 #if defined(CONFIG_ARC)
-#include <arch/arc/v2/mpu/arc_core_mpu.h>
+#include <zephyr/arch/arc/v2/mpu/arc_core_mpu.h>
 #endif
 
 #if defined(CONFIG_ARM)
@@ -281,7 +281,7 @@ static void test_write_kernram(void)
 
 extern int _k_neg_eagain;
 
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 
 /**
  * @brief Test to write kernel RO
diff --git a/tests/kernel/mem_slab/mslab/src/main.c b/tests/kernel/mem_slab/mslab/src/main.c
index 8f9b466934d..98a0d7c7da6 100644
--- a/tests/kernel/mem_slab/mslab/src/main.c
+++ b/tests/kernel/mem_slab/mslab/src/main.c
@@ -25,7 +25,7 @@
 
 #include <tc_util.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 /* size of stack area used by each thread */
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 75ed4ee9282..fd4e67bca96 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
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <sys/atomic.h>
+#include <zephyr/sys/atomic.h>
 
 #define LOOP 10
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/mp/src/main.c b/tests/kernel/mp/src/main.c
index 908e8df0d6f..d0bc5c55a7f 100644
--- a/tests/kernel/mp/src/main.c
+++ b/tests/kernel/mp/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <tc_util.h>
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #ifdef CONFIG_SMP
 #error Cannot test MP API if SMP is using the CPUs
diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq.h b/tests/kernel/msgq/msgq_api/src/test_msgq.h
index 78a2a27a479..eae397d2b58 100644
--- a/tests/kernel/msgq/msgq_api/src/test_msgq.h
+++ b/tests/kernel/msgq/msgq_api/src/test_msgq.h
@@ -7,8 +7,8 @@
 #ifndef __TEST_MSGQ_H__
 #define __TEST_MSGQ_H__
 
-#include <zephyr.h>
-#include <irq_offload.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/irq_offload.h>
 #include <ztest.h>
 #include <limits.h>
 
diff --git a/tests/kernel/msgq/msgq_usage/src/main.c b/tests/kernel/msgq/msgq_usage/src/main.c
index 9efbb9457ae..cf6a9db49c5 100644
--- a/tests/kernel/msgq/msgq_usage/src/main.c
+++ b/tests/kernel/msgq/msgq_usage/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <irq_offload.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/irq_offload.h>
 #include <ztest.h>
 #include <limits.h>
 
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 d49043e9be6..1289776bf43 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
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 #include <ztest_error_hook.h>
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/mutex/sys_mutex/src/main.c b/tests/kernel/mutex/sys_mutex/src/main.c
index 92d2c9774b1..b1054dd7a56 100644
--- a/tests/kernel/mutex/sys_mutex/src/main.c
+++ b/tests/kernel/mutex/sys_mutex/src/main.c
@@ -46,9 +46,9 @@
  */
 
 #include <tc_util.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <sys/mutex.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 3257533be3f..0cb10440dff 100644
--- a/tests/kernel/mutex/sys_mutex/src/thread_12.c
+++ b/tests/kernel/mutex/sys_mutex/src/thread_12.c
@@ -16,8 +16,8 @@
  */
 
 #include <tc_util.h>
-#include <zephyr.h>
-#include <sys/mutex.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/mutex.h>
 
 static int tc_rc = TC_PASS;         /* test case return code */
 
diff --git a/tests/kernel/mutex/sys_mutex/src/thread_competition.c b/tests/kernel/mutex/sys_mutex/src/thread_competition.c
index ee20c9deecd..5ff6125201d 100644
--- a/tests/kernel/mutex/sys_mutex/src/thread_competition.c
+++ b/tests/kernel/mutex/sys_mutex/src/thread_competition.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <sys/mutex.h>
+#include <zephyr/sys/mutex.h>
 
 #define HIGH_T1	 0xaaa
 #define HIGH_T2	 0xbbb
diff --git a/tests/kernel/pending/src/main.c b/tests/kernel/pending/src/main.c
index d1cbda1d69d..2656eff7f44 100644
--- a/tests/kernel/pending/src/main.c
+++ b/tests/kernel/pending/src/main.c
@@ -5,10 +5,10 @@
  */
 
 #include <tc_util.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <stdbool.h>
 
 #define  NUM_SECONDS(x)      ((x) * 1000)
diff --git a/tests/kernel/poll/src/test_poll.c b/tests/kernel/poll/src/test_poll.c
index 6cb3875bfa0..389641cdf21 100644
--- a/tests/kernel/poll/src/test_poll.c
+++ b/tests/kernel/poll/src/test_poll.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 /* global values and data structures */
 struct fifo_msg {
diff --git a/tests/kernel/poll/src/test_poll_fail.c b/tests/kernel/poll/src/test_poll_fail.c
index 26d717d95b6..ca9874154f8 100644
--- a/tests/kernel/poll/src/test_poll_fail.c
+++ b/tests/kernel/poll/src/test_poll_fail.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ztest_error_hook.h>
 
 static struct k_poll_signal signal_err;
diff --git a/tests/kernel/profiling/profiling_api/src/main.c b/tests/kernel/profiling/profiling_api/src/main.c
index a6d2da69cca..700370d19d7 100644
--- a/tests/kernel/profiling/profiling_api/src/main.c
+++ b/tests/kernel/profiling/profiling_api/src/main.c
@@ -5,9 +5,9 @@
  */
 
 #include <ztest.h>
-#include <pm/pm.h>
-#include <irq_offload.h>
-#include <debug/stack.h>
+#include <zephyr/pm/pm.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/debug/stack.h>
 
 #define SLEEP_MS 100
 #define NUM_OF_WORK 2
diff --git a/tests/kernel/queue/src/test_queue.h b/tests/kernel/queue/src/test_queue.h
index cd157dbaf39..6015064876c 100644
--- a/tests/kernel/queue/src/test_queue.h
+++ b/tests/kernel/queue/src/test_queue.h
@@ -8,7 +8,7 @@
 #define __TEST_FIFO_H__
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 #include <ztest_error_hook.h>
 
 extern void test_queue_thread2thread(void);
diff --git a/tests/kernel/sched/deadline/src/main.c b/tests/kernel/sched/deadline/src/main.c
index 4f2c95396eb..12c187c710f 100644
--- a/tests/kernel/sched/deadline/src/main.c
+++ b/tests/kernel/sched/deadline/src/main.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
 #define NUM_THREADS 8
 /* this should be large enough for us
diff --git a/tests/kernel/sched/metairq/src/main.c b/tests/kernel/sched/metairq/src/main.c
index 6b0dba0d586..9ad26b701e2 100644
--- a/tests/kernel/sched/metairq/src/main.c
+++ b/tests/kernel/sched/metairq/src/main.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 /*
  * Test that meta-IRQs return to the cooperative thread they preempted.
diff --git a/tests/kernel/sched/preempt/src/main.c b/tests/kernel/sched/preempt/src/main.c
index 37f4c3c2fc6..2960019e006 100644
--- a/tests/kernel/sched/preempt/src/main.c
+++ b/tests/kernel/sched/preempt/src/main.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <irq_offload.h>
-#include <kernel_structs.h> /* for _THREAD_PENDING */
+#include <zephyr/irq_offload.h>
+#include <zephyr/kernel_structs.h> /* for _THREAD_PENDING */
 
 /* Explicit preemption test.  Works by creating a set of threads in
  * each priority class (cooperative, preemptive, metairq) which all go
diff --git a/tests/kernel/sched/schedule_api/src/test_sched.h b/tests/kernel/sched/schedule_api/src/test_sched.h
index 1de3b9b7918..fcccf0c1258 100644
--- a/tests/kernel/sched/schedule_api/src/test_sched.h
+++ b/tests/kernel/sched/schedule_api/src/test_sched.h
@@ -7,7 +7,7 @@
 #ifndef __TEST_SCHED_H__
 #define __TEST_SCHED_H__
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #define MAX_NUM_THREAD 10
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 1a17b03b639..12370652e6d 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
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 #include "test_sched.h"
 
 /* local variables */
diff --git a/tests/kernel/sched/schedule_api/src/user_api.c b/tests/kernel/sched/schedule_api/src/user_api.c
index fecfd8217e0..58c0683c8d8 100644
--- a/tests/kernel/sched/schedule_api/src/user_api.c
+++ b/tests/kernel/sched/schedule_api/src/user_api.c
@@ -6,7 +6,7 @@
 
 #include "test_sched.h"
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 #include <kernel_internal.h>
 #include <ztest_error_hook.h>
 
diff --git a/tests/kernel/semaphore/semaphore/src/main.c b/tests/kernel/semaphore/semaphore/src/main.c
index d7f7914b6bc..8c13d7791c4 100644
--- a/tests/kernel/semaphore/semaphore/src/main.c
+++ b/tests/kernel/semaphore/semaphore/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 #include <ztest_error_hook.h>
 
 /* Macro declarations */
diff --git a/tests/kernel/sleep/src/main.c b/tests/kernel/sleep/src/main.c
index ab29b776ad4..1a900981ec8 100644
--- a/tests/kernel/sleep/src/main.c
+++ b/tests/kernel/sleep/src/main.c
@@ -6,9 +6,9 @@
 
 #include <tc_util.h>
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <sys/util.h>
-#include <irq_offload.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/irq_offload.h>
 #include <stdbool.h>
 
 #if defined(CONFIG_ASSERT) && defined(CONFIG_DEBUG)
diff --git a/tests/kernel/sleep/src/usleep.c b/tests/kernel/sleep/src/usleep.c
index 569656807c0..a8e87ad9f0e 100644
--- a/tests/kernel/sleep/src/usleep.c
+++ b/tests/kernel/sleep/src/usleep.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 /*
  * precision timing tests in an emulation environment are not reliable.
diff --git a/tests/kernel/smp/src/main.c b/tests/kernel/smp/src/main.c
index c5dcb16cfae..de587054bf8 100644
--- a/tests/kernel/smp/src/main.c
+++ b/tests/kernel/smp/src/main.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <tc_util.h>
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 
 #if CONFIG_MP_NUM_CPUS < 2
 #error SMP test requires at least two CPUs!
diff --git a/tests/kernel/smp_boot_delay/src/main.c b/tests/kernel/smp_boot_delay/src/main.c
index 06a23ba382c..115a54d5379 100644
--- a/tests/kernel/smp_boot_delay/src/main.c
+++ b/tests/kernel/smp_boot_delay/src/main.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 /* Experimentally 10ms is enough time to get the second CPU to run on
diff --git a/tests/kernel/spinlock/src/main.c b/tests/kernel/spinlock/src/main.c
index 3f6cccf95ec..759c9570fdc 100644
--- a/tests/kernel/spinlock/src/main.c
+++ b/tests/kernel/spinlock/src/main.c
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <tc_util.h>
 #include <ztest.h>
-#include <kernel.h>
-#include <spinlock.h>
+#include <zephyr/kernel.h>
+#include <zephyr/spinlock.h>
 
 BUILD_ASSERT(CONFIG_MP_NUM_CPUS > 1);
 
diff --git a/tests/kernel/spinlock/src/spinlock_error_case.c b/tests/kernel/spinlock/src/spinlock_error_case.c
index 7e5d97d9462..f3767a8243e 100644
--- a/tests/kernel/spinlock/src/spinlock_error_case.c
+++ b/tests/kernel/spinlock/src/spinlock_error_case.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <spinlock.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 fd6b2c03ff7..46f100c3815 100644
--- a/tests/kernel/stack/stack/src/main.c
+++ b/tests/kernel/stack/stack/src/main.c
@@ -42,7 +42,7 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 
 #define TSTACK_SIZE     (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define STACK_LEN       4
diff --git a/tests/kernel/stack/stack/src/test_stack_contexts.c b/tests/kernel/stack/stack/src/test_stack_contexts.c
index 141d4592711..bfdaea2f876 100644
--- a/tests/kernel/stack/stack/src/test_stack_contexts.c
+++ b/tests/kernel/stack/stack/src/test_stack_contexts.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define STACK_LEN 4
 #define HIGH_T1			0xaaa
diff --git a/tests/kernel/stack/stack/src/test_stack_fail.c b/tests/kernel/stack/stack/src/test_stack_fail.c
index 9ffcf6d9e06..a6085be8eac 100644
--- a/tests/kernel/stack/stack/src/test_stack_fail.c
+++ b/tests/kernel/stack/stack/src/test_stack_fail.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 #include <ztest_error_hook.h>
 
 #define TIMEOUT K_MSEC(100)
diff --git a/tests/kernel/threads/dynamic_thread/src/main.c b/tests/kernel/threads/dynamic_thread/src/main.c
index b279fda96fc..169b336a696 100644
--- a/tests/kernel/threads/dynamic_thread/src/main.c
+++ b/tests/kernel/threads/dynamic_thread/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
-#include <debug/stack.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/debug/stack.h>
 
 #define STACKSIZE (256 + CONFIG_TEST_EXTRA_STACK_SIZE)
 
diff --git a/tests/kernel/threads/no-multithreading/src/main.c b/tests/kernel/threads/no-multithreading/src/main.c
index a724cf1d404..c127342cb1b 100644
--- a/tests/kernel/threads/no-multithreading/src/main.c
+++ b/tests/kernel/threads/no-multithreading/src/main.c
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #include <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 5f504fb5d9d..e1a952fbea8 100644
--- a/tests/kernel/threads/thread_apis/src/main.c
+++ b/tests/kernel/threads/thread_apis/src/main.c
@@ -14,8 +14,8 @@
  */
 
 #include <ztest.h>
-#include <kernel_structs.h>
-#include <kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
 #include <string.h>
 #include <ksched.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 ae82bd1e73a..416a46674da 100644
--- a/tests/kernel/threads/thread_apis/src/test_essential_thread.c
+++ b/tests/kernel/threads/thread_apis/src/test_essential_thread.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 
 struct k_thread kthread_thread;
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 4e89751faa5..4a1c6f17784 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
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
-#include <debug/stack.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/debug/stack.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 7399e1550e2..5b430751629 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
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include "tests_thread_apis.h"
 
diff --git a/tests/kernel/threads/thread_apis/src/tests_thread_apis.h b/tests/kernel/threads/thread_apis/src/tests_thread_apis.h
index 9c62e1308be..ef5e112e43b 100644
--- a/tests/kernel/threads/thread_apis/src/tests_thread_apis.h
+++ b/tests/kernel/threads/thread_apis/src/tests_thread_apis.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_TESTS_KERNEL_THREADS_THREAD_APIS_SRC_TEST_THREAD_APIS_H_
 #define ZEPHYR_TESTS_KERNEL_THREADS_THREAD_APIS_SRC_TEST_THREAD_APIS_H_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/tests/kernel/threads/thread_stack/src/main.c b/tests/kernel/threads/thread_stack/src/main.c
index 65781aca38e..586b8a702a6 100644
--- a/tests/kernel/threads/thread_stack/src/main.c
+++ b/tests/kernel/threads/thread_stack/src/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <syscall_handler.h>
+#include <zephyr/syscall_handler.h>
 #include <kernel_internal.h>
 
 #include "test_syscall.h"
diff --git a/tests/kernel/threads/tls/src/main.c b/tests/kernel/threads/tls/src/main.c
index 9fc10d8b4d2..ce0a0d5780d 100644
--- a/tests/kernel/threads/tls/src/main.c
+++ b/tests/kernel/threads/tls/src/main.c
@@ -5,11 +5,11 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
-#include <kernel_structs.h>
-#include <app_memory/app_memdomain.h>
-#include <sys/libc-hooks.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/app_memory/app_memdomain.h>
+#include <zephyr/sys/libc-hooks.h>
+#include <zephyr/sys/util.h>
 
 #define NUM_THREADS	3
 #define STACK_SIZE	(512 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/tickless/tickless_concept/src/main.c b/tests/kernel/tickless/tickless_concept/src/main.c
index 0f4d5bd4dd0..ca94dc5ebf1 100644
--- a/tests/kernel/tickless/tickless_concept/src/main.c
+++ b/tests/kernel/tickless/tickless_concept/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <pm/pm.h>
+#include <zephyr/pm/pm.h>
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define NUM_THREAD 4
diff --git a/tests/kernel/timer/cycle64/src/main.c b/tests/kernel/timer/cycle64/src/main.c
index 432e154f9d0..74dbb9a6623 100644
--- a/tests/kernel/timer/cycle64/src/main.c
+++ b/tests/kernel/timer/cycle64/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.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 59d213d1076..aad5619c876 100644
--- a/tests/kernel/timer/starve/src/main.c
+++ b/tests/kernel/timer/starve/src/main.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <tc_util.h>
 #include <ztest.h>
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 #define STAMP_INTERVAL_s 60
 #define TIMER_DELAY_ms 500
diff --git a/tests/kernel/timer/timer_api/src/timer_convert.c b/tests/kernel/timer/timer_api/src/timer_convert.c
index 6a96e58f320..2eb44fbd87b 100644
--- a/tests/kernel/timer/timer_api/src/timer_convert.c
+++ b/tests/kernel/timer/timer_api/src/timer_convert.c
@@ -5,8 +5,8 @@
  */
 #include <ztest.h>
 #include <zephyr/types.h>
-#include <sys/time_units.h>
-#include <random/rand32.h>
+#include <zephyr/sys/time_units.h>
+#include <zephyr/random/rand32.h>
 
 #define NUM_RANDOM 100
 
diff --git a/tests/kernel/timer/timer_error_case/src/main.c b/tests/kernel/timer/timer_error_case/src/main.c
index 002c3511e43..3aabf438583 100644
--- a/tests/kernel/timer/timer_error_case/src/main.c
+++ b/tests/kernel/timer/timer_error_case/src/main.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <ztest.h>
 #include <zephyr/types.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 #include <ztest_error_hook.h>
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/kernel/timer/timer_monotonic/src/main.c b/tests/kernel/timer/timer_monotonic/src/main.c
index a99372e8660..1e186ae1cb9 100644
--- a/tests/kernel/timer/timer_monotonic/src/main.c
+++ b/tests/kernel/timer/timer_monotonic/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <tc_util.h>
 #include <ztest.h>
 
diff --git a/tests/kernel/workq/critical/src/main.c b/tests/kernel/workq/critical/src/main.c
index e337f986aaf..29e01d6f613 100644
--- a/tests/kernel/workq/critical/src/main.c
+++ b/tests/kernel/workq/critical/src/main.c
@@ -24,8 +24,8 @@
  * @{
  * @}
  */
-#include <zephyr.h>
-#include <linker/sections.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/linker/sections.h>
 #include <ztest.h>
 
 #define NUM_MILLISECONDS        50
diff --git a/tests/kernel/workq/user_work/src/main.c b/tests/kernel/workq/user_work/src/main.c
index 8824f96cb12..d49ac941ed7 100644
--- a/tests/kernel/workq/user_work/src/main.c
+++ b/tests/kernel/workq/user_work/src/main.c
@@ -13,7 +13,7 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
 #define NUM_OF_WORK 2
diff --git a/tests/kernel/workq/work/src/main.c b/tests/kernel/workq/work/src/main.c
index 3a598be86e4..7ac2c163cb4 100644
--- a/tests/kernel/workq/work/src/main.c
+++ b/tests/kernel/workq/work/src/main.c
@@ -7,7 +7,7 @@
 /* This test covers deprecated API.  Avoid inappropriate diagnostics
  * about the use of that API.
  */
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #undef __deprecated
 #define __deprecated
 #undef __DEPRECATED_MACRO
diff --git a/tests/kernel/workq/work_queue/src/main.c b/tests/kernel/workq/work_queue/src/main.c
index c5e74901f98..175b0b3a4ce 100644
--- a/tests/kernel/workq/work_queue/src/main.c
+++ b/tests/kernel/workq/work_queue/src/main.c
@@ -9,16 +9,16 @@
 /* This test covers deprecated API.  Avoid inappropriate diagnostics
  * about the use of that API.
  */
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #undef __deprecated
 #define __deprecated
 #undef __DEPRECATED_MACRO
 #define __DEPRECATED_MACRO
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <tc_util.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define NUM_TEST_ITEMS          6
 /* Each work item takes 100ms */
diff --git a/tests/lib/c_lib/src/main.c b/tests/lib/c_lib/src/main.c
index 74861c0e5ed..6db7a639c88 100644
--- a/tests/lib/c_lib/src/main.c
+++ b/tests/lib/c_lib/src/main.c
@@ -15,8 +15,8 @@
  * it guarantee that ALL functionality provided is working correctly.
  */
 
-#include <zephyr.h>
-#include <sys/__assert.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/__assert.h>
 #include <ztest.h>
 
 #include <limits.h>
diff --git a/tests/lib/cbprintf_fp/src/main.c b/tests/lib/cbprintf_fp/src/main.c
index e39aee411fb..5d690978076 100644
--- a/tests/lib/cbprintf_fp/src/main.c
+++ b/tests/lib/cbprintf_fp/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #if defined(CONFIG_APP_FORMATTER_PRINTK)
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #define PRINT_S "printk"
 #define PRINT(...) printk(__VA_ARGS__)
 #elif defined(CONFIG_APP_FORMATTER_PRINTF)
@@ -17,7 +17,7 @@
 #endif /* NEWLIB_LIBC */
 #define PRINT(...) printf(__VA_ARGS__)
 #elif defined(CONFIG_APP_FORMATTER_PRINTFCB)
-#include <sys/cbprintf.h>
+#include <zephyr/sys/cbprintf.h>
 #ifdef CONFIG_NEWLIB_LIBC
 #define PRINT_S "printfcb/newlib"
 #else /* NEWLIB_LIBC */
@@ -29,7 +29,7 @@
 #define PRINT_S "fprintf"
 #define PRINT(...) fprintf(stdout, __VA_ARGS__)
 #elif defined(CONFIG_APP_FORMATTER_FPRINTFCB)
-#include <sys/cbprintf.h>
+#include <zephyr/sys/cbprintf.h>
 #define PRINT_S "fprintfcb"
 #define PRINT(...) fprintfcb(stdout, __VA_ARGS__)
 #else
diff --git a/tests/lib/cbprintf_package/src/main.c b/tests/lib/cbprintf_package/src/main.c
index 15e67ce25b7..99474d72dcc 100644
--- a/tests/lib/cbprintf_package/src/main.c
+++ b/tests/lib/cbprintf_package/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <sys/cbprintf.h>
-#include <linker/utils.h>
+#include <zephyr/sys/cbprintf.h>
+#include <zephyr/linker/utils.h>
 
 #define CBPRINTF_DEBUG 1
 
diff --git a/tests/lib/cmsis_dsp/basicmath/src/f16.c b/tests/lib/cmsis_dsp/basicmath/src/f16.c
index a92de32a393..a35cdcfd4e6 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/f16.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/basicmath/src/f32.c b/tests/lib/cmsis_dsp/basicmath/src/f32.c
index a0b5a3a68c3..dc10fbee8d8 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q15.c b/tests/lib/cmsis_dsp/basicmath/src/q15.c
index 36c3654e3c4..a685f05fd32 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q15.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q31.c b/tests/lib/cmsis_dsp/basicmath/src/q31.c
index a6a8262fb43..937bc7e9d3a 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q31.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q7.c b/tests/lib/cmsis_dsp/basicmath/src/q7.c
index 399c12fdfe6..b2b353469ec 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q7.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/bayes/src/f16.c b/tests/lib/cmsis_dsp/bayes/src/f16.c
index 1534b6626a5..366b7f518f4 100644
--- a/tests/lib/cmsis_dsp/bayes/src/f16.c
+++ b/tests/lib/cmsis_dsp/bayes/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/bayes/src/f32.c b/tests/lib/cmsis_dsp/bayes/src/f32.c
index 9226d4523f9..060cc41e7ec 100644
--- a/tests/lib/cmsis_dsp/bayes/src/f32.c
+++ b/tests/lib/cmsis_dsp/bayes/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/common/test_common.h b/tests/lib/cmsis_dsp/common/test_common.h
index 9832d835f6b..f2a5e74b16c 100644
--- a/tests/lib/cmsis_dsp/common/test_common.h
+++ b/tests/lib/cmsis_dsp/common/test_common.h
@@ -9,7 +9,7 @@
 #define ZEPHYR_TESTS_LIB_CMSIS_DSP_COMMON_TEST_COMMON_H_
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #ifdef CONFIG_CMSIS_DSP_FLOAT16
diff --git a/tests/lib/cmsis_dsp/complexmath/src/f16.c b/tests/lib/cmsis_dsp/complexmath/src/f16.c
index f62b736adc5..d83102da929 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/f16.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/complexmath/src/f32.c b/tests/lib/cmsis_dsp/complexmath/src/f32.c
index 1db50aec03f..18e511c51c0 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/complexmath/src/q15.c b/tests/lib/cmsis_dsp/complexmath/src/q15.c
index a4bf149b9b7..11f618ca4bc 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/q15.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/complexmath/src/q31.c b/tests/lib/cmsis_dsp/complexmath/src/q31.c
index ec8b5126f19..680afc81678 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/q31.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/distance/src/f16.c b/tests/lib/cmsis_dsp/distance/src/f16.c
index b686f251600..50bf87af285 100644
--- a/tests/lib/cmsis_dsp/distance/src/f16.c
+++ b/tests/lib/cmsis_dsp/distance/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/distance/src/f32.c b/tests/lib/cmsis_dsp/distance/src/f32.c
index 192981a287f..c88bcb81c32 100644
--- a/tests/lib/cmsis_dsp/distance/src/f32.c
+++ b/tests/lib/cmsis_dsp/distance/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/distance/src/u32.c b/tests/lib/cmsis_dsp/distance/src/u32.c
index c85c168777f..d39d6f01919 100644
--- a/tests/lib/cmsis_dsp/distance/src/u32.c
+++ b/tests/lib/cmsis_dsp/distance/src/u32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/fastmath/src/f16.c b/tests/lib/cmsis_dsp/fastmath/src/f16.c
index d8440ec2ec5..0c346b44623 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/f16.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/fastmath/src/f32.c b/tests/lib/cmsis_dsp/fastmath/src/f32.c
index d32d5321129..4f4f91867a7 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/fastmath/src/q15.c b/tests/lib/cmsis_dsp/fastmath/src/q15.c
index 929cf8415e2..23b07bf6d48 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/q15.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/fastmath/src/q31.c b/tests/lib/cmsis_dsp/fastmath/src/q31.c
index da7c7e48273..648d6afdc3c 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/q31.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_f16.c b/tests/lib/cmsis_dsp/filtering/src/biquad_f16.c
index f33f417af47..e551b51a22e 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_f16.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c b/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c
index 2e0c465eeaa..090575b8884 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c b/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c
index a0fe336521b..bf8cdb309ea 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_q15.c b/tests/lib/cmsis_dsp/filtering/src/biquad_q15.c
index 473c347a5a8..9645960ec3e 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_q31.c b/tests/lib/cmsis_dsp/filtering/src/biquad_q31.c
index 44535832a15..ba9dbc55def 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/decim_f32.c b/tests/lib/cmsis_dsp/filtering/src/decim_f32.c
index ea805d13f47..b4d7e6603d1 100644
--- a/tests/lib/cmsis_dsp/filtering/src/decim_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/decim_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/decim_q15.c b/tests/lib/cmsis_dsp/filtering/src/decim_q15.c
index e7f931dacfa..6b2c5b9567e 100644
--- a/tests/lib/cmsis_dsp/filtering/src/decim_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/decim_q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/decim_q31.c b/tests/lib/cmsis_dsp/filtering/src/decim_q31.c
index 73c12f30794..7d7a3ae24ec 100644
--- a/tests/lib/cmsis_dsp/filtering/src/decim_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/decim_q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_f16.c b/tests/lib/cmsis_dsp/filtering/src/fir_f16.c
index fe3ee371f67..f579cdca3b4 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_f16.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_f32.c b/tests/lib/cmsis_dsp/filtering/src/fir_f32.c
index 344638af87c..4985f60e514 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_q15.c b/tests/lib/cmsis_dsp/filtering/src/fir_q15.c
index a366abd7cdc..b1924269d78 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_q31.c b/tests/lib/cmsis_dsp/filtering/src/fir_q31.c
index 704545c7b19..c91119dbdc7 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_q7.c b/tests/lib/cmsis_dsp/filtering/src/fir_q7.c
index b24ddffda8b..b5bbf64ad97 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_q7.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/main.c b/tests/lib/cmsis_dsp/filtering/src/main.c
index 1bccee276d3..cb3aa7bed59 100644
--- a/tests/lib/cmsis_dsp/filtering/src/main.c
+++ b/tests/lib/cmsis_dsp/filtering/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 extern void test_filtering_biquad_q15(void);
 extern void test_filtering_biquad_q31(void);
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_f16.c b/tests/lib/cmsis_dsp/filtering/src/misc_f16.c
index dd116569f55..c69733a39c7 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_f16.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_f32.c b/tests/lib/cmsis_dsp/filtering/src/misc_f32.c
index bc8f40096a0..bc7a8b52c6e 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_q15.c b/tests/lib/cmsis_dsp/filtering/src/misc_q15.c
index c6468feafd4..09c051ae4e9 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_q31.c b/tests/lib/cmsis_dsp/filtering/src/misc_q31.c
index 5a471b6cb13..890e6b87343 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_q7.c b/tests/lib/cmsis_dsp/filtering/src/misc_q7.c
index e3f0e445aeb..b9d4ed58860 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_q7.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/interpolation/src/f16.c b/tests/lib/cmsis_dsp/interpolation/src/f16.c
index 216965086ba..20e288d2bbf 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/f16.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/interpolation/src/f32.c b/tests/lib/cmsis_dsp/interpolation/src/f32.c
index bed9523d1b6..7675b3da8ff 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/f32.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/interpolation/src/main.c b/tests/lib/cmsis_dsp/interpolation/src/main.c
index 8d71dad531c..a8423818c08 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/main.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 extern void test_interpolation_q7(void);
 extern void test_interpolation_q15(void);
diff --git a/tests/lib/cmsis_dsp/interpolation/src/q15.c b/tests/lib/cmsis_dsp/interpolation/src/q15.c
index 71caa7d01ba..9537dc587a0 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/q15.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/interpolation/src/q31.c b/tests/lib/cmsis_dsp/interpolation/src/q31.c
index 42a0923ce7f..cafae262907 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/q31.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/interpolation/src/q7.c b/tests/lib/cmsis_dsp/interpolation/src/q7.c
index 967ed4df03f..7285a9f0eb6 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/q7.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_f16.c b/tests/lib/cmsis_dsp/matrix/src/binary_f16.c
index ce2d611456a..6ce5b3d8979 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_f16.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_f32.c b/tests/lib/cmsis_dsp/matrix/src/binary_f32.c
index 0419ea50103..078d6f3b5b5 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_f32.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_f64.c b/tests/lib/cmsis_dsp/matrix/src/binary_f64.c
index d01918bb55d..1ef9c753efe 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_f64.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_f64.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_q15.c b/tests/lib/cmsis_dsp/matrix/src/binary_q15.c
index 3c26cfc47d1..95fa7119f18 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_q15.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_q31.c b/tests/lib/cmsis_dsp/matrix/src/binary_q31.c
index abd46e2ccec..42d4b72b234 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_q31.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_q7.c b/tests/lib/cmsis_dsp/matrix/src/binary_q7.c
index 9f5f5196489..0ac2d0748d9 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_q7.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/main.c b/tests/lib/cmsis_dsp/matrix/src/main.c
index f28b52884c1..526a83e5e4f 100644
--- a/tests/lib/cmsis_dsp/matrix/src/main.c
+++ b/tests/lib/cmsis_dsp/matrix/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 extern void test_matrix_unary_q7(void);
 extern void test_matrix_unary_q15(void);
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_f16.c b/tests/lib/cmsis_dsp/matrix/src/unary_f16.c
index c8a48d26852..88905260650 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_f16.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_f32.c b/tests/lib/cmsis_dsp/matrix/src/unary_f32.c
index 162eefaf977..631d0cb8661 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_f32.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_f64.c b/tests/lib/cmsis_dsp/matrix/src/unary_f64.c
index 8a446ae06fd..0ad7a6bbbef 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_f64.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_f64.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_q15.c b/tests/lib/cmsis_dsp/matrix/src/unary_q15.c
index 6a53256ec8e..3d633c0c948 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_q15.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_q31.c b/tests/lib/cmsis_dsp/matrix/src/unary_q31.c
index dca2776a935..936f7dc405b 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_q31.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_q7.c b/tests/lib/cmsis_dsp/matrix/src/unary_q7.c
index c91b37e87c1..5fb1e135541 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_q7.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/quaternionmath/src/f32.c b/tests/lib/cmsis_dsp/quaternionmath/src/f32.c
index db52dd31e6c..d77fcbdb7c6 100644
--- a/tests/lib/cmsis_dsp/quaternionmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/quaternionmath/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/quaternionmath/src/main.c b/tests/lib/cmsis_dsp/quaternionmath/src/main.c
index 97fa2ee7f35..1d6af74bb98 100644
--- a/tests/lib/cmsis_dsp/quaternionmath/src/main.c
+++ b/tests/lib/cmsis_dsp/quaternionmath/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 extern void test_quaternionmath_f32(void);
 
diff --git a/tests/lib/cmsis_dsp/statistics/src/f16.c b/tests/lib/cmsis_dsp/statistics/src/f16.c
index 6317b1d42f6..578c407dd5f 100644
--- a/tests/lib/cmsis_dsp/statistics/src/f16.c
+++ b/tests/lib/cmsis_dsp/statistics/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/statistics/src/f32.c b/tests/lib/cmsis_dsp/statistics/src/f32.c
index e88d0db0a71..5f1ac337d29 100644
--- a/tests/lib/cmsis_dsp/statistics/src/f32.c
+++ b/tests/lib/cmsis_dsp/statistics/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/statistics/src/f64.c b/tests/lib/cmsis_dsp/statistics/src/f64.c
index aff533ef5dd..802af682f33 100644
--- a/tests/lib/cmsis_dsp/statistics/src/f64.c
+++ b/tests/lib/cmsis_dsp/statistics/src/f64.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/statistics/src/main.c b/tests/lib/cmsis_dsp/statistics/src/main.c
index a1c0c0ea6ce..078f759398d 100644
--- a/tests/lib/cmsis_dsp/statistics/src/main.c
+++ b/tests/lib/cmsis_dsp/statistics/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 extern void test_statistics_q7(void);
 extern void test_statistics_q15(void);
diff --git a/tests/lib/cmsis_dsp/statistics/src/q15.c b/tests/lib/cmsis_dsp/statistics/src/q15.c
index 72ee792c3e5..63aa1f231d1 100644
--- a/tests/lib/cmsis_dsp/statistics/src/q15.c
+++ b/tests/lib/cmsis_dsp/statistics/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/statistics/src/q31.c b/tests/lib/cmsis_dsp/statistics/src/q31.c
index 86a1a67e41f..efc3eff9be7 100644
--- a/tests/lib/cmsis_dsp/statistics/src/q31.c
+++ b/tests/lib/cmsis_dsp/statistics/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/statistics/src/q7.c b/tests/lib/cmsis_dsp/statistics/src/q7.c
index 0c1c5f5ca02..6848605a025 100644
--- a/tests/lib/cmsis_dsp/statistics/src/q7.c
+++ b/tests/lib/cmsis_dsp/statistics/src/q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/barycenter_f16.c b/tests/lib/cmsis_dsp/support/src/barycenter_f16.c
index 9245d1bec97..1603ae732eb 100644
--- a/tests/lib/cmsis_dsp/support/src/barycenter_f16.c
+++ b/tests/lib/cmsis_dsp/support/src/barycenter_f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/barycenter_f32.c b/tests/lib/cmsis_dsp/support/src/barycenter_f32.c
index 60d466c564b..e3abdcb2990 100644
--- a/tests/lib/cmsis_dsp/support/src/barycenter_f32.c
+++ b/tests/lib/cmsis_dsp/support/src/barycenter_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/f16.c b/tests/lib/cmsis_dsp/support/src/f16.c
index 04b6081a3c5..0a110300d98 100644
--- a/tests/lib/cmsis_dsp/support/src/f16.c
+++ b/tests/lib/cmsis_dsp/support/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/f32.c b/tests/lib/cmsis_dsp/support/src/f32.c
index d3c13ff4e0a..14086a4f208 100644
--- a/tests/lib/cmsis_dsp/support/src/f32.c
+++ b/tests/lib/cmsis_dsp/support/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/main.c b/tests/lib/cmsis_dsp/support/src/main.c
index d2ef12e37eb..7ddaa4231cd 100644
--- a/tests/lib/cmsis_dsp/support/src/main.c
+++ b/tests/lib/cmsis_dsp/support/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 extern void test_support_q7(void);
 extern void test_support_q15(void);
diff --git a/tests/lib/cmsis_dsp/support/src/q15.c b/tests/lib/cmsis_dsp/support/src/q15.c
index 3b7f0b319b6..1c589a0fdd2 100644
--- a/tests/lib/cmsis_dsp/support/src/q15.c
+++ b/tests/lib/cmsis_dsp/support/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/q31.c b/tests/lib/cmsis_dsp/support/src/q31.c
index 1603b880864..dfc73154953 100644
--- a/tests/lib/cmsis_dsp/support/src/q31.c
+++ b/tests/lib/cmsis_dsp/support/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/q7.c b/tests/lib/cmsis_dsp/support/src/q7.c
index cfbb527c85f..233362c77e1 100644
--- a/tests/lib/cmsis_dsp/support/src/q7.c
+++ b/tests/lib/cmsis_dsp/support/src/q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/svm/src/f16.c b/tests/lib/cmsis_dsp/svm/src/f16.c
index fb3ee74b2e6..414dfbe718f 100644
--- a/tests/lib/cmsis_dsp/svm/src/f16.c
+++ b/tests/lib/cmsis_dsp/svm/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/svm/src/f32.c b/tests/lib/cmsis_dsp/svm/src/f32.c
index aadfd1465da..54710e5722d 100644
--- a/tests/lib/cmsis_dsp/svm/src/f32.c
+++ b/tests/lib/cmsis_dsp/svm/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/svm/src/main.c b/tests/lib/cmsis_dsp/svm/src/main.c
index 2467bccdb50..59ef657ae91 100644
--- a/tests/lib/cmsis_dsp/svm/src/main.c
+++ b/tests/lib/cmsis_dsp/svm/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 extern void test_svm_f16(void);
 extern void test_svm_f32(void);
diff --git a/tests/lib/cmsis_dsp/transform/src/cf16.c b/tests/lib/cmsis_dsp/transform/src/cf16.c
index 6173b9eb028..d5627f75ef7 100644
--- a/tests/lib/cmsis_dsp/transform/src/cf16.c
+++ b/tests/lib/cmsis_dsp/transform/src/cf16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/cf32.c b/tests/lib/cmsis_dsp/transform/src/cf32.c
index 2879d87771f..6ba6993376f 100644
--- a/tests/lib/cmsis_dsp/transform/src/cf32.c
+++ b/tests/lib/cmsis_dsp/transform/src/cf32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/cf64.c b/tests/lib/cmsis_dsp/transform/src/cf64.c
index 65bda073b45..a303d1c32cb 100644
--- a/tests/lib/cmsis_dsp/transform/src/cf64.c
+++ b/tests/lib/cmsis_dsp/transform/src/cf64.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/cq15.c b/tests/lib/cmsis_dsp/transform/src/cq15.c
index 631ead54495..031da33bdd7 100644
--- a/tests/lib/cmsis_dsp/transform/src/cq15.c
+++ b/tests/lib/cmsis_dsp/transform/src/cq15.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/cq31.c b/tests/lib/cmsis_dsp/transform/src/cq31.c
index 46c5776c387..5caf25030a6 100644
--- a/tests/lib/cmsis_dsp/transform/src/cq31.c
+++ b/tests/lib/cmsis_dsp/transform/src/cq31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/main.c b/tests/lib/cmsis_dsp/transform/src/main.c
index cfb39054fce..4eba19c2c4a 100644
--- a/tests/lib/cmsis_dsp/transform/src/main.c
+++ b/tests/lib/cmsis_dsp/transform/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 extern void test_transform_cq15(void);
 extern void test_transform_rq15(void);
diff --git a/tests/lib/cmsis_dsp/transform/src/rf16.c b/tests/lib/cmsis_dsp/transform/src/rf16.c
index bb0cc4596af..782b8b76d07 100644
--- a/tests/lib/cmsis_dsp/transform/src/rf16.c
+++ b/tests/lib/cmsis_dsp/transform/src/rf16.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/rf32.c b/tests/lib/cmsis_dsp/transform/src/rf32.c
index 68965b1bc30..4ac15471cea 100644
--- a/tests/lib/cmsis_dsp/transform/src/rf32.c
+++ b/tests/lib/cmsis_dsp/transform/src/rf32.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/rf64.c b/tests/lib/cmsis_dsp/transform/src/rf64.c
index ca055181094..3a005abcf53 100644
--- a/tests/lib/cmsis_dsp/transform/src/rf64.c
+++ b/tests/lib/cmsis_dsp/transform/src/rf64.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/rq15.c b/tests/lib/cmsis_dsp/transform/src/rq15.c
index 78a4a441aea..7282a669ac9 100644
--- a/tests/lib/cmsis_dsp/transform/src/rq15.c
+++ b/tests/lib/cmsis_dsp/transform/src/rq15.c
@@ -22,7 +22,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/rq31.c b/tests/lib/cmsis_dsp/transform/src/rq31.c
index 81f7207b40b..6373f022058 100644
--- a/tests/lib/cmsis_dsp/transform/src/rq31.c
+++ b/tests/lib/cmsis_dsp/transform/src/rq31.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_nn/src/main.c b/tests/lib/cmsis_nn/src/main.c
index 350b49ba417..1b7193b1193 100644
--- a/tests/lib/cmsis_nn/src/main.c
+++ b/tests/lib/cmsis_nn/src/main.c
@@ -11,7 +11,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 
 #include "arm_nnfunctions.h"
diff --git a/tests/lib/devicetree/api/src/main.c b/tests/lib/devicetree/api/src/main.c
index e821829f4f8..7373d07b814 100644
--- a/tests/lib/devicetree/api/src/main.c
+++ b/tests/lib/devicetree/api/src/main.c
@@ -5,10 +5,10 @@
  */
 
 #include <ztest.h>
-#include <devicetree.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/mbox.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/mbox.h>
 
 #define TEST_CHILDREN	DT_PATH(test, test_children)
 #define TEST_DEADBEEF	DT_PATH(test, gpio_deadbeef)
diff --git a/tests/lib/devicetree/api_ext/src/main.c b/tests/lib/devicetree/api_ext/src/main.c
index ee9dc05e594..b5abeabde47 100644
--- a/tests/lib/devicetree/api_ext/src/main.c
+++ b/tests/lib/devicetree/api_ext/src/main.c
@@ -6,11 +6,11 @@
  */
 
 #include <ztest.h>
-#include <devicetree.h>
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 
-#include <linker/devicetree_regions.h>
+#include <zephyr/linker/devicetree_regions.h>
 
 #define TEST_SRAM1      DT_NODELABEL(test_sram1)
 #define TEST_SRAM2      DT_NODELABEL(test_sram2)
diff --git a/tests/lib/devicetree/devices/src/main.c b/tests/lib/devicetree/devices/src/main.c
index 5759af2890d..2e6f52f79eb 100644
--- a/tests/lib/devicetree/devices/src/main.c
+++ b/tests/lib/devicetree/devices/src/main.c
@@ -5,9 +5,9 @@
  */
 
 #include <ztest.h>
-#include <devicetree.h>
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 
 #define TEST_GPIO DT_NODELABEL(test_gpio_0)
 #define TEST_I2C DT_NODELABEL(test_i2c)
diff --git a/tests/lib/devicetree/memory_region/src/main.c b/tests/lib/devicetree/memory_region/src/main.c
index 3245436c6fb..1fe7cf679c1 100644
--- a/tests/lib/devicetree/memory_region/src/main.c
+++ b/tests/lib/devicetree/memory_region/src/main.c
@@ -5,10 +5,10 @@
  */
 
 #include <ztest.h>
-#include <devicetree.h>
-#include <device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/device.h>
 
-#include <linker/devicetree_regions.h>
+#include <zephyr/linker/devicetree_regions.h>
 
 #define TEST_SRAM_NODE	DT_NODELABEL(test_sram)
 #define TEST_SRAM_SECT	LINKER_DT_NODE_REGION_NAME(TEST_SRAM_NODE)
diff --git a/tests/lib/fdtable/src/main.c b/tests/lib/fdtable/src/main.c
index bb97556b3a0..d7bddbe3d0e 100644
--- a/tests/lib/fdtable/src/main.c
+++ b/tests/lib/fdtable/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
-#include <sys/fdtable.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/fdtable.h>
 #include <errno.h>
 
 /* The thread will test that the refcounting of fd object will
diff --git a/tests/lib/gui/lvgl/src/img.c b/tests/lib/gui/lvgl/src/img.c
index be430628622..b549a07c81a 100644
--- a/tests/lib/gui/lvgl/src/img.c
+++ b/tests/lib/gui/lvgl/src/img.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include "img.h"
 
 static const uint8_t img_data[] = {
diff --git a/tests/lib/gui/lvgl/src/main.c b/tests/lib/gui/lvgl/src/main.c
index b4c9a9ed014..82233128e43 100644
--- a/tests/lib/gui/lvgl/src/main.c
+++ b/tests/lib/gui/lvgl/src/main.c
@@ -6,10 +6,10 @@
 
 #include "img.h"
 
-#include <zephyr.h>
-#include <device.h>
-#include <fs/fs.h>
-#include <fs/littlefs.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/fs/fs.h>
+#include <zephyr/fs/littlefs.h>
 #include <ztest.h>
 
 #include <lvgl.h>
diff --git a/tests/lib/heap/src/main.c b/tests/lib/heap/src/main.c
index 2134613c11f..419bd4f0e61 100644
--- a/tests/lib/heap/src/main.c
+++ b/tests/lib/heap/src/main.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <sys/sys_heap.h>
-#include <sys/heap_listener.h>
+#include <zephyr/sys/sys_heap.h>
+#include <zephyr/sys/heap_listener.h>
 #include <inttypes.h>
 
 /* Guess at a value for heap size based on available memory on the
diff --git a/tests/lib/heap_align/src/main.c b/tests/lib/heap_align/src/main.c
index 4b6376fc44f..4e46e805de5 100644
--- a/tests/lib/heap_align/src/main.c
+++ b/tests/lib/heap_align/src/main.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <sys/sys_heap.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 1626812f39d..a3fce8027f4 100644
--- a/tests/lib/json/src/main.c
+++ b/tests/lib/json/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/types.h>
 #include <stdbool.h>
 #include <ztest.h>
-#include <data/json.h>
+#include <zephyr/data/json.h>
 
 struct test_nested {
 	int nested_int;
diff --git a/tests/lib/mem_alloc/src/main.c b/tests/lib/mem_alloc/src/main.c
index 33ba50558d3..a3b7b8b48f6 100644
--- a/tests/lib/mem_alloc/src/main.c
+++ b/tests/lib/mem_alloc/src/main.c
@@ -16,7 +16,7 @@
  * it guarantee that ALL functionality provided is working correctly.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/tests/lib/mem_blocks/src/main.c b/tests/lib/mem_blocks/src/main.c
index fe769763395..7b0a9476380 100644
--- a/tests/lib/mem_blocks/src/main.c
+++ b/tests/lib/mem_blocks/src/main.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
-#include <sys/heap_listener.h>
-#include <sys/mem_blocks.h>
-#include <sys/util.h>
+#include <zephyr/sys/heap_listener.h>
+#include <zephyr/sys/mem_blocks.h>
+#include <zephyr/sys/util.h>
 
 #define BLK_SZ     64
 #define NUM_BLOCKS 8
diff --git a/tests/lib/mpsc_pbuf/src/main.c b/tests/lib/mpsc_pbuf/src/main.c
index 7dd633e2315..a755d89a236 100644
--- a/tests/lib/mpsc_pbuf/src/main.c
+++ b/tests/lib/mpsc_pbuf/src/main.c
@@ -9,13 +9,13 @@
  * @brief Test log message
  */
 
-#include <sys/mpsc_pbuf.h>
+#include <zephyr/sys/mpsc_pbuf.h>
 
 #include <tc_util.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
 #define PUT_EXT_LEN \
 	((sizeof(union mpsc_pbuf_generic) + sizeof(void *)) / sizeof(uint32_t))
diff --git a/tests/lib/newlib/heap_listener/src/main.c b/tests/lib/newlib/heap_listener/src/main.c
index 53e3b3fca4f..747bc8d2706 100644
--- a/tests/lib/newlib/heap_listener/src/main.c
+++ b/tests/lib/newlib/heap_listener/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/heap_listener.h>
-#include <zephyr.h>
+#include <zephyr/sys/heap_listener.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include <malloc.h>
diff --git a/tests/lib/newlib/thread_safety/src/locks.c b/tests/lib/newlib/thread_safety/src/locks.c
index 10f4633cef8..e76f9d63493 100644
--- a/tests/lib/newlib/thread_safety/src/locks.c
+++ b/tests/lib/newlib/thread_safety/src/locks.c
@@ -12,7 +12,7 @@
  * intended.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include <stdio.h>
diff --git a/tests/lib/newlib/thread_safety/src/main.c b/tests/lib/newlib/thread_safety/src/main.c
index c1844c30c19..35a29e2631f 100644
--- a/tests/lib/newlib/thread_safety/src/main.c
+++ b/tests/lib/newlib/thread_safety/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 extern void test_newlib_thread_safety_locks(void);
diff --git a/tests/lib/newlib/thread_safety/src/stress.c b/tests/lib/newlib/thread_safety/src/stress.c
index 207570482f5..7bf148f6140 100644
--- a/tests/lib/newlib/thread_safety/src/stress.c
+++ b/tests/lib/newlib/thread_safety/src/stress.c
@@ -12,7 +12,7 @@
  * specific contexts are properly handled (i.e. re-entrant).
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include <stdio.h>
diff --git a/tests/lib/notify/src/main.c b/tests/lib/notify/src/main.c
index 6ec5d8f16c9..fc2ca184ff6 100644
--- a/tests/lib/notify/src/main.c
+++ b/tests/lib/notify/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <sys/notify.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 f5836de8135..149c8fed715 100644
--- a/tests/lib/onoff/src/main.c
+++ b/tests/lib/onoff/src/main.c
@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <sys/onoff.h>
+#include <zephyr/sys/onoff.h>
 
 static struct onoff_client cli;
 struct onoff_transitions transitions;
diff --git a/tests/lib/p4workq/src/main.c b/tests/lib/p4workq/src/main.c
index 72ae1268fe9..c74bacdc542 100644
--- a/tests/lib/p4workq/src/main.c
+++ b/tests/lib/p4workq/src/main.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <random/rand32.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/random/rand32.h>
 #include <ztest.h>
-#include <sys/p4wq.h>
+#include <zephyr/sys/p4wq.h>
 
 #define NUM_THREADS (CONFIG_MP_NUM_CPUS * 2)
 #define MAX_ITEMS (NUM_THREADS * 8)
diff --git a/tests/lib/ringbuffer/src/concurrent.c b/tests/lib/ringbuffer/src/concurrent.c
index 5594b02e2ed..ab72107b546 100644
--- a/tests/lib/ringbuffer/src/concurrent.c
+++ b/tests/lib/ringbuffer/src/concurrent.c
@@ -5,9 +5,9 @@
  */
 #include <ztest.h>
 #include <ztress.h>
-#include <sys/ring_buffer.h>
-#include <sys/mutex.h>
-#include <random/rand32.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/sys/mutex.h>
+#include <zephyr/random/rand32.h>
 #include <stdint.h>
 
 /**
diff --git a/tests/lib/ringbuffer/src/main.c b/tests/lib/ringbuffer/src/main.c
index e19ea68742d..1cb9e345862 100644
--- a/tests/lib/ringbuffer/src/main.c
+++ b/tests/lib/ringbuffer/src/main.c
@@ -15,10 +15,10 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
-#include <sys/ring_buffer.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/sys/ring_buffer.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test);
 
 /**
diff --git a/tests/lib/smf/src/main.c b/tests/lib/smf/src/main.c
index 40675a529ac..52202b6987a 100644
--- a/tests/lib/smf/src/main.c
+++ b/tests/lib/smf/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
-#include <smf.h>
+#include <zephyr/smf.h>
 #include "test_lib_smf.h"
 
 void test_main(void)
diff --git a/tests/lib/smf/src/test_lib_flat_smf.c b/tests/lib/smf/src/test_lib_flat_smf.c
index eb4b09cc898..2f10eacee1c 100644
--- a/tests/lib/smf/src/test_lib_flat_smf.c
+++ b/tests/lib/smf/src/test_lib_flat_smf.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <smf.h>
+#include <zephyr/smf.h>
 
 /*
  * Flat Test Transition:
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 b8e31207824..eb22e32ca74 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
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <smf.h>
+#include <zephyr/smf.h>
 
 /*
  * Hierarchical 5 Ancestor State Test Transition:
diff --git a/tests/lib/smf/src/test_lib_hierarchical_smf.c b/tests/lib/smf/src/test_lib_hierarchical_smf.c
index ecf3e00cacb..03a0d0379c8 100644
--- a/tests/lib/smf/src/test_lib_hierarchical_smf.c
+++ b/tests/lib/smf/src/test_lib_hierarchical_smf.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <smf.h>
+#include <zephyr/smf.h>
 
 /*
  * Hierarchical Test Transition:
diff --git a/tests/lib/sys_util/src/wait_for.c b/tests/lib/sys_util/src/wait_for.c
index b45685933d3..0b73009b794 100644
--- a/tests/lib/sys_util/src/wait_for.c
+++ b/tests/lib/sys_util/src/wait_for.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/util.h>
-#include <kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 
 /**
diff --git a/tests/misc/arm_mpu_regions/src/main.c b/tests/misc/arm_mpu_regions/src/main.c
index 322c7a86bfb..c91560cfc6c 100644
--- a/tests/misc/arm_mpu_regions/src/main.c
+++ b/tests/misc/arm_mpu_regions/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <linker/linker-defs.h>
-#include <sys/slist.h>
-#include <arch/arm/aarch32/mpu/arm_mpu.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h>
 #include <ztest.h>
 #include <string.h>
 
diff --git a/tests/misc/print_format/src/main.c b/tests/misc/print_format/src/main.c
index 3a119d0388d..cf4d7cd4b03 100644
--- a/tests/misc/print_format/src/main.c
+++ b/tests/misc/print_format/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 void main(void)
 {
diff --git a/tests/misc/test_build/src/main.c b/tests/misc/test_build/src/main.c
index 7a0e11e8e7f..023145ab901 100644
--- a/tests/misc/test_build/src/main.c
+++ b/tests/misc/test_build/src/main.c
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
 /*
  * The hello world demo has two threads that utilize semaphores and sleeping
diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c
index c53f31d35d2..2b5c049ccf4 100644
--- a/tests/net/6lo/src/main.c
+++ b/tests/net/6lo/src/main.c
@@ -6,24 +6,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_6LO_LOG_LEVEL);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <linker/sections.h>
+#include <zephyr/linker/sections.h>
 
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <device.h>
-#include <init.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_ip.h>
-#include <net/dummy.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/dummy.h>
 
 #include <tc_util.h>
 
diff --git a/tests/net/all/src/main.c b/tests/net/all/src/main.c
index 61a6762abb6..3df15d0c247 100644
--- a/tests/net/all/src/main.c
+++ b/tests/net/all/src/main.c
@@ -10,14 +10,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, LOG_LEVEL_DBG);
 
 #include <ztest.h>
 
-#include <net/net_if.h>
-#include <net/net_pkt.h>
-#include <net/dummy.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/dummy.h>
 
 static struct offload_context {
 	void *none;
diff --git a/tests/net/arp/src/main.c b/tests/net/arp/src/main.c
index 460d2f25d0b..77c840665b0 100644
--- a/tests/net/arp/src/main.c
+++ b/tests/net/arp/src/main.c
@@ -6,11 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_ARP_LOG_LEVEL);
 
-#include <zephyr.h>
-#include <linker/sections.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/linker/sections.h>
 
 #include <tc_util.h>
 
@@ -18,14 +18,14 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ARP_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <device.h>
-#include <init.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_ip.h>
-#include <net/dummy.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/dummy.h>
 #include <ztest.h>
-#include <random/rand32.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 11aec9d546d..f5bbcc439e4 100644
--- a/tests/net/bridge/src/main.c
+++ b/tests/net/bridge/src/main.c
@@ -6,7 +6,7 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_ETHERNET_BRIDGE_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -14,13 +14,13 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 #include <ztest.h>
 
-#include <net/net_if.h>
-#include <net/ethernet.h>
-#include <net/ethernet_bridge.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/ethernet_bridge.h>
 
 #if NET_LOG_LEVEL >= LOG_LEVEL_DBG
 #define DBG(fmt, ...) printk(fmt, ##__VA_ARGS__)
diff --git a/tests/net/buf/src/main.c b/tests/net/buf/src/main.c
index 88a28614783..472c04c0c94 100644
--- a/tests/net/buf/src/main.c
+++ b/tests/net/buf/src/main.c
@@ -9,9 +9,9 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/checksum_offload/src/main.c b/tests/net/checksum_offload/src/main.c
index d72b479e5c5..07be9295e30 100644
--- a/tests/net/checksum_offload/src/main.c
+++ b/tests/net/checksum_offload/src/main.c
@@ -8,7 +8,7 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_L2_ETHERNET_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -16,17 +16,17 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/random/rand32.h>
 
 #include <ztest.h>
 
-#include <net/ethernet.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_l2.h>
-#include <net/udp.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/udp.h>
 
 #include "ipv6.h"
 #include "udp_internal.h"
diff --git a/tests/net/context/src/main.c b/tests/net/context/src/main.c
index 93540671a5f..cadc44e5179 100644
--- a/tests/net/context/src/main.c
+++ b/tests/net/context/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_CONTEXT_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -15,19 +15,19 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_CONTEXT_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/random/rand32.h>
 
 #include <tc_util.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
-#include <net/net_context.h>
-#include <net/udp.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/udp.h>
 
 #include "net_private.h"
 
diff --git a/tests/net/dhcpv4/src/main.c b/tests/net/dhcpv4/src/main.c
index d9b1088b2fd..09060ce1b21 100644
--- a/tests/net/dhcpv4/src/main.c
+++ b/tests/net/dhcpv4/src/main.c
@@ -6,26 +6,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_DHCPV4_LOG_LEVEL);
 
-#include <zephyr.h>
-#include <linker/sections.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/linker/sections.h>
 
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <device.h>
-#include <init.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_ip.h>
-#include <net/dhcpv4.h>
-#include <net/ethernet.h>
-#include <net/net_mgmt.h>
-#include <net/dummy.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/dhcpv4.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/dummy.h>
 
 #include "ipv4.h"
 #include "udp_internal.h"
diff --git a/tests/net/ethernet_mgmt/src/main.c b/tests/net/ethernet_mgmt/src/main.c
index 85fe6fb9d29..e07f5f6e16b 100644
--- a/tests/net/ethernet_mgmt/src/main.c
+++ b/tests/net/ethernet_mgmt/src/main.c
@@ -6,14 +6,14 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_L2_ETHERNET_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <net/net_if.h>
-#include <net/ethernet.h>
-#include <net/ethernet_mgmt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/ethernet_mgmt.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/hostname/src/main.c b/tests/net/hostname/src/main.c
index 3cebc10e68b..5eae39e704d 100644
--- a/tests/net/hostname/src/main.c
+++ b/tests/net/hostname/src/main.c
@@ -8,7 +8,7 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_HOSTNAME_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -16,16 +16,16 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <random/rand32.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
 
 #include <ztest.h>
 
-#include <net/ethernet.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
diff --git a/tests/net/icmpv4/src/main.c b/tests/net/icmpv4/src/main.c
index 474e51a3bbd..62d202e01dc 100644
--- a/tests/net/icmpv4/src/main.c
+++ b/tests/net/icmpv4/src/main.c
@@ -6,21 +6,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_ICMPV4_LOG_LEVEL);
 
 #include <errno.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
 
 #include <tc_util.h>
 
-#include <net/buf.h>
-#include <net/ethernet.h>
-#include <net/dummy.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
 
 #include "net_private.h"
 #include "icmpv4.h"
diff --git a/tests/net/icmpv6/src/main.c b/tests/net/icmpv6/src/main.c
index d90e2c1bd5a..bf1963d77d4 100644
--- a/tests/net/icmpv6/src/main.c
+++ b/tests/net/icmpv6/src/main.c
@@ -6,19 +6,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_ICMPV6_LOG_LEVEL);
 
 #include <errno.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
 
 #include <tc_util.h>
 
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
 #include "icmpv6.h"
 #include <ztest.h>
diff --git a/tests/net/ieee802154/custom_l2/src/main.c b/tests/net/ieee802154/custom_l2/src/main.c
index afa6e2de148..8616b20d798 100644
--- a/tests/net/ieee802154/custom_l2/src/main.c
+++ b/tests/net/ieee802154/custom_l2/src/main.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <net/net_if.h>
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 #define TEST_FLAG_SET (NET_L2_MULTICAST | NET_L2_PROMISC_MODE)
 #define TEST_PAYLOAD "TEST PAYLOAD"
diff --git a/tests/net/ieee802154/fragment/src/main.c b/tests/net/ieee802154/fragment/src/main.c
index 0b405fa9ff6..870d505ab50 100644
--- a/tests/net/ieee802154/fragment/src/main.c
+++ b/tests/net/ieee802154/fragment/src/main.c
@@ -6,25 +6,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <linker/sections.h>
+#include <zephyr/linker/sections.h>
 
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <device.h>
-#include <init.h>
-#include <sys/printk.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_ip.h>
-#include <net/dummy.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/dummy.h>
 
 #include <tc_util.h>
 
diff --git a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
index 283577ea339..b9a3f8cc721 100644
--- a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
+++ b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154_fake_driver, LOG_LEVEL_DBG);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <net/net_core.h>
+#include <zephyr/net/net_core.h>
 #include "net_private.h"
 
-#include <net/net_pkt.h>
+#include <zephyr/net/net_pkt.h>
 
 /** FAKE ieee802.15.4 driver **/
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 extern struct net_pkt *current_pkt;
 extern struct k_sem driver_lock;
diff --git a/tests/net/ieee802154/l2/src/ieee802154_test.c b/tests/net/ieee802154/l2/src/ieee802154_test.c
index 2a6ae046d57..c11eb5e3532 100644
--- a/tests/net/ieee802154/l2/src/ieee802154_test.c
+++ b/tests/net/ieee802154/l2/src/ieee802154_test.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154_test, LOG_LEVEL_DBG);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
-#include <net/net_core.h>
+#include <zephyr/net/net_core.h>
 #include "net_private.h"
 
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
 
 #include <ieee802154_frame.h>
 #include <ipv6.h>
diff --git a/tests/net/iface/src/main.c b/tests/net/iface/src/main.c
index 220b1a3673f..12b4b83ffdb 100644
--- a/tests/net/iface/src/main.c
+++ b/tests/net/iface/src/main.c
@@ -8,7 +8,7 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_IF_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -16,17 +16,17 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/random/rand32.h>
 
 #include <ztest.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
diff --git a/tests/net/igmp/src/main.c b/tests/net/igmp/src/main.c
index 6037018cad8..930b72a5c3f 100644
--- a/tests/net/igmp/src/main.c
+++ b/tests/net/igmp/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV4_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -14,21 +14,21 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV4_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <linker/sections.h>
+#include <zephyr/linker/sections.h>
 
 #include <ztest.h>
 
-#include <net/net_if.h>
-#include <net/net_pkt.h>
-#include <net/net_ip.h>
-#include <net/net_core.h>
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/net_mgmt.h>
-#include <net/net_event.h>
-#include <net/igmp.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/net_event.h>
+#include <zephyr/net/igmp.h>
 
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
 #include "ipv4.h"
 
diff --git a/tests/net/ip-addr/src/main.c b/tests/net/ip-addr/src/main.c
index c01c6922d96..0f139f7cb96 100644
--- a/tests/net/ip-addr/src/main.c
+++ b/tests/net/ip-addr/src/main.c
@@ -6,24 +6,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <device.h>
-#include <init.h>
-#include <linker/sections.h>
-#include <random/rand32.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/random/rand32.h>
 
 #include <ztest.h>
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_ip.h>
-#include <net/dummy.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/dummy.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c
index 098407a7dde..36628bcb3f7 100644
--- a/tests/net/ipv6/src/main.c
+++ b/tests/net/ipv6/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -14,17 +14,17 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <linker/sections.h>
-#include <random/rand32.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/random/rand32.h>
 
 #include <ztest.h>
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_ip.h>
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/udp.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/udp.h>
 
 #include "icmpv6.h"
 #include "ipv6.h"
diff --git a/tests/net/ipv6_fragment/src/main.c b/tests/net/ipv6_fragment/src/main.c
index f4cc9d34720..c929b3a0b8e 100644
--- a/tests/net/ipv6_fragment/src/main.c
+++ b/tests/net/ipv6_fragment/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -14,17 +14,17 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/random/rand32.h>
 
 #include <ztest.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
diff --git a/tests/net/lib/coap/src/main.c b/tests/net/lib/coap/src/main.c
index 26cb4dac9f9..552124ac5a8 100644
--- a/tests/net/lib/coap/src/main.c
+++ b/tests/net/lib/coap/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, LOG_LEVEL_DBG);
 
 #include <errno.h>
@@ -13,10 +13,10 @@ LOG_MODULE_REGISTER(net_test, LOG_LEVEL_DBG);
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/printk.h>
-#include <kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/kernel.h>
 
-#include <net/coap.h>
+#include <zephyr/net/coap.h>
 
 #include <tc_util.h>
 #include <ztest.h>
diff --git a/tests/net/lib/dns_addremove/src/main.c b/tests/net/lib/dns_addremove/src/main.c
index b0ad1f84ba0..d6dd8a30110 100644
--- a/tests/net/lib/dns_addremove/src/main.c
+++ b/tests/net/lib/dns_addremove/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -12,19 +12,19 @@ LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/random/rand32.h>
 
 #include <ztest.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
-#include <net/dns_resolve.h>
-#include <net/net_event.h>
-#include <net/net_mgmt.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/dns_resolve.h>
+#include <zephyr/net/net_event.h>
+#include <zephyr/net/net_mgmt.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
diff --git a/tests/net/lib/dns_packet/src/main.c b/tests/net/lib/dns_packet/src/main.c
index 52d8c154bc6..5ffa085e02c 100644
--- a/tests/net/lib/dns_packet/src/main.c
+++ b/tests/net/lib/dns_packet/src/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <sys/crc.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 1fd90015810..d88cc74f7c1 100644
--- a/tests/net/lib/dns_resolve/src/main.c
+++ b/tests/net/lib/dns_resolve/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -12,17 +12,17 @@ LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/random/rand32.h>
 
 #include <ztest.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
-#include <net/dns_resolve.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/dns_resolve.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
diff --git a/tests/net/lib/dns_sd/src/main.c b/tests/net/lib/dns_sd/src/main.c
index 180d6b91620..ec89f1e852e 100644
--- a/tests/net/lib/dns_sd/src/main.c
+++ b/tests/net/lib/dns_sd/src/main.c
@@ -9,9 +9,9 @@
 
 #include <ztest.h>
 
-#include <net/dns_sd.h>
-#include <net/net_context.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/dns_sd.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_pkt.h>
 
 #include "dns_pack.h"
 #include "dns_sd.h"
diff --git a/tests/net/lib/http_header_fields/src/main.c b/tests/net/lib/http_header_fields/src/main.c
index 080ef6b9493..a7b2d5b9a53 100644
--- a/tests/net/lib/http_header_fields/src/main.c
+++ b/tests/net/lib/http_header_fields/src/main.c
@@ -19,11 +19,11 @@
  * IN THE SOFTWARE.
  */
 
-#include <net/http_parser.h>
+#include <zephyr/net/http_parser.h>
 #include <string.h>
 #include <errno.h>
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include <tc_util.h>
 #include <ztest.h>
 
diff --git a/tests/net/lib/lwm2m/content_json/src/main.c b/tests/net/lib/lwm2m/content_json/src/main.c
index 119faf0a207..5e0e40f8617 100644
--- a/tests/net/lib/lwm2m/content_json/src/main.c
+++ b/tests/net/lib/lwm2m/content_json/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "lwm2m_engine.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 233c4d95bd0..3e761acd6a3 100644
--- a/tests/net/lib/lwm2m/content_link_format/src/main.c
+++ b/tests/net/lib/lwm2m/content_link_format/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "lwm2m_engine.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 8db2d35bacb..66ccda92115 100644
--- a/tests/net/lib/lwm2m/content_oma_tlv/src/main.c
+++ b/tests/net/lib/lwm2m/content_oma_tlv/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "lwm2m_util.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 d452e549432..afbd29627e9 100644
--- a/tests/net/lib/lwm2m/content_plain_text/src/main.c
+++ b/tests/net/lib/lwm2m/content_plain_text/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "lwm2m_rw_plain_text.h"
diff --git a/tests/net/lib/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt_packet/src/mqtt_packet.c
index 404ac99a80d..6fe9f278235 100644
--- a/tests/net/lib/mqtt_packet/src/mqtt_packet.c
+++ b/tests/net/lib/mqtt_packet/src/mqtt_packet.c
@@ -6,7 +6,7 @@
 
 #include <tc_util.h>
 #include <mqtt_internal.h>
-#include <sys/util.h>	/* for ARRAY_SIZE */
+#include <zephyr/sys/util.h>	/* for ARRAY_SIZE */
 #include <ztest.h>
 
 #define CLIENTID	MQTT_UTF8_LITERAL("zephyr")
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 89bef68c8f9..58cfeadfc2f 100644
--- a/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c
+++ b/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN);
 
-#include <net/mqtt.h>
-#include <net/socket.h>
+#include <zephyr/net/mqtt.h>
+#include <zephyr/net/socket.h>
 #include <ztest.h>
 
 #include <string.h>
 #include <errno.h>
 
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
 #include "config.h"
 
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 3a33cd3ca04..05aca234ad9 100644
--- a/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c
+++ b/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN);
 
 #include <ztest.h>
-#include <net/socket.h>
-#include <net/mqtt.h>
-#include <random/rand32.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/mqtt.h>
+#include <zephyr/random/rand32.h>
 
 #include <string.h>
 #include <errno.h>
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 6d5ef41973a..0919e96635a 100644
--- a/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c
+++ b/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN);
 
 #include <ztest.h>
-#include <net/socket.h>
-#include <net/mqtt.h>
-#include <random/rand32.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/mqtt.h>
+#include <zephyr/random/rand32.h>
 
 #include <string.h>
 #include <errno.h>
diff --git a/tests/net/mgmt/src/mgmt.c b/tests/net/mgmt/src/mgmt.c
index a342a18dd10..9ac61da7c36 100644
--- a/tests/net/mgmt/src/mgmt.c
+++ b/tests/net/mgmt/src/mgmt.c
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_MGMT_EVENT_LOG_LEVEL);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <tc_util.h>
 #include <errno.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
-#include <net/dummy.h>
-#include <net/net_mgmt.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/net_pkt.h>
 #include <ztest.h>
 
 #define THREAD_SLEEP 50 /* ms */
diff --git a/tests/net/mld/src/main.c b/tests/net/mld/src/main.c
index 767d6a28678..a3f562cf081 100644
--- a/tests/net/mld/src/main.c
+++ b/tests/net/mld/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -14,20 +14,20 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <linker/sections.h>
+#include <zephyr/linker/sections.h>
 
 #include <ztest.h>
 
-#include <net/net_if.h>
-#include <net/net_pkt.h>
-#include <net/net_ip.h>
-#include <net/net_core.h>
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/net_mgmt.h>
-#include <net/net_event.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/net_event.h>
 
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
 #include "icmpv6.h"
 #include "ipv6.h"
diff --git a/tests/net/neighbor/src/main.c b/tests/net/neighbor/src/main.c
index c421cb5ad09..521ce455e2a 100644
--- a/tests/net/neighbor/src/main.c
+++ b/tests/net/neighbor/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_NBR_CACHE_LOG_LEVEL);
 
 #include <ztest.h>
@@ -15,13 +15,13 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_NBR_CACHE_LOG_LEVEL);
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <device.h>
-#include <init.h>
-#include <sys/printk.h>
-#include <net/net_core.h>
-#include <net/net_ip.h>
-#include <net/ethernet.h>
-#include <linker/sections.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/linker/sections.h>
 
 #include "nbr.h"
 
diff --git a/tests/net/net_pkt/src/main.c b/tests/net/net_pkt/src/main.c
index a3b8bd2c8c0..3893040ff13 100644
--- a/tests/net/net_pkt/src/main.c
+++ b/tests/net/net_pkt/src/main.c
@@ -8,11 +8,11 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/net_ip.h>
-#include <net/ethernet.h>
-#include <random/rand32.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/random/rand32.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/npf/src/main.c b/tests/net/npf/src/main.c
index 410e5ee78a1..a7dfeaded6f 100644
--- a/tests/net/npf/src/main.c
+++ b/tests/net/npf/src/main.c
@@ -6,7 +6,7 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_PKT_FILTER_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(npf_test, NET_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -14,13 +14,13 @@ LOG_MODULE_REGISTER(npf_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 #include <ztest.h>
 
-#include <net/net_if.h>
-#include <net/ethernet.h>
-#include <net/net_pkt_filter.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_pkt_filter.h>
 
 #if NET_LOG_LEVEL >= LOG_LEVEL_DBG
 #define DBG(fmt, ...) printk(fmt, ##__VA_ARGS__)
diff --git a/tests/net/pm/src/main.c b/tests/net/pm/src/main.c
index d1899f8a397..89b793c94c7 100644
--- a/tests/net/pm/src/main.c
+++ b/tests/net/pm/src/main.c
@@ -6,16 +6,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <linker/sections.h>
-#include <pm/device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/pm/device.h>
 #include <ztest.h>
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/net_if.h>
-#include <net/socket.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/socket.h>
 
 struct fake_dev_context {
 	uint8_t mac_addr[sizeof(struct net_eth_addr)];
diff --git a/tests/net/ppp/driver/src/main.c b/tests/net/ppp/driver/src/main.c
index 438c1866c76..bab540ca5fc 100644
--- a/tests/net/ppp/driver/src/main.c
+++ b/tests/net/ppp/driver/src/main.c
@@ -8,7 +8,7 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_PPP_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -16,16 +16,16 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <sys/crc.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/crc.h>
 
 #include <ztest.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
diff --git a/tests/net/promiscuous/src/main.c b/tests/net/promiscuous/src/main.c
index 227c0f1bfb6..1eada54bb5d 100644
--- a/tests/net/promiscuous/src/main.c
+++ b/tests/net/promiscuous/src/main.c
@@ -8,7 +8,7 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_IF_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -16,14 +16,14 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 #include <ztest.h>
 
-#include <net/ethernet.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
-#include <net/promiscuous.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/promiscuous.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
diff --git a/tests/net/ptp/clock/src/main.c b/tests/net/ptp/clock/src/main.c
index 940c9a2ce70..88d93cfd2b4 100644
--- a/tests/net/ptp/clock/src/main.c
+++ b/tests/net/ptp/clock/src/main.c
@@ -10,7 +10,7 @@
 /* Custom PTP device name to avoid conflicts with PTP devices on SOC */
 #define PTP_VIRT_CLOCK_NAME "PTP_CLOCK_VIRT"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -18,20 +18,20 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
 
 #include <ztest.h>
 
-#include <drivers/ptp_clock.h>
-#include <net/ptp_time.h>
+#include <zephyr/drivers/ptp_clock.h>
+#include <zephyr/net/ptp_time.h>
 
-#include <net/ethernet.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_l2.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_l2.h>
 
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c
index 8c7ec8f01b6..8a2ea155bab 100644
--- a/tests/net/route/src/main.c
+++ b/tests/net/route/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -15,18 +15,18 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/random/rand32.h>
 
 #include <tc_util.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
-#include <net/net_context.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_context.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
diff --git a/tests/net/route_mcast/src/main.c b/tests/net/route_mcast/src/main.c
index 44fa73a79cf..d8c199c3424 100644
--- a/tests/net/route_mcast/src/main.c
+++ b/tests/net/route_mcast/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -15,24 +15,24 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/random/rand32.h>
 
 #include <tc_util.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
-#include <net/net_context.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_context.h>
 
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
 #include "icmpv6.h"
 #include "ipv6.h"
-#include <net/udp.h>
+#include <zephyr/net/udp.h>
 #include "udp_internal.h"
 #include "nbr.h"
 #include "route.h"
diff --git a/tests/net/shell/src/main.c b/tests/net/shell/src/main.c
index 2eb505845da..d0234b16f25 100644
--- a/tests/net/shell/src/main.c
+++ b/tests/net/shell/src/main.c
@@ -8,28 +8,28 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_UDP_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
-#include <zephyr.h>
-#include <linker/sections.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/linker/sections.h>
 
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <device.h>
-#include <init.h>
-#include <sys/printk.h>
-#include <net/buf.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_ip.h>
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/udp.h>
-#include <random/rand32.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/udp.h>
+#include <zephyr/random/rand32.h>
 
 #include "ipv4.h"
 #include "ipv6.h"
diff --git a/tests/net/socket/af_packet/src/main.c b/tests/net/socket/af_packet/src/main.c
index 910e0bfe194..dc3618a0b4a 100644
--- a/tests/net/socket/af_packet/src/main.c
+++ b/tests/net/socket/af_packet/src/main.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
-#include <sys/mutex.h>
+#include <zephyr/sys/mutex.h>
 #include <ztest_assert.h>
 
 #include <fcntl.h>
-#include <net/socket.h>
-#include <net/ethernet.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/ethernet.h>
 
 #if defined(CONFIG_NET_SOCKETS_LOG_LEVEL_DBG)
 #define DBG(fmt, ...) NET_DBG(fmt, ##__VA_ARGS__)
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 9585228fae9..7b19fc6cae4 100644
--- a/tests/net/socket/af_packet_ipproto_raw/src/main.c
+++ b/tests/net/socket/af_packet_ipproto_raw/src/main.c
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <zephyr.h>
-#include <linker/sections.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/linker/sections.h>
 #include <ztest.h>
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
 #include <fcntl.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/net_if.h>
-#include <net/socket.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/socket.h>
 
 struct fake_dev_context {
 	uint8_t mac_addr[sizeof(struct net_eth_addr)];
diff --git a/tests/net/socket/getaddrinfo/src/main.c b/tests/net/socket/getaddrinfo/src/main.c
index c45f0441f34..f075db73493 100644
--- a/tests/net/socket/getaddrinfo/src/main.c
+++ b/tests/net/socket/getaddrinfo/src/main.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <ztest_assert.h>
-#include <sys/sem.h>
-#include <net/socket.h>
-#include <net/dns_resolve.h>
-#include <net/buf.h>
+#include <zephyr/sys/sem.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/dns_resolve.h>
+#include <zephyr/net/buf.h>
 
 #include "../../socket_helpers.h"
 
diff --git a/tests/net/socket/getnameinfo/src/main.c b/tests/net/socket/getnameinfo/src/main.c
index f1afd24e33d..befb01cd6cf 100644
--- a/tests/net/socket/getnameinfo/src/main.c
+++ b/tests/net/socket/getnameinfo/src/main.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <ztest_assert.h>
 
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
 
 void test_getnameinfo_ipv4(void)
 {
diff --git a/tests/net/socket/misc/src/main.c b/tests/net/socket/misc/src/main.c
index 1d4824e2f88..bacb3a57dd2 100644
--- a/tests/net/socket/misc/src/main.c
+++ b/tests/net/socket/misc/src/main.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <ztest_assert.h>
-#include <sys/sem.h>
+#include <zephyr/sys/sem.h>
 
-#include <net/socket.h>
-#include <net/dummy.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/dummy.h>
 
 #include "../../socket_helpers.h"
 
diff --git a/tests/net/socket/net_mgmt/src/main.c b/tests/net/socket/net_mgmt/src/main.c
index d2a254bd472..bf91c6652d8 100644
--- a/tests/net/socket/net_mgmt/src/main.c
+++ b/tests/net/socket/net_mgmt/src/main.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <ztest_assert.h>
-#include <sys_clock.h>
-#include <net/net_ip.h>
-#include <net/socket.h>
-#include <net/socket_net_mgmt.h>
-#include <net/net_event.h>
-#include <net/ethernet_mgmt.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/socket_net_mgmt.h>
+#include <zephyr/net/net_event.h>
+#include <zephyr/net/ethernet_mgmt.h>
 
 #define MAX_BUF_LEN 64
 #define STACK_SIZE 1024
diff --git a/tests/net/socket/offload_dispatcher/src/main.c b/tests/net/socket/offload_dispatcher/src/main.c
index 07d09a88d48..2892ee5ea36 100644
--- a/tests/net/socket/offload_dispatcher/src/main.c
+++ b/tests/net/socket/offload_dispatcher/src/main.c
@@ -5,12 +5,12 @@
  */
 
 #include <fcntl.h>
-#include <logging/log.h>
-#include <net/dummy.h>
-#include <net/net_if.h>
-#include <net/socket.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/socket.h>
 #include <sockets_internal.h>
-#include <sys/fdtable.h>
+#include <zephyr/sys/fdtable.h>
 #include <ztest.h>
 
 
diff --git a/tests/net/socket/poll/src/main.c b/tests/net/socket/poll/src/main.c
index 360049be95c..19c5fe684e0 100644
--- a/tests/net/socket/poll/src/main.c
+++ b/tests/net/socket/poll/src/main.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <ztest_assert.h>
 
-#include <net/socket.h>
-#include <sys/fdtable.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/sys/fdtable.h>
 
 #include "../../socket_helpers.h"
 
diff --git a/tests/net/socket/register/src/main.c b/tests/net/socket/register/src/main.c
index f515815da98..329f91cb7a4 100644
--- a/tests/net/socket/register/src/main.c
+++ b/tests/net/socket/register/src/main.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <ztest_assert.h>
 
-#include <net/net_ip.h>
-#include <net/ethernet.h>
-#include <net/socket.h>
-#include <net/socket_can.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/socket_can.h>
 
 struct test_case {
 	int family;
diff --git a/tests/net/socket/select/src/main.c b/tests/net/socket/select/src/main.c
index 4970c152121..22b04ce43ff 100644
--- a/tests/net/socket/select/src/main.c
+++ b/tests/net/socket/select/src/main.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <ztest_assert.h>
 
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
 
 #include "../../socket_helpers.h"
 
diff --git a/tests/net/socket/socket_helpers.h b/tests/net/socket/socket_helpers.h
index 60efb6dccd8..d67a0ff6c01 100644
--- a/tests/net/socket/socket_helpers.h
+++ b/tests/net/socket/socket_helpers.h
@@ -6,7 +6,7 @@
 
 #include <ztest_assert.h>
 
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
 
 #define clear_buf(buf) memset(buf, 0, sizeof(buf))
 
diff --git a/tests/net/socket/socketpair/src/main.c b/tests/net/socket/socketpair/src/main.c
index 579f8a16ca3..08412efe434 100644
--- a/tests/net/socket/socketpair/src/main.c
+++ b/tests/net/socket/socketpair/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <ztest.h>
diff --git a/tests/net/socket/socketpair/src/test_socketpair_block.c b/tests/net/socket/socketpair/src/test_socketpair_block.c
index 3a23e71550c..c979b514e14 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_block.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_block.c
@@ -7,12 +7,12 @@
 #include <fcntl.h>
 #include <string.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <net/socket.h>
-#include <sys/util.h>
-#include <posix/unistd.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/posix/unistd.h>
 
 #include <ztest_assert.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 8da8cca708d..bedc2f720db 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_closed_ends.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_closed_ends.c
@@ -4,14 +4,14 @@
  */
 #include <fcntl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <string.h>
-#include <net/socket.h>
-#include <sys/util.h>
-#include <posix/unistd.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/posix/unistd.h>
 
 #include <ztest_assert.h>
 
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 656ae321be9..290f11c8b5b 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_expected_failures.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_expected_failures.c
@@ -6,14 +6,14 @@
 
 #include <fcntl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <string.h>
-#include <net/socket.h>
-#include <sys/util.h>
-#include <posix/unistd.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/posix/unistd.h>
 
 #include <ztest_assert.h>
 
diff --git a/tests/net/socket/socketpair/src/test_socketpair_fcntl.c b/tests/net/socket/socketpair/src/test_socketpair_fcntl.c
index 01d06b7050c..397438595b4 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_fcntl.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_fcntl.c
@@ -6,14 +6,14 @@
 
 #include <fcntl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <string.h>
-#include <net/socket.h>
-#include <sys/util.h>
-#include <posix/unistd.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/posix/unistd.h>
 
 #include <ztest_assert.h>
 
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 c8308764465..0ba29c1e768 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_happy_path.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_happy_path.c
@@ -6,13 +6,13 @@
 
 #include <fcntl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <string.h>
-#include <net/socket.h>
-#include <sys/util.h>
-#include <posix/unistd.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/posix/unistd.h>
 
 #include <ztest_assert.h>
 
diff --git a/tests/net/socket/socketpair/src/test_socketpair_nonblock.c b/tests/net/socket/socketpair/src/test_socketpair_nonblock.c
index ef9131dd6ee..9ef413e889b 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_nonblock.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_nonblock.c
@@ -6,14 +6,14 @@
 
 #include <fcntl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <string.h>
-#include <net/socket.h>
-#include <sys/util.h>
-#include <posix/unistd.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/posix/unistd.h>
 
 #include <ztest_assert.h>
 
diff --git a/tests/net/socket/socketpair/src/test_socketpair_poll.c b/tests/net/socket/socketpair/src/test_socketpair_poll.c
index a87c5ffb285..96e7c0e0b19 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_poll.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_poll.c
@@ -7,12 +7,12 @@
 #include <fcntl.h>
 #include <string.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <net/socket.h>
-#include <posix/unistd.h>
-#include <sys/util.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/posix/unistd.h>
+#include <zephyr/sys/util.h>
 
 #include <ztest_assert.h>
 
diff --git a/tests/net/socket/socketpair/src/test_socketpair_thread.h b/tests/net/socket/socketpair/src/test_socketpair_thread.h
index 5890febd3a2..7c713ec7558 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_thread.h
+++ b/tests/net/socket/socketpair/src/test_socketpair_thread.h
@@ -7,7 +7,7 @@
 #ifndef TEST_SOCKETPAIR_THREAD_H_
 #define TEST_SOCKETPAIR_THREAD_H_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 extern struct k_work_q test_socketpair_work_q;
 
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 00c200257a5..44d095a98c2 100644
--- a/tests/net/socket/socketpair/src/test_socketpair_unsupported_calls.c
+++ b/tests/net/socket/socketpair/src/test_socketpair_unsupported_calls.c
@@ -6,14 +6,14 @@
 
 #include <fcntl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
 #include <string.h>
-#include <net/socket.h>
-#include <sys/util.h>
-#include <posix/unistd.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/posix/unistd.h>
 
 #include <ztest_assert.h>
 
diff --git a/tests/net/socket/tcp/src/main.c b/tests/net/socket/tcp/src/main.c
index 596cfcbfe4d..205c038b9df 100644
--- a/tests/net/socket/tcp/src/main.c
+++ b/tests/net/socket/tcp/src/main.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <ztest_assert.h>
 #include <fcntl.h>
-#include <net/socket.h>
-#include <net/loopback.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/loopback.h>
 
 #include "../../socket_helpers.h"
 
diff --git a/tests/net/socket/tls/src/main.c b/tests/net/socket/tls/src/main.c
index 4c1616e2402..73081f17932 100644
--- a/tests/net/socket/tls/src/main.c
+++ b/tests/net/socket/tls/src/main.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <ztest_assert.h>
 #include <fcntl.h>
-#include <net/socket.h>
-#include <net/tls_credentials.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/tls_credentials.h>
 
 #include "../../socket_helpers.h"
 
diff --git a/tests/net/socket/tls_ext/src/main.c b/tests/net/socket/tls_ext/src/main.c
index 66dcba33ed2..696fa087984 100644
--- a/tests/net/socket/tls_ext/src/main.c
+++ b/tests/net/socket/tls_ext/src/main.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
-#include <net/net_core.h>
-#include <net/net_ip.h>
-#include <net/socket.h>
-#include <net/tls_credentials.h>
-#include <posix/unistd.h>
-#include <sys/util.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/tls_credentials.h>
+#include <zephyr/posix/unistd.h>
+#include <zephyr/sys/util.h>
 #include <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 20ece463506..43486d10579 100644
--- a/tests/net/socket/udp/src/main.c
+++ b/tests/net/socket/udp/src/main.c
@@ -5,15 +5,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <stdio.h>
-#include <sys/mutex.h>
+#include <zephyr/sys/mutex.h>
 #include <ztest_assert.h>
 
-#include <net/socket.h>
-#include <net/ethernet.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/ethernet.h>
 
 #include "ipv6.h"
 #include "../../socket_helpers.h"
diff --git a/tests/net/socket/websocket/src/main.c b/tests/net/socket/websocket/src/main.c
index 0646244205a..e0386c34654 100644
--- a/tests/net/socket/websocket/src/main.c
+++ b/tests/net/socket/websocket/src/main.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_WEBSOCKET_LOG_LEVEL);
 
 #include <ztest_assert.h>
 
-#include <net/net_ip.h>
-#include <net/socket.h>
-#include <net/websocket.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/websocket.h>
 
 #include "websocket_internal.h"
 
diff --git a/tests/net/tcp/src/main.c b/tests/net/tcp/src/main.c
index 3aeefb52f6c..55c1b7ea552 100644
--- a/tests/net/tcp/src/main.c
+++ b/tests/net/tcp/src/main.c
@@ -12,20 +12,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_TCP_LOG_LEVEL);
 
 #include <errno.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
 #include <tc_util.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/net_pkt.h>
 
 #include "ipv4.h"
 #include "ipv6.h"
diff --git a/tests/net/traffic_class/src/main.c b/tests/net/traffic_class/src/main.c
index 5ffb1f24ad9..82a132c262a 100644
--- a/tests/net/traffic_class/src/main.c
+++ b/tests/net/traffic_class/src/main.c
@@ -8,7 +8,7 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_TC_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -16,18 +16,18 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/random/rand32.h>
 
 #include <ztest.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_l2.h>
-#include <net/udp.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/udp.h>
 
 #include "ipv6.h"
 
diff --git a/tests/net/trickle/src/main.c b/tests/net/trickle/src/main.c
index 867fcb5ec94..51027bfc787 100644
--- a/tests/net/trickle/src/main.c
+++ b/tests/net/trickle/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_TRICKLE_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -15,16 +15,16 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_TRICKLE_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
 
 #include <tc_util.h>
 
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
 
-#include <net/trickle.h>
+#include <zephyr/net/trickle.h>
 
 #include "net_private.h"
 
diff --git a/tests/net/tx_timestamp/src/main.c b/tests/net/tx_timestamp/src/main.c
index c2a0865673a..4b53b7f5aed 100644
--- a/tests/net/tx_timestamp/src/main.c
+++ b/tests/net/tx_timestamp/src/main.c
@@ -8,7 +8,7 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_L2_ETHERNET_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -16,18 +16,18 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/random/rand32.h>
 
 #include <ztest.h>
 
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/net_l2.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/net_l2.h>
 
 #include "ipv6.h"
 
diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c
index d2f614c9372..f01545e696a 100644
--- a/tests/net/udp/src/main.c
+++ b/tests/net/udp/src/main.c
@@ -8,28 +8,28 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_UDP_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
-#include <zephyr.h>
-#include <linker/sections.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/linker/sections.h>
 
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <device.h>
-#include <init.h>
-#include <sys/printk.h>
-#include <net/buf.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_ip.h>
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/udp.h>
-#include <random/rand32.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/udp.h>
+#include <zephyr/random/rand32.h>
 
 #include "ipv4.h"
 #include "ipv6.h"
diff --git a/tests/net/utils/src/main.c b/tests/net/utils/src/main.c
index a5636595a71..70bbede1e34 100644
--- a/tests/net/utils/src/main.c
+++ b/tests/net/utils/src/main.c
@@ -6,23 +6,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_UTILS_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ztest_assert.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <device.h>
-#include <init.h>
-#include <sys/printk.h>
-#include <net/net_core.h>
-#include <net/net_ip.h>
-#include <net/ethernet.h>
-#include <linker/sections.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/linker/sections.h>
 
 #include <tc_util.h>
 #include <ztest.h>
diff --git a/tests/net/virtual/src/main.c b/tests/net/virtual/src/main.c
index 8ec6673d915..53695c3a46d 100644
--- a/tests/net/virtual/src/main.c
+++ b/tests/net/virtual/src/main.c
@@ -8,7 +8,7 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_L2_VIRTUAL_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -16,18 +16,18 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/random/rand32.h>
 
 #include <ztest.h>
 
-#include <net/dummy.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/virtual.h>
-#include <net/virtual_mgmt.h>
-#include <net/ethernet.h>
-#include <net/net_l2.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/virtual.h>
+#include <zephyr/net/virtual_mgmt.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_l2.h>
 
 #include "ipv4.h"
 #include "ipv6.h"
diff --git a/tests/net/vlan/src/main.c b/tests/net/vlan/src/main.c
index 3e02a2bd373..787fd7b5773 100644
--- a/tests/net/vlan/src/main.c
+++ b/tests/net/vlan/src/main.c
@@ -8,7 +8,7 @@
 
 #define NET_LOG_LEVEL CONFIG_NET_L2_ETHERNET_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -16,18 +16,18 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <linker/sections.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/random/rand32.h>
 
 #include <ztest.h>
 
-#include <net/ethernet.h>
-#include <net/dummy.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/ethernet_vlan.h>
-#include <net/net_l2.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/ethernet_vlan.h>
+#include <zephyr/net/net_l2.h>
 
 #include "ipv6.h"
 
diff --git a/tests/posix/common/src/clock.c b/tests/posix/common/src/clock.c
index 15704eebcfd..df2bb6e8f57 100644
--- a/tests/posix/common/src/clock.c
+++ b/tests/posix/common/src/clock.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-#include <posix/time.h>
-#include <posix/sys/time.h>
-#include <posix/unistd.h>
+#include <zephyr/posix/time.h>
+#include <zephyr/posix/sys/time.h>
+#include <zephyr/posix/unistd.h>
 
 #define SLEEP_SECONDS 1
 #define CLOCK_INVALID -1
diff --git a/tests/posix/common/src/mqueue.c b/tests/posix/common/src/mqueue.c
index 56d6bbe8aa3..cd2f673f212 100644
--- a/tests/posix/common/src/mqueue.c
+++ b/tests/posix/common/src/mqueue.c
@@ -5,10 +5,10 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 #include <fcntl.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <mqueue.h>
 #include <pthread.h>
 
diff --git a/tests/posix/common/src/nanosleep.c b/tests/posix/common/src/nanosleep.c
index f725435cd03..ca63b7b3c5e 100644
--- a/tests/posix/common/src/nanosleep.c
+++ b/tests/posix/common/src/nanosleep.c
@@ -6,9 +6,9 @@
 
 #include <ztest.h>
 #include <errno.h>
-#include <posix/time.h>
+#include <zephyr/posix/time.h>
 #include <stdint.h>
-#include <sys_clock.h>
+#include <zephyr/sys_clock.h>
 
 /** req and rem are both NULL */
 void test_nanosleep_NULL_NULL(void)
diff --git a/tests/posix/common/src/posix_rwlock.c b/tests/posix/common/src/posix_rwlock.c
index dd38db5e9aa..5af5153a308 100644
--- a/tests/posix/common/src/posix_rwlock.c
+++ b/tests/posix/common/src/posix_rwlock.c
@@ -6,7 +6,7 @@
 
 #include <ztest.h>
 #include <pthread.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define N_THR 3
 #define STACKSZ (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
diff --git a/tests/posix/common/src/pthread.c b/tests/posix/common/src/pthread.c
index aaa6364b8ce..723f2917f90 100644
--- a/tests/posix/common/src/pthread.c
+++ b/tests/posix/common/src/pthread.c
@@ -5,10 +5,10 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <pthread.h>
 #include <semaphore.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef min
 #define min(a, b) ((a) < (b)) ? (a) : (b)
diff --git a/tests/posix/common/src/pthread_key.c b/tests/posix/common/src/pthread_key.c
index 6e76c219183..0f79b0f7622 100644
--- a/tests/posix/common/src/pthread_key.c
+++ b/tests/posix/common/src/pthread_key.c
@@ -5,9 +5,9 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <pthread.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define N_THR 2
 #define N_KEY 2
diff --git a/tests/posix/eventfd/src/main.c b/tests/posix/eventfd/src/main.c
index 96c4cd182b0..ebf52e12b4b 100644
--- a/tests/posix/eventfd/src/main.c
+++ b/tests/posix/eventfd/src/main.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
 #include <poll.h>
 #include <sys/eventfd.h>
 
diff --git a/tests/posix/eventfd_basic/src/main.c b/tests/posix/eventfd_basic/src/main.c
index 898c8721bb1..9edb9919f2c 100644
--- a/tests/posix/eventfd_basic/src/main.c
+++ b/tests/posix/eventfd_basic/src/main.c
@@ -7,12 +7,12 @@
 
 #include <ztest.h>
 
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
 
 #ifdef CONFIG_POSIX_API
 #include <sys/eventfd.h>
 #else
-#include <posix/sys/eventfd.h>
+#include <zephyr/posix/sys/eventfd.h>
 #endif
 
 static void test_eventfd(void)
diff --git a/tests/posix/fs/src/test_fat_mount.c b/tests/posix/fs/src/test_fat_mount.c
index 927f1802c18..609bfc57eea 100644
--- a/tests/posix/fs/src/test_fat_mount.c
+++ b/tests/posix/fs/src/test_fat_mount.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 #include <ff.h>
 #include "test_fs.h"
 
diff --git a/tests/posix/fs/src/test_fs_dir.c b/tests/posix/fs/src/test_fs_dir.c
index b6af736c6c7..90ceba0b24a 100644
--- a/tests/posix/fs/src/test_fs_dir.c
+++ b/tests/posix/fs/src/test_fs_dir.c
@@ -6,8 +6,8 @@
 
 #include <stdio.h>
 #include <fcntl.h>
-#include <posix/unistd.h>
-#include <posix/dirent.h>
+#include <zephyr/posix/unistd.h>
+#include <zephyr/posix/dirent.h>
 #include "test_fs.h"
 
 extern int test_file_write(void);
diff --git a/tests/posix/fs/src/test_fs_file.c b/tests/posix/fs/src/test_fs_file.c
index d3878f9731d..0701a2bab5c 100644
--- a/tests/posix/fs/src/test_fs_file.c
+++ b/tests/posix/fs/src/test_fs_file.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <fcntl.h>
-#include <posix/unistd.h>
+#include <zephyr/posix/unistd.h>
 #include "test_fs.h"
 
 const char test_str[] = "hello world!";
diff --git a/tests/posix/fs/src/test_fs_open_flags.c b/tests/posix/fs/src/test_fs_open_flags.c
index fec28bf321e..7bbbffd898b 100644
--- a/tests/posix/fs/src/test_fs_open_flags.c
+++ b/tests/posix/fs/src/test_fs_open_flags.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <fcntl.h>
-#include <posix/unistd.h>
+#include <zephyr/posix/unistd.h>
 #include "test_fs.h"
 
 #define THE_FILE FATFS_MNTP"/the_file.txt"
diff --git a/tests/posix/getopt/src/main.c b/tests/posix/getopt/src/main.c
index 3c89ead3c65..a4c088c4c10 100644
--- a/tests/posix/getopt/src/main.c
+++ b/tests/posix/getopt/src/main.c
@@ -9,7 +9,7 @@
  *
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <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 6d351cb0523..4d009503611 100644
--- a/tests/subsys/canbus/isotp/conformance/src/main.c
+++ b/tests/subsys/canbus/isotp/conformance/src/main.c
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <canbus/isotp.h>
-#include <drivers/can.h>
+#include <zephyr/canbus/isotp.h>
+#include <zephyr/drivers/can.h>
 #include <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 87f205096d1..f9ca88e9d1e 100644
--- a/tests/subsys/canbus/isotp/implementation/src/main.c
+++ b/tests/subsys/canbus/isotp/implementation/src/main.c
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <canbus/isotp.h>
+#include <zephyr/canbus/isotp.h>
 #include <ztest.h>
 #include <strings.h>
 #include "random_data.h"
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
 #define NUMBER_OF_REPETITIONS 5
 #define DATA_SIZE_SF          7
diff --git a/tests/subsys/cpp/cxx/src/main.cpp b/tests/subsys/cpp/cxx/src/main.cpp
index b9deed317e1..09874c5dcf6 100644
--- a/tests/subsys/cpp/cxx/src/main.cpp
+++ b/tests/subsys/cpp/cxx/src/main.cpp
@@ -13,67 +13,67 @@
 #include <zephyr/types.h>
 #include <stdbool.h>
 
-#include <init.h>
-#include <device.h>
-#include <kernel.h>
-#include <net/buf.h>
-/* #include <sys/byteorder.h> conflicts with __bswapXX on native_posix */
-#include <sys/crc.h>
-#include <sys/crc.h>
+#include <zephyr/init.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/buf.h>
+/* #include <zephyr/sys/byteorder.h> conflicts with __bswapXX on native_posix */
+#include <zephyr/sys/crc.h>
+#include <zephyr/sys/crc.h>
 
-#include <drivers/adc.h>
-#include <drivers/bbram.h>
-#include <drivers/cache.h>
-#include <drivers/can.h>
-#include <drivers/can/transceiver.h>
-#include <drivers/clock_control.h>
-#include <drivers/counter.h>
-#include <drivers/dac.h>
-#include <drivers/disk.h>
-#include <drivers/display.h>
-#include <drivers/dma.h>
-#include <drivers/ec_host_cmd_periph.h>
-#include <drivers/edac.h>
-#include <drivers/eeprom.h>
-#include <drivers/emul.h>
-#include <drivers/entropy.h>
-#include <drivers/espi_emul.h>
-#include <drivers/espi.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/bbram.h>
+#include <zephyr/drivers/cache.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/drivers/can/transceiver.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/drivers/disk.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/ec_host_cmd_periph.h>
+#include <zephyr/drivers/edac.h>
+#include <zephyr/drivers/eeprom.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/drivers/espi_emul.h>
+#include <zephyr/drivers/espi.h>
 /* drivers/espi_saf.h requires SoC specific header */
-#include <drivers/flash.h>
-#include <drivers/fpga.h>
-#include <drivers/gna.h>
-#include <drivers/gpio.h>
-#include <drivers/hwinfo.h>
-#include <drivers/i2c_emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2s.h>
-#include <drivers/ipm.h>
-#include <drivers/kscan.h>
-#include <drivers/led.h>
-#include <drivers/led_strip.h>
-#include <drivers/lora.h>
-#include <drivers/mbox.h>
-#include <drivers/mdio.h>
-#include <drivers/peci.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/fpga.h>
+#include <zephyr/drivers/gna.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/hwinfo.h>
+#include <zephyr/drivers/i2c_emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2s.h>
+#include <zephyr/drivers/ipm.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/drivers/led.h>
+#include <zephyr/drivers/led_strip.h>
+#include <zephyr/drivers/lora.h>
+#include <zephyr/drivers/mbox.h>
+#include <zephyr/drivers/mdio.h>
+#include <zephyr/drivers/peci.h>
 /* drivers/pinctrl.h requires SoC specific header */
-#include <drivers/pinmux.h>
-#include <drivers/pm_cpu_ops.h>
-#include <drivers/ps2.h>
-#include <drivers/ptp_clock.h>
-#include <drivers/pwm.h>
-#include <drivers/regulator.h>
+#include <zephyr/drivers/pinmux.h>
+#include <zephyr/drivers/pm_cpu_ops.h>
+#include <zephyr/drivers/ps2.h>
+#include <zephyr/drivers/ptp_clock.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/drivers/regulator.h>
 /* drivers/reset.h conflicts with assert() for certain platforms */
-#include <drivers/sensor.h>
-#include <drivers/spi_emul.h>
-#include <drivers/spi.h>
-#include <drivers/syscon.h>
-#include <drivers/uart.h>
-#include <usb/usb_device.h>
-#include <usb/class/usb_hid.h>
-#include <drivers/video-controls.h>
-#include <drivers/video.h>
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/spi_emul.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/syscon.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_hid.h>
+#include <zephyr/drivers/video-controls.h>
+#include <zephyr/drivers/video.h>
+#include <zephyr/drivers/watchdog.h>
 
 #include <ztest.h>
 
diff --git a/tests/subsys/debug/coredump/src/main.c b/tests/subsys/debug/coredump/src/main.c
index 9b01aae966e..11ab3824b4f 100644
--- a/tests/subsys/debug/coredump/src/main.c
+++ b/tests/subsys/debug/coredump/src/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
-#include <debug/coredump.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/debug/coredump.h>
 
 void func_3(uint32_t *addr)
 {
diff --git a/tests/subsys/debug/coredump_backends/src/coredump_backend_empty.c b/tests/subsys/debug/coredump_backends/src/coredump_backend_empty.c
index d8761c6cfb1..82cee0b70d9 100644
--- a/tests/subsys/debug/coredump_backends/src/coredump_backend_empty.c
+++ b/tests/subsys/debug/coredump_backends/src/coredump_backend_empty.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <debug/coredump.h>
+#include <zephyr/debug/coredump.h>
 
 static int error;
 static bool is_valid;
diff --git a/tests/subsys/debug/coredump_backends/src/main.c b/tests/subsys/debug/coredump_backends/src/main.c
index ac1c228ec47..d8c69052e7e 100644
--- a/tests/subsys/debug/coredump_backends/src/main.c
+++ b/tests/subsys/debug/coredump_backends/src/main.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
 #include <ztest.h>
 #include <assert.h>
 #include <tc_util.h>
 
-#include <debug/coredump.h>
+#include <zephyr/debug/coredump.h>
 
 #define STACK_SIZE (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
 
diff --git a/tests/subsys/dfu/img_util/src/main.c b/tests/subsys/dfu/img_util/src/main.c
index 532cfe5499e..8b9c18a2585 100644
--- a/tests/subsys/dfu/img_util/src/main.c
+++ b/tests/subsys/dfu/img_util/src/main.c
@@ -6,8 +6,8 @@
  */
 
 #include <ztest.h>
-#include <storage/flash_map.h>
-#include <dfu/flash_img.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/dfu/flash_img.h>
 
 void test_init_id(void)
 {
diff --git a/tests/subsys/dfu/mcuboot/src/main.c b/tests/subsys/dfu/mcuboot/src/main.c
index 1a8ec81414d..bdc71cacef5 100644
--- a/tests/subsys/dfu/mcuboot/src/main.c
+++ b/tests/subsys/dfu/mcuboot/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <storage/flash_map.h>
-#include <dfu/mcuboot.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/dfu/mcuboot.h>
 
 #define BOOT_MAGIC_VAL_W0 0xf395c277
 #define BOOT_MAGIC_VAL_W1 0x7fefd260
diff --git a/tests/subsys/dfu/mcuboot_multi/src/main.c b/tests/subsys/dfu/mcuboot_multi/src/main.c
index c5bbb90d863..f8160ac8a3a 100644
--- a/tests/subsys/dfu/mcuboot_multi/src/main.c
+++ b/tests/subsys/dfu/mcuboot_multi/src/main.c
@@ -5,9 +5,9 @@
  */
 
 #include <ztest.h>
-#include <storage/flash_map.h>
-#include <dfu/mcuboot.h>
-#include <drivers/flash.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/dfu/mcuboot.h>
+#include <zephyr/drivers/flash.h>
 
 #define BOOT_MAGIC_VAL_W0 0xf395c277
 #define BOOT_MAGIC_VAL_W1 0x7fefd260
diff --git a/tests/subsys/edac/ibecc/src/dummy.c b/tests/subsys/edac/ibecc/src/dummy.c
index 5c97a1f71dc..39980ca4b28 100644
--- a/tests/subsys/edac/ibecc/src/dummy.c
+++ b/tests/subsys/edac/ibecc/src/dummy.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #include <ztest.h>
 
-#include <drivers/edac.h>
+#include <zephyr/drivers/edac.h>
 
 /**
  * EDAC dummy is used for coverage tests for -ENOSYS returns
diff --git a/tests/subsys/edac/ibecc/src/ibecc.c b/tests/subsys/edac/ibecc/src/ibecc.c
index 09d90787b08..bfc7027a810 100644
--- a/tests/subsys/edac/ibecc/src/ibecc.c
+++ b/tests/subsys/edac/ibecc/src/ibecc.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #include <ztest.h>
 #include <tc_util.h>
 
-#include <drivers/edac.h>
+#include <zephyr/drivers/edac.h>
 #include <ibecc.h>
 
 #define DEVICE_NAME		DT_LABEL(DT_NODELABEL(ibecc))
diff --git a/tests/subsys/edac/ibecc_cov/src/ibecc.c b/tests/subsys/edac/ibecc_cov/src/ibecc.c
index d80f10a452e..9451a6a1864 100644
--- a/tests/subsys/edac/ibecc_cov/src/ibecc.c
+++ b/tests/subsys/edac/ibecc_cov/src/ibecc.c
@@ -7,7 +7,7 @@
 #include <ztest.h>
 #include <tc_util.h>
 
-#include <drivers/pcie/pcie.h>
+#include <zephyr/drivers/pcie/pcie.h>
 #include <ibecc.h>
 
 #define CONFIG_EDAC_LOG_LEVEL LOG_LEVEL_DBG
diff --git a/tests/subsys/fs/common/test_fs_open_flags.c b/tests/subsys/fs/common/test_fs_open_flags.c
index 9d17b0d6771..96c39dd5541 100644
--- a/tests/subsys/fs/common/test_fs_open_flags.c
+++ b/tests/subsys/fs/common/test_fs_open_flags.c
@@ -10,9 +10,9 @@
  * Tests the fs_open flags
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 #include <string.h>
 
 /* Path for testr file should be provided by test runner and should start
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 0f7c9fef9a9..05232c80888 100644
--- a/tests/subsys/fs/fat_fs_api/src/test_fat.h
+++ b/tests/subsys/fs/fat_fs_api/src/test_fat.h
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 
 #define FATFS_MNTP	"/NAND:"
 #if IS_ENABLED(CONFIG_FS_FATFS_LFN)
diff --git a/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c b/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c
index e91db75cb9c..e0e59327960 100644
--- a/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c
+++ b/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c
@@ -6,11 +6,11 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <sys/__assert.h>
-#include <storage/disk_access.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/storage/disk_access.h>
 #include <errno.h>
-#include <init.h>
-#include <device.h>
+#include <zephyr/init.h>
+#include <zephyr/device.h>
 
 #define RAMDISK_SECTOR_SIZE 512
 
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 9961843580a..b7ddc9d90d3 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
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 
 /* Make sure to match the drive name to ELM FAT Lib volume strings */
 #define FATFS_MNTP	"/RAM:"
diff --git a/tests/subsys/fs/fcb/src/fcb_test.h b/tests/subsys/fs/fcb/src/fcb_test.h
index 42b92287b0b..fc0f2de81aa 100644
--- a/tests/subsys/fs/fcb/src/fcb_test.h
+++ b/tests/subsys/fs/fcb/src/fcb_test.h
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <ztest.h>
 
-#include <fs/fcb.h>
+#include <zephyr/fs/fcb.h>
 #include "fcb_priv.h"
 #include <errno.h>
 
diff --git a/tests/subsys/fs/fcb/src/main.c b/tests/subsys/fs/fcb/src/main.c
index d2c672c9cf0..a468e95f18d 100644
--- a/tests/subsys/fs/fcb/src/main.c
+++ b/tests/subsys/fs/fcb/src/main.c
@@ -9,9 +9,9 @@
 #include <string.h>
 
 #include "fcb_test.h"
-#include <storage/flash_map.h>
-#include <drivers/flash.h>
-#include <device.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/device.h>
 
 struct fcb test_fcb;
 uint8_t fcb_test_erase_value;
diff --git a/tests/subsys/fs/fs_api/src/test_fs.c b/tests/subsys/fs/fs_api/src/test_fs.c
index 6a921753020..2c8ce2683c5 100644
--- a/tests/subsys/fs/fs_api/src/test_fs.c
+++ b/tests/subsys/fs/fs_api/src/test_fs.c
@@ -6,13 +6,13 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <errno.h>
-#include <init.h>
-#include <fs/fs.h>
-#include <fs/fs_sys.h>
-#include <sys/__assert.h>
+#include <zephyr/init.h>
+#include <zephyr/fs/fs.h>
+#include <zephyr/fs/fs_sys.h>
+#include <zephyr/sys/__assert.h>
 #include "test_fs.h"
 
 #define BUF_LEN 128
diff --git a/tests/subsys/fs/fs_api/src/test_fs.h b/tests/subsys/fs/fs_api/src/test_fs.h
index bd69d6e909d..c4700d89684 100644
--- a/tests/subsys/fs/fs_api/src/test_fs.h
+++ b/tests/subsys/fs/fs_api/src/test_fs.h
@@ -7,10 +7,10 @@
 #ifndef __TEST_FS_H__
 #define __TEST_FS_H__
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <fs/fs.h>
-#include <fs/fs_sys.h>
+#include <zephyr/fs/fs.h>
+#include <zephyr/fs/fs_sys.h>
 
 #define TEST_FS_MNTP	"/NAND:"
 #define TEST_FILE	TEST_FS_MNTP"/testfile.txt"
diff --git a/tests/subsys/fs/littlefs/src/test_lfs_basic.c b/tests/subsys/fs/littlefs/src/test_lfs_basic.c
index c65d1855d42..b1113591f71 100644
--- a/tests/subsys/fs/littlefs/src/test_lfs_basic.c
+++ b/tests/subsys/fs/littlefs/src/test_lfs_basic.c
@@ -22,7 +22,7 @@
 #include "testfs_lfs.h"
 #include <lfs.h>
 
-#include <fs/littlefs.h>
+#include <zephyr/fs/littlefs.h>
 
 #define HELLO "hello"
 #define GOODBYE "goodbye"
diff --git a/tests/subsys/fs/littlefs/src/test_lfs_dirops.c b/tests/subsys/fs/littlefs/src/test_lfs_dirops.c
index 9a33424fd92..91a3e704ed9 100644
--- a/tests/subsys/fs/littlefs/src/test_lfs_dirops.c
+++ b/tests/subsys/fs/littlefs/src/test_lfs_dirops.c
@@ -18,7 +18,7 @@
 #include "testfs_lfs.h"
 #include <lfs.h>
 
-#include <fs/littlefs.h>
+#include <zephyr/fs/littlefs.h>
 
 static struct testfs_bcmd test_hierarchy[] = {
 	TESTFS_BCMD_FILE("f1", 1, 1),
diff --git a/tests/subsys/fs/littlefs/src/test_lfs_perf.c b/tests/subsys/fs/littlefs/src/test_lfs_perf.c
index 74117fc3db2..c60904c308c 100644
--- a/tests/subsys/fs/littlefs/src/test_lfs_perf.c
+++ b/tests/subsys/fs/littlefs/src/test_lfs_perf.c
@@ -8,13 +8,13 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 #include "testfs_tests.h"
 #include "testfs_lfs.h"
 #include <lfs.h>
 
-#include <fs/littlefs.h>
+#include <zephyr/fs/littlefs.h>
 
 #define HELLO "hello"
 #define GOODBYE "goodbye"
diff --git a/tests/subsys/fs/littlefs/src/testfs_lfs.c b/tests/subsys/fs/littlefs/src/testfs_lfs.c
index 1ce3bc6721a..8f8afb77a75 100644
--- a/tests/subsys/fs/littlefs/src/testfs_lfs.c
+++ b/tests/subsys/fs/littlefs/src/testfs_lfs.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <fs/littlefs.h>
-#include <storage/flash_map.h>
+#include <zephyr/fs/littlefs.h>
+#include <zephyr/storage/flash_map.h>
 #include "testfs_lfs.h"
 
 FS_LITTLEFS_DECLARE_DEFAULT_CONFIG(small);
diff --git a/tests/subsys/fs/littlefs/src/testfs_lfs.h b/tests/subsys/fs/littlefs/src/testfs_lfs.h
index 6e5402e1328..eee0d952a27 100644
--- a/tests/subsys/fs/littlefs/src/testfs_lfs.h
+++ b/tests/subsys/fs/littlefs/src/testfs_lfs.h
@@ -7,7 +7,7 @@
 #ifndef _ZEPHYR_TESTS_SUBSYS_FS_LITTLEFS_TESTFS_LFS_H_
 #define _ZEPHYR_TESTS_SUBSYS_FS_LITTLEFS_TESTFS_LFS_H_
 
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 #include "testfs_util.h"
 
 #define TESTFS_MNT_POINT_SMALL "/sml"
diff --git a/tests/subsys/fs/littlefs/src/testfs_mount_flags.c b/tests/subsys/fs/littlefs/src/testfs_mount_flags.c
index c0693c1c89d..db57266de2e 100644
--- a/tests/subsys/fs/littlefs/src/testfs_mount_flags.c
+++ b/tests/subsys/fs/littlefs/src/testfs_mount_flags.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <fs/littlefs.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 91e4e2e58b8..57789089e0d 100644
--- a/tests/subsys/fs/littlefs/src/testfs_open_flags.c
+++ b/tests/subsys/fs/littlefs/src/testfs_open_flags.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <fs/littlefs.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 462a475b0a1..56ed96ecf4f 100644
--- a/tests/subsys/fs/littlefs/src/testfs_util.c
+++ b/tests/subsys/fs/littlefs/src/testfs_util.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <errno.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 #include <ztest.h>
 #include "testfs_util.h"
 
diff --git a/tests/subsys/fs/littlefs/src/testfs_util.h b/tests/subsys/fs/littlefs/src/testfs_util.h
index 15822c29030..e56224eb520 100644
--- a/tests/subsys/fs/littlefs/src/testfs_util.h
+++ b/tests/subsys/fs/littlefs/src/testfs_util.h
@@ -23,7 +23,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <zephyr/types.h>
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 
 /** Maximum length of a path supported by the test infrastructure. */
 #define TESTFS_PATH_MAX 127
diff --git a/tests/subsys/fs/multi-fs/src/test_common.h b/tests/subsys/fs/multi-fs/src/test_common.h
index 6655ced1cd3..93fa818d5d6 100644
--- a/tests/subsys/fs/multi-fs/src/test_common.h
+++ b/tests/subsys/fs/multi-fs/src/test_common.h
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 #include <limits.h>
 
 void test_clear_flash(void);
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 8bb9a7165f1..9eed54e1d87 100644
--- a/tests/subsys/fs/multi-fs/src/test_common_dir.c
+++ b/tests/subsys/fs/multi-fs/src/test_common_dir.c
@@ -7,8 +7,8 @@
 #include <ztest.h>
 #include <stdio.h>
 #include <limits.h>
-#include <sys/__assert.h>
-#include <fs/fs.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/fs/fs.h>
 #include "test_common.h"
 
 #ifndef PATH_MAX
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 9cd696e46cd..930d0cf0025 100644
--- a/tests/subsys/fs/multi-fs/src/test_common_file.c
+++ b/tests/subsys/fs/multi-fs/src/test_common_file.c
@@ -6,7 +6,7 @@
 
 #include <ztest.h>
 #include <string.h>
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 #include "test_common.h"
 
 int test_file_open(struct fs_file_t *filep, const char *file_path)
diff --git a/tests/subsys/fs/multi-fs/src/test_fat_dir.c b/tests/subsys/fs/multi-fs/src/test_fat_dir.c
index 90524b4f092..9baeaad2c7d 100644
--- a/tests/subsys/fs/multi-fs/src/test_fat_dir.c
+++ b/tests/subsys/fs/multi-fs/src/test_fat_dir.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 #include "test_common.h"
 #include "test_fat.h"
 #include "test_fat_priv.h"
diff --git a/tests/subsys/fs/multi-fs/src/test_fat_file.c b/tests/subsys/fs/multi-fs/src/test_fat_file.c
index 1517638fdc0..c70e89ba4aa 100644
--- a/tests/subsys/fs/multi-fs/src/test_fat_file.c
+++ b/tests/subsys/fs/multi-fs/src/test_fat_file.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 #include "test_common.h"
 #include "test_fat.h"
 #include "test_fat_priv.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 4ea08b05371..e2b7c832e28 100644
--- a/tests/subsys/fs/multi-fs/src/test_fs_shell.c
+++ b/tests/subsys/fs/multi-fs/src/test_fs_shell.c
@@ -9,11 +9,11 @@
  *
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "test_fs_shell.h"
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 static void test_shell_exec(const char *line, int result)
 {
diff --git a/tests/subsys/fs/multi-fs/src/test_fs_shell.h b/tests/subsys/fs/multi-fs/src/test_fs_shell.h
index 78280a36d60..0f0c63f3b83 100644
--- a/tests/subsys/fs/multi-fs/src/test_fs_shell.h
+++ b/tests/subsys/fs/multi-fs/src/test_fs_shell.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 
 void test_fs_help(void);
 void test_fs_fat_mount(void);
diff --git a/tests/subsys/fs/multi-fs/src/test_littlefs_dir.c b/tests/subsys/fs/multi-fs/src/test_littlefs_dir.c
index a6f0d46eef2..d970ba63509 100644
--- a/tests/subsys/fs/multi-fs/src/test_littlefs_dir.c
+++ b/tests/subsys/fs/multi-fs/src/test_littlefs_dir.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 #include "test_common.h"
 #include "test_littlefs.h"
 #include "test_littlefs_priv.h"
diff --git a/tests/subsys/fs/multi-fs/src/test_littlefs_file.c b/tests/subsys/fs/multi-fs/src/test_littlefs_file.c
index ccdae8ca8ae..8ded89adeb2 100644
--- a/tests/subsys/fs/multi-fs/src/test_littlefs_file.c
+++ b/tests/subsys/fs/multi-fs/src/test_littlefs_file.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 #include "test_common.h"
 #include "test_littlefs.h"
 #include "test_littlefs_priv.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 563bfd92413..b694d2a0fea 100644
--- a/tests/subsys/fs/multi-fs/src/test_littlefs_mount.c
+++ b/tests/subsys/fs/multi-fs/src/test_littlefs_mount.c
@@ -6,10 +6,10 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include <device.h>
-#include <fs/fs.h>
+#include <zephyr/device.h>
+#include <zephyr/fs/fs.h>
 #include <ztest.h>
-#include <fs/littlefs.h>
+#include <zephyr/fs/littlefs.h>
 #include "test_fs_shell.h"
 
 #if !defined(CONFIG_FILE_SYSTEM_SHELL)
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 4ed0e0b466d..07560abd9c9 100644
--- a/tests/subsys/fs/multi-fs/src/test_ram_backend.c
+++ b/tests/subsys/fs/multi-fs/src/test_ram_backend.c
@@ -6,9 +6,9 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <device.h>
-#include <drivers/flash.h>
-#include <storage/flash_map.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/storage/flash_map.h>
 #include <zephyr/types.h>
 #include <ztest_assert.h>
 
diff --git a/tests/subsys/fs/multi-fs/src/test_utils.c b/tests/subsys/fs/multi-fs/src/test_utils.c
index df5566f7852..7194d7a8c35 100644
--- a/tests/subsys/fs/multi-fs/src/test_utils.c
+++ b/tests/subsys/fs/multi-fs/src/test_utils.c
@@ -5,10 +5,10 @@
  */
 
 #include <limits.h>
-#include <device.h>
-#include <fs/fs.h>
+#include <zephyr/device.h>
+#include <zephyr/fs/fs.h>
 #include <ztest.h>
-#include <storage/flash_map.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 71bc8b2e047..23fd2ec8a2d 100644
--- a/tests/subsys/fs/nvs/src/main.c
+++ b/tests/subsys/fs/nvs/src/main.c
@@ -19,11 +19,11 @@
 #include <string.h>
 #include <ztest.h>
 
-#include <drivers/flash.h>
-#include <storage/flash_map.h>
-#include <stats/stats.h>
-#include <sys/crc.h>
-#include <fs/nvs.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/stats/stats.h>
+#include <zephyr/sys/crc.h>
+#include <zephyr/fs/nvs.h>
 #include "nvs_priv.h"
 
 #define TEST_FLASH_AREA_STORAGE_OFFSET	FLASH_AREA_OFFSET(storage)
diff --git a/tests/subsys/ipc/icmsg_buf/src/main.c b/tests/subsys/ipc/icmsg_buf/src/main.c
index a6171f1a3fc..22d60016d1f 100644
--- a/tests/subsys/ipc/icmsg_buf/src/main.c
+++ b/tests/subsys/ipc/icmsg_buf/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <ipc/ipc_icmsg_buf.h>
+#include <zephyr/ipc/ipc_icmsg_buf.h>
 
 /* The buffer size itself would be 199 bytes.
  * 212 - sizeof(struct icmsg_buf) - 1 = 199.
diff --git a/tests/subsys/ipc/ipc_service/src/backend.c b/tests/subsys/ipc/ipc_service/src/backend.c
index c7ece18f222..dc928138b7a 100644
--- a/tests/subsys/ipc/ipc_service/src/backend.c
+++ b/tests/subsys/ipc/ipc_service/src/backend.c
@@ -7,12 +7,12 @@
  * passed in input as IPC message.
  */
 
-#include <ipc/ipc_service_backend.h>
+#include <zephyr/ipc/ipc_service_backend.h>
 
-#include <logging/log.h>
-#include <sys/util_macro.h>
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 
 #define DT_DRV_COMPAT		ipc_service_backend
 
diff --git a/tests/subsys/ipc/ipc_service/src/main.c b/tests/subsys/ipc/ipc_service/src/main.c
index 00eeec02281..373c3a09af2 100644
--- a/tests/subsys/ipc/ipc_service/src/main.c
+++ b/tests/subsys/ipc/ipc_service/src/main.c
@@ -2,10 +2,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <ztest.h>
-#include <ipc/ipc_service.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 5775ffe7320..88ad96467e0 100644
--- a/tests/subsys/jwt/src/main.c
+++ b/tests/subsys/jwt/src/main.c
@@ -20,8 +20,8 @@
 #include <zephyr/types.h>
 #include <stdbool.h>
 #include <ztest.h>
-#include <data/json.h>
-#include <data/jwt.h>
+#include <zephyr/data/json.h>
+#include <zephyr/data/jwt.h>
 
 #include <mbedtls/pk.h>
 #include <mbedtls/rsa.h>
diff --git a/tests/subsys/logging/log_api/src/main.c b/tests/subsys/logging/log_api/src/main.c
index 0b9f388ac8a..1748967ef92 100644
--- a/tests/subsys/logging/log_api/src/main.c
+++ b/tests/subsys/logging/log_api/src/main.c
@@ -8,8 +8,8 @@
 #include "mock_frontend.h"
 #include "test_module.h"
 #include <ztest.h>
-#include <logging/log.h>
-#include <logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
 
 #ifndef CONFIG_LOG_BUFFER_SIZE
 #define CONFIG_LOG_BUFFER_SIZE 4
diff --git a/tests/subsys/logging/log_api/src/mock_backend.c b/tests/subsys/logging/log_api/src/mock_backend.c
index 7c0a42198a9..5f9cabfd596 100644
--- a/tests/subsys/logging/log_api/src/mock_backend.c
+++ b/tests/subsys/logging/log_api/src/mock_backend.c
@@ -6,7 +6,7 @@
 
 #include "mock_backend.h"
 #include <ztest.h>
-#include <logging/log_core.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_backend.h b/tests/subsys/logging/log_api/src/mock_backend.h
index 32f6e8bd2d5..19058ca8204 100644
--- a/tests/subsys/logging/log_api/src/mock_backend.h
+++ b/tests/subsys/logging/log_api/src/mock_backend.h
@@ -7,7 +7,7 @@
 #ifndef SRC_MOCK_BACKEND_H__
 #define SRC_MOCK_BACKEND_H__
 
-#include <logging/log_backend.h>
+#include <zephyr/logging/log_backend.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/tests/subsys/logging/log_api/src/mock_frontend.c b/tests/subsys/logging/log_api/src/mock_frontend.c
index ae9af71cb62..ec90d08af06 100644
--- a/tests/subsys/logging/log_api/src/mock_frontend.c
+++ b/tests/subsys/logging/log_api/src/mock_frontend.c
@@ -6,7 +6,7 @@
 
 #include "mock_backend.h"
 #include <ztest.h>
-#include <logging/log_ctrl.h>
+#include <zephyr/logging/log_ctrl.h>
 
 struct mock_log_frontend {
 	bool do_check;
diff --git a/tests/subsys/logging/log_api/src/test_module.c b/tests/subsys/logging/log_api/src/test_module.c
index 6090afea3f1..dc6d5ab75af 100644
--- a/tests/subsys/logging/log_api/src/test_module.c
+++ b/tests/subsys/logging/log_api/src/test_module.c
@@ -11,7 +11,7 @@
  */
 
 #include "test_module.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(test, CONFIG_SAMPLE_MODULE_LOG_LEVEL);
 
diff --git a/tests/subsys/logging/log_api/src/test_module.h b/tests/subsys/logging/log_api/src/test_module.h
index 5cda3b50458..9eebd35e56a 100644
--- a/tests/subsys/logging/log_api/src/test_module.h
+++ b/tests/subsys/logging/log_api/src/test_module.h
@@ -7,7 +7,7 @@
 #ifndef TEST_MODULE_H
 #define TEST_MODULE_H
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/tests/subsys/logging/log_api/src/test_module2.c b/tests/subsys/logging/log_api/src/test_module2.c
index 9abcffa1370..022c660260c 100644
--- a/tests/subsys/logging/log_api/src/test_module2.c
+++ b/tests/subsys/logging/log_api/src/test_module2.c
@@ -11,7 +11,7 @@
  */
 
 #include "test_module.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 /* Module disabled by default, will emit logs only when CONFIG_LOG_OVERRIDE_LEVEL. */
 LOG_MODULE_REGISTER(test2, 0);
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 3005b205e54..2d01483242e 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
@@ -12,14 +12,14 @@
 
 #include <stdbool.h>
 #include <stdlib.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 
 #define DT_DRV_COMPAT zephyr_fstab_littlefs
 #define TEST_AUTOMOUNT DT_PROP(DT_DRV_INST(0), automount)
 #if !TEST_AUTOMOUNT
-#include <fs/littlefs.h>
+#include <zephyr/fs/littlefs.h>
 #define PARTITION_NODE DT_NODELABEL(lfs1)
 FS_FSTAB_DECLARE_ENTRY(PARTITION_NODE);
 #endif
diff --git a/tests/subsys/logging/log_benchmark/src/main.c b/tests/subsys/logging/log_benchmark/src/main.c
index a0743529301..030c1bfea83 100644
--- a/tests/subsys/logging/log_benchmark/src/main.c
+++ b/tests/subsys/logging/log_benchmark/src/main.c
@@ -13,11 +13,11 @@
 
 #include <tc_util.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <logging/log_backend.h>
-#include <logging/log_ctrl.h>
-#include <logging/log.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
 #include "test_helpers.h"
 
 #define LOG_MODULE_NAME test
diff --git a/tests/subsys/logging/log_benchmark/src/test_helpers.c b/tests/subsys/logging/log_benchmark/src/test_helpers.c
index 05dac759d20..ad8b4f571bb 100644
--- a/tests/subsys/logging/log_benchmark/src/test_helpers.c
+++ b/tests/subsys/logging/log_benchmark/src/test_helpers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include "test_helpers.h"
-#include <logging/log_internal.h>
-#include <logging/log_ctrl.h>
+#include <zephyr/logging/log_internal.h>
+#include <zephyr/logging/log_ctrl.h>
 
 
 static log_timestamp_t stamp;
diff --git a/tests/subsys/logging/log_benchmark/src/test_helpers.h b/tests/subsys/logging/log_benchmark/src/test_helpers.h
index 3dac9658480..60e0c24b83e 100644
--- a/tests/subsys/logging/log_benchmark/src/test_helpers.h
+++ b/tests/subsys/logging/log_benchmark/src/test_helpers.h
@@ -6,7 +6,7 @@
 #ifndef SRC_TEST_HELPERS_H__
 #define SRC_TEST_HELPERS_H__
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 __syscall void test_helpers_log_setup(void);
 __syscall int test_helpers_cycle_get(void);
diff --git a/tests/subsys/logging/log_core/src/log_core_test.c b/tests/subsys/logging/log_core/src/log_core_test.c
index 9358d373b7f..05c251042a7 100644
--- a/tests/subsys/logging/log_core/src/log_core_test.c
+++ b/tests/subsys/logging/log_core/src/log_core_test.c
@@ -13,11 +13,11 @@
 
 #include <tc_util.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <logging/log_backend.h>
-#include <logging/log_ctrl.h>
-#include <logging/log.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
 #include "test_module.h"
 
 #define LOG_MODULE_NAME test
diff --git a/tests/subsys/logging/log_core/src/test_module.c b/tests/subsys/logging/log_core/src/test_module.c
index 2281712da76..b2f692dc2d1 100644
--- a/tests/subsys/logging/log_core/src/test_module.c
+++ b/tests/subsys/logging/log_core/src/test_module.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(test);
 
diff --git a/tests/subsys/logging/log_core/src/test_module.h b/tests/subsys/logging/log_core/src/test_module.h
index 3631a8c6f59..17dff676b5d 100644
--- a/tests/subsys/logging/log_core/src/test_module.h
+++ b/tests/subsys/logging/log_core/src/test_module.h
@@ -7,7 +7,7 @@
 #ifndef TEST_MODULE_H
 #define TEST_MODULE_H
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 void test_func(void);
 
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 a89d5c160d0..42bd406dbf1 100644
--- a/tests/subsys/logging/log_core_additional/src/log_test.c
+++ b/tests/subsys/logging/log_core_additional/src/log_test.c
@@ -12,13 +12,13 @@
 
 #include <tc_util.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <logging/log_backend.h>
-#include <logging/log_backend_std.h>
-#include <logging/log_ctrl.h>
-#include <logging/log.h>
-#include <logging/log_output.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_backend_std.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_output.h>
 
 #define LOG_MODULE_NAME log_test
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
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 d238d0f60aa..316f63c0d09 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
@@ -12,11 +12,11 @@
 
 #include <tc_util.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <logging/log_backend.h>
-#include <logging/log_ctrl.h>
-#include <logging/log.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
 
 /* Interfaces tested in these cases have been tested in kernel space.
  * Test cases in this file run in user space to improve test coverage
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 bb1f7371499..667b8c75f20 100644
--- a/tests/subsys/logging/log_immediate/src/log_immediate_test.c
+++ b/tests/subsys/logging/log_immediate/src/log_immediate_test.c
@@ -13,11 +13,11 @@
 
 #include <tc_util.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <logging/log_backend.h>
-#include <logging/log_ctrl.h>
-#include <logging/log.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_MODULE_NAME test
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
diff --git a/tests/subsys/logging/log_list/src/log_list_test.c b/tests/subsys/logging/log_list/src/log_list_test.c
index 1fd20439334..f86088f3878 100644
--- a/tests/subsys/logging/log_list/src/log_list_test.c
+++ b/tests/subsys/logging/log_list/src/log_list_test.c
@@ -14,7 +14,7 @@
 
 #include <tc_util.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 
diff --git a/tests/subsys/logging/log_msg/src/log_msg_test.c b/tests/subsys/logging/log_msg/src/log_msg_test.c
index 8971dbc1b30..c1139cce02a 100644
--- a/tests/subsys/logging/log_msg/src/log_msg_test.c
+++ b/tests/subsys/logging/log_msg/src/log_msg_test.c
@@ -9,11 +9,11 @@
  * @brief Test log message
  */
 
-#include <logging/log_msg.h>
+#include <zephyr/logging/log_msg.h>
 
 #include <tc_util.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 extern struct k_mem_slab log_msg_pool;
diff --git a/tests/subsys/logging/log_msg2/src/main.c b/tests/subsys/logging/log_msg2/src/main.c
index ddde41c7c91..afe1deb8731 100644
--- a/tests/subsys/logging/log_msg2/src/main.c
+++ b/tests/subsys/logging/log_msg2/src/main.c
@@ -9,15 +9,15 @@
  * @brief Test log message
  */
 
-#include <logging/log_msg2.h>
-#include <logging/log_internal.h>
-#include <logging/log_ctrl.h>
+#include <zephyr/logging/log_msg2.h>
+#include <zephyr/logging/log_internal.h>
+#include <zephyr/logging/log_ctrl.h>
 
 #include <tc_util.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <sys/cbprintf.h>
+#include <zephyr/sys/cbprintf.h>
 
 #if CONFIG_NO_OPTIMIZATIONS
 #define EXP_MODE(name) Z_LOG_MSG2_MODE_RUNTIME
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 98460b38b8e..fb5c4167108 100644
--- a/tests/subsys/logging/log_output/src/log_output_test.c
+++ b/tests/subsys/logging/log_output/src/log_output_test.c
@@ -9,12 +9,12 @@
  * @brief Test log message
  */
 
-#include <logging/log.h>
-#include <logging/log_output.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_output.h>
 
 #include <tc_util.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #define LOG_MODULE_NAME test
diff --git a/tests/subsys/logging/log_stack/src/main.c b/tests/subsys/logging/log_stack/src/main.c
index 1636c487192..5c9e9ca0ea0 100644
--- a/tests/subsys/logging/log_stack/src/main.c
+++ b/tests/subsys/logging/log_stack/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 /* The idea of this test is to estimate stack usage of logging messages. Each
  * test checks stack usage before and after logging a message. Increase of stack
diff --git a/tests/subsys/mgmt/ec_host_cmd/src/main.c b/tests/subsys/mgmt/ec_host_cmd/src/main.c
index b6eb1f53f84..a0982ac10e6 100644
--- a/tests/subsys/mgmt/ec_host_cmd/src/main.c
+++ b/tests/subsys/mgmt/ec_host_cmd/src/main.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/ec_host_cmd_periph/ec_host_cmd_simulator.h>
-#include <mgmt/ec_host_cmd.h>
+#include <zephyr/drivers/ec_host_cmd_periph/ec_host_cmd_simulator.h>
+#include <zephyr/mgmt/ec_host_cmd.h>
 #include <ztest.h>
 
 /* Variables used to record what is "sent" to host for verification. */
diff --git a/tests/subsys/mgmt/smp_reassembly/src/main.c b/tests/subsys/mgmt/smp_reassembly/src/main.c
index 778d30521fc..d4d72f2ebe5 100644
--- a/tests/subsys/mgmt/smp_reassembly/src/main.c
+++ b/tests/subsys/mgmt/smp_reassembly/src/main.c
@@ -5,10 +5,10 @@
  */
 
 #include <ztest.h>
-#include <sys/byteorder.h>
-#include <net/buf.h>
-#include <mgmt/mcumgr/smp.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/mgmt/mcumgr/smp.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 #include <mgmt/mgmt.h>
 #include "../../../../../subsys/mgmt/mcumgr/smp_reassembly.h"
 
diff --git a/tests/subsys/modbus/src/test_modbus.h b/tests/subsys/modbus/src/test_modbus.h
index eec90479d92..5303a04c4b0 100644
--- a/tests/subsys/modbus/src/test_modbus.h
+++ b/tests/subsys/modbus/src/test_modbus.h
@@ -7,9 +7,9 @@
 #ifndef __TEST_MODBUS_H__
 #define __TEST_MODBUS_H__
 
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <ztest.h>
-#include <modbus/modbus.h>
+#include <zephyr/modbus/modbus.h>
 
 #define MB_TEST_BAUDRATE_LOW	9600
 #define MB_TEST_BAUDRATE_HIGH	115200
diff --git a/tests/subsys/modbus/src/test_modbus_client.c b/tests/subsys/modbus/src/test_modbus_client.c
index d3daa47bb11..45455d166da 100644
--- a/tests/subsys/modbus/src/test_modbus_client.c
+++ b/tests/subsys/modbus/src/test_modbus_client.c
@@ -6,7 +6,7 @@
 
 #include "test_modbus.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mbc_test, LOG_LEVEL_INF);
 
 #ifdef CONFIG_MODBUS_CLIENT
diff --git a/tests/subsys/modbus/src/test_modbus_raw.c b/tests/subsys/modbus/src/test_modbus_raw.c
index 232c2eaebc4..c0ec18d5097 100644
--- a/tests/subsys/modbus/src/test_modbus_raw.c
+++ b/tests/subsys/modbus/src/test_modbus_raw.c
@@ -6,7 +6,7 @@
 
 #include "test_modbus.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(raw_test, LOG_LEVEL_INF);
 
 static struct modbus_adu tmp_adu;
diff --git a/tests/subsys/modbus/src/test_modbus_server.c b/tests/subsys/modbus/src/test_modbus_server.c
index 6696c51b9ea..fd8988f7597 100644
--- a/tests/subsys/modbus/src/test_modbus_server.c
+++ b/tests/subsys/modbus/src/test_modbus_server.c
@@ -6,7 +6,7 @@
 
 #include "test_modbus.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mbs_test, LOG_LEVEL_INF);
 
 const static uint16_t fp_offset = MB_TEST_FP_OFFSET;
diff --git a/tests/subsys/openthread/radio_stub.c b/tests/subsys/openthread/radio_stub.c
index b66116ce1b8..a097fcd5254 100644
--- a/tests/subsys/openthread/radio_stub.c
+++ b/tests/subsys/openthread/radio_stub.c
@@ -11,7 +11,7 @@
 #define DISABLE_SYSCALL_TRACING
 
 /* needed here so the static device_get_binding does not get renamed */
-#include <device.h>
+#include <zephyr/device.h>
 
 /* OpenThread not enabled here */
 #define CONFIG_OPENTHREAD_L2_LOG_LEVEL LOG_LEVEL_DBG
diff --git a/tests/subsys/openthread/radio_test.c b/tests/subsys/openthread/radio_test.c
index 9c6359eed02..9febc78a593 100644
--- a/tests/subsys/openthread/radio_test.c
+++ b/tests/subsys/openthread/radio_test.c
@@ -6,12 +6,12 @@
 
 #include <ztest.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
 #include <stdio.h>
 
-#include <net/ieee802154_radio.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/ieee802154_radio.h>
+#include <zephyr/net/net_pkt.h>
 
 #include <openthread/platform/radio.h>
 #include <openthread/message.h>
diff --git a/tests/subsys/pm/device_power_domains/src/main.c b/tests/subsys/pm/device_power_domains/src/main.c
index 35157eb05b6..c2e73ccd21b 100644
--- a/tests/subsys/pm/device_power_domains/src/main.c
+++ b/tests/subsys/pm/device_power_domains/src/main.c
@@ -6,8 +6,8 @@
  */
 
 #include <ztest.h>
-#include <pm/device.h>
-#include <pm/device_runtime.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 
 static void test_demo(void)
 {
diff --git a/tests/subsys/pm/device_runtime_api/src/main.c b/tests/subsys/pm/device_runtime_api/src/main.c
index 558b510e304..c17cff65189 100644
--- a/tests/subsys/pm/device_runtime_api/src/main.c
+++ b/tests/subsys/pm/device_runtime_api/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <pm/device.h>
-#include <pm/device_runtime.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 
 #include "test_driver.h"
 
diff --git a/tests/subsys/pm/device_runtime_api/src/test_driver.c b/tests/subsys/pm/device_runtime_api/src/test_driver.c
index 3d49487a958..cb91cbffc0e 100644
--- a/tests/subsys/pm/device_runtime_api/src/test_driver.c
+++ b/tests/subsys/pm/device_runtime_api/src/test_driver.c
@@ -6,8 +6,8 @@
 
 #include "test_driver.h"
 
-#include <kernel.h>
-#include <pm/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/pm/device.h>
 
 struct test_driver_data {
 	bool ongoing;
diff --git a/tests/subsys/pm/device_runtime_api/src/test_driver.h b/tests/subsys/pm/device_runtime_api/src/test_driver.h
index da3a7d707cc..a5305f938c4 100644
--- a/tests/subsys/pm/device_runtime_api/src/test_driver.h
+++ b/tests/subsys/pm/device_runtime_api/src/test_driver.h
@@ -7,7 +7,7 @@
 #ifndef TESTS_SUBSYS_PM_DEVICE_RUNTIME_TEST_DRIVER_H_
 #define TESTS_SUBSYS_PM_DEVICE_RUNTIME_TEST_DRIVER_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 /**
  * @brief Put test driver in async test mode.
diff --git a/tests/subsys/pm/device_wakeup_api/src/main.c b/tests/subsys/pm/device_wakeup_api/src/main.c
index 344cea07c93..60ef9ae6ea1 100644
--- a/tests/subsys/pm/device_wakeup_api/src/main.c
+++ b/tests/subsys/pm/device_wakeup_api/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <pm/pm.h>
-#include <pm/device.h>
+#include <zephyr/pm/pm.h>
+#include <zephyr/pm/device.h>
 
 #define DEV_NAME DT_NODELABEL(gpio0)
 
diff --git a/tests/subsys/pm/policy_api/src/main.c b/tests/subsys/pm/policy_api/src/main.c
index f4b9b67667c..3956fb6f47f 100644
--- a/tests/subsys/pm/policy_api/src/main.c
+++ b/tests/subsys/pm/policy_api/src/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <pm/policy.h>
-#include <sys/time_units.h>
-#include <sys_clock.h>
+#include <zephyr/pm/policy.h>
+#include <zephyr/sys/time_units.h>
+#include <zephyr/sys_clock.h>
 #include <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 8de26138efa..e4989126110 100644
--- a/tests/subsys/pm/power_domain/src/main.c
+++ b/tests/subsys/pm/power_domain/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <pm/device.h>
-#include <pm/device_runtime.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 
 #define NUMBER_OF_DEVICES 3
 
diff --git a/tests/subsys/pm/power_mgmt/src/dummy_driver.c b/tests/subsys/pm/power_mgmt/src/dummy_driver.c
index bbba15791c1..f33722c30a1 100644
--- a/tests/subsys/pm/power_mgmt/src/dummy_driver.c
+++ b/tests/subsys/pm/power_mgmt/src/dummy_driver.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include <zephyr/types.h>
-#include <pm/device.h>
-#include <pm/device_runtime.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 #include "dummy_driver.h"
 
 static int dummy_open(const struct device *dev)
diff --git a/tests/subsys/pm/power_mgmt/src/dummy_driver.h b/tests/subsys/pm/power_mgmt/src/dummy_driver.h
index f89f302109f..1ab1d3d83e0 100644
--- a/tests/subsys/pm/power_mgmt/src/dummy_driver.h
+++ b/tests/subsys/pm/power_mgmt/src/dummy_driver.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #define DUMMY_DRIVER_NAME	"dummy_driver"
 
 typedef int (*dummy_api_open_t)(const struct device *dev);
diff --git a/tests/subsys/pm/power_mgmt/src/main.c b/tests/subsys/pm/power_mgmt/src/main.c
index ebd99428502..aa644563bea 100644
--- a/tests/subsys/pm/power_mgmt/src/main.c
+++ b/tests/subsys/pm/power_mgmt/src/main.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/printk.h>
-#include <zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
-#include <pm/device.h>
-#include <pm/device_runtime.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 #include <ztest.h>
 #include <ksched.h>
-#include <kernel.h>
-#include <pm/pm.h>
+#include <zephyr/kernel.h>
+#include <zephyr/pm/pm.h>
 #include "dummy_driver.h"
 
 #define SLEEP_MSEC 100
diff --git a/tests/subsys/pm/power_mgmt_multicore/src/main.c b/tests/subsys/pm/power_mgmt_multicore/src/main.c
index e552d504f99..2a809043ea3 100644
--- a/tests/subsys/pm/power_mgmt_multicore/src/main.c
+++ b/tests/subsys/pm/power_mgmt_multicore/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <kernel.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
-#include <pm/pm.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 e0ebc5af143..b03dd07494b 100644
--- a/tests/subsys/pm/power_mgmt_soc/src/main.c
+++ b/tests/subsys/pm/power_mgmt_soc/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #define LOG_LEVEL LOG_LEVEL_INF
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <tc_util.h>
 LOG_MODULE_DECLARE(brd_pm_test);
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 7e1d5f166f5..71f32f0d886 100644
--- a/tests/subsys/pm/power_mgmt_soc/src/power_mgmt.c
+++ b/tests/subsys/pm/power_mgmt_soc/src/power_mgmt.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
-#include <pm/pm.h>
-#include <logging/log.h>
+#include <zephyr/pm/pm.h>
+#include <zephyr/logging/log.h>
 #define LOG_LEVEL LOG_LEVEL_DBG
 LOG_MODULE_REGISTER(pwrmgmt_test);
 
diff --git a/tests/subsys/pm/power_states_api/src/main.c b/tests/subsys/pm/power_states_api/src/main.c
index acbde13e06b..0398d9260bd 100644
--- a/tests/subsys/pm/power_states_api/src/main.c
+++ b/tests/subsys/pm/power_states_api/src/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <pm/pm.h>
+#include <zephyr/pm/pm.h>
 
 /* Last state has not declared a minimum residency, so it should be
  * set the default 0 value
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 ff4afd7f988..e86d63ef2af 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/kernel_apis.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/kernel_apis.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 #define WAIT_TIME_US 1000000
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/mailq.c b/tests/subsys/portability/cmsis_rtos_v1/src/mailq.c
index 25d55c58878..a3452d3f685 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/mailq.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/mailq.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 struct sample_data {
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/main.c b/tests/subsys/portability/cmsis_rtos_v1/src/main.c
index 720ead96a88..4ba2cc4fb0b 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/main.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 extern void test_kernel_start(void);
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/mempool.c b/tests/subsys/portability/cmsis_rtos_v1/src/mempool.c
index 9a905e98028..493f08595bc 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/mempool.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/mempool.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 struct mem_block {
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/msgq.c b/tests/subsys/portability/cmsis_rtos_v1/src/msgq.c
index 916bf6c46c5..522467d60de 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/msgq.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/msgq.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 #define MESSAGE1	512
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/mutex.c b/tests/subsys/portability/cmsis_rtos_v1/src/mutex.c
index fa2e99ad2df..7ba3e5e5ebe 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/mutex.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/mutex.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 #define TIMEOUT 500
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/semaphore.c b/tests/subsys/portability/cmsis_rtos_v1/src/semaphore.c
index e67087731a2..d07f8b09019 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/semaphore.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/semaphore.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 #define TIMEOUT 500
diff --git a/tests/subsys/portability/cmsis_rtos_v1/src/signal.c b/tests/subsys/portability/cmsis_rtos_v1/src/signal.c
index 7d74b2c1819..849c82781c6 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/signal.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/signal.c
@@ -5,11 +5,11 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
-#include <irq_offload.h>
-#include <kernel_structs.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/kernel_structs.h>
 
 #define TIMEOUT		(100)
 #define SIGNAL1		(0x00000020)
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 b6f26943e7b..6485533f5ed 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/thread_apis.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/thread_apis.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 #define STACKSZ CONFIG_CMSIS_THREAD_MAX_STACK_SIZE
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 ade66dbc708..fa0b9982a6e 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/src/thread_instance.c
+++ b/tests/subsys/portability/cmsis_rtos_v1/src/thread_instance.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 #ifdef CONFIG_COVERAGE
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 42eb66fb44f..98e7e90f6e1 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/event_flags.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/event_flags.c
@@ -5,11 +5,11 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
-#include <irq_offload.h>
-#include <kernel_structs.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/kernel_structs.h>
 
 #define TIMEOUT_TICKS   (100)
 #define FLAG1           (0x00000020)
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/kernel.c b/tests/subsys/portability/cmsis_rtos_v2/src/kernel.c
index caf00efc007..fb705fa4f26 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/kernel.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/kernel.c
@@ -6,8 +6,8 @@
 
 #include <ztest.h>
 #include <cmsis_os2.h>
-#include <irq_offload.h>
-#include <kernel.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/kernel.h>
 
 uint32_t tick;
 osStatus_t status_val;
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/main.c b/tests/subsys/portability/cmsis_rtos_v2/src/main.c
index a00b99e56c0..a646d266046 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/main.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
 extern void test_kernel_apis(void);
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/mempool.c b/tests/subsys/portability/cmsis_rtos_v2/src/mempool.c
index a85a5ec09ce..acbeec09572 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/mempool.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/mempool.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
 #define MAX_BLOCKS      10
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/msgq.c b/tests/subsys/portability/cmsis_rtos_v2/src/msgq.c
index 31a5704a3f8..f8d86acc19f 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/msgq.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/msgq.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
 struct sample_data {
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/mutex.c b/tests/subsys/portability/cmsis_rtos_v2/src/mutex.c
index c3716003cb1..9060f664c89 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/mutex.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/mutex.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
 #define TIMEOUT_TICKS   10
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/semaphore.c b/tests/subsys/portability/cmsis_rtos_v2/src/semaphore.c
index c2f4621e111..c5fdf7f7d6a 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/semaphore.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/semaphore.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
 #define TIMEOUT_TICKS   10
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 df4910e9b46..c638fed22f5 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/thread_apis.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/thread_apis.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
 #define STACKSZ         CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
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 3048bfbfe22..700027f1624 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/thread_flags.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/thread_flags.c
@@ -5,11 +5,11 @@
  */
 
 #include <ztest.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
-#include <irq_offload.h>
-#include <kernel_structs.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/kernel_structs.h>
 
 #define TIMEOUT_TICKS   (10)
 #define FLAG1           (0x00000020)
diff --git a/tests/subsys/settings/fcb/src/settings_test.h b/tests/subsys/settings/fcb/src/settings_test.h
index fbd927cf83a..0a73d2eff46 100644
--- a/tests/subsys/settings/fcb/src/settings_test.h
+++ b/tests/subsys/settings/fcb/src/settings_test.h
@@ -13,7 +13,7 @@
 #include <ztest.h>
 
 #include "settings/settings.h"
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/tests/subsys/settings/fcb/src/settings_test_compress_deleted.c b/tests/subsys/settings/fcb/src/settings_test_compress_deleted.c
index 0260c3c2b7e..6e1c51017f2 100644
--- a/tests/subsys/settings/fcb/src/settings_test_compress_deleted.c
+++ b/tests/subsys/settings/fcb/src/settings_test_compress_deleted.c
@@ -6,7 +6,7 @@
 
 #include "settings_test.h"
 #include "settings/settings_fcb.h"
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 #define NAME_DELETABLE "4/deletable"
 
diff --git a/tests/subsys/settings/fcb/src/settings_test_fcb.c b/tests/subsys/settings/fcb/src/settings_test_fcb.c
index 4e47104797a..c2e27041f9b 100644
--- a/tests/subsys/settings/fcb/src/settings_test_fcb.c
+++ b/tests/subsys/settings/fcb/src/settings_test_fcb.c
@@ -9,7 +9,7 @@
 
 #include "settings_test.h"
 #include "settings_priv.h"
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 
 uint8_t val8;
 uint8_t val8_un;
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 a7385b1ff10..627abdd7c6b 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
@@ -7,13 +7,13 @@
 #include <stdio.h>
 #include <ztest.h>
 
-#include <zephyr.h>
-#include <sys/reboot.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/reboot.h>
 #include <string.h>
 
-#include <settings/settings.h>
-#include <storage/flash_map.h>
-#include <drivers/flash.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/drivers/flash.h>
 
 static uint32_t val32;
 
diff --git a/tests/subsys/settings/fs/include/settings_test_fs.h b/tests/subsys/settings/fs/include/settings_test_fs.h
index 80d76821bb9..26743c74654 100644
--- a/tests/subsys/settings/fs/include/settings_test_fs.h
+++ b/tests/subsys/settings/fs/include/settings_test_fs.h
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ztest.h>
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 
 #include "settings/settings.h"
 
diff --git a/tests/subsys/settings/fs/src/settings_test_empty_file.c b/tests/subsys/settings/fs/src/settings_test_empty_file.c
index a87efc9efad..9768c11a651 100644
--- a/tests/subsys/settings/fs/src/settings_test_empty_file.c
+++ b/tests/subsys/settings/fs/src/settings_test_empty_file.c
@@ -7,7 +7,7 @@
 
 #include "settings_test.h"
 #include "settings/settings_file.h"
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 
 void test_config_empty_file(void)
 {
diff --git a/tests/subsys/settings/functional/src/settings_basic_test.c b/tests/subsys/settings/functional/src/settings_basic_test.c
index f3c1c7e4710..a7095c41268 100644
--- a/tests/subsys/settings/functional/src/settings_basic_test.c
+++ b/tests/subsys/settings/functional/src/settings_basic_test.c
@@ -9,19 +9,19 @@
  *
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <errno.h>
-#include <settings/settings.h>
-#include <logging/log.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(settings_basic_test);
 
 #if defined(CONFIG_SETTINGS_FCB) || defined(CONFIG_SETTINGS_NVS)
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 #endif
 #if IS_ENABLED(CONFIG_SETTINGS_FS)
-#include <fs/fs.h>
-#include <fs/littlefs.h>
+#include <zephyr/fs/fs.h>
+#include <zephyr/fs/littlefs.h>
 #endif
 
 /* The standard test expects a cleared flash area.  Make sure it has
diff --git a/tests/subsys/settings/littlefs/src/settings_setup_littlefs.c b/tests/subsys/settings/littlefs/src/settings_setup_littlefs.c
index ff39ed0fb66..a437a1be86b 100644
--- a/tests/subsys/settings/littlefs/src/settings_setup_littlefs.c
+++ b/tests/subsys/settings/littlefs/src/settings_setup_littlefs.c
@@ -5,9 +5,9 @@
  */
 
 #include "settings_test.h"
-#include <device.h>
-#include <fs/fs.h>
-#include <fs/littlefs.h>
+#include <zephyr/device.h>
+#include <zephyr/fs/fs.h>
+#include <zephyr/fs/littlefs.h>
 
 /* NFFS work area strcut */
 FS_LITTLEFS_DECLARE_DEFAULT_CONFIG(cstorage);
diff --git a/tests/subsys/shell/shell/src/main.c b/tests/subsys/shell/shell/src/main.c
index 4d51db77e49..9dce1fd39e3 100644
--- a/tests/subsys/shell/shell/src/main.c
+++ b/tests/subsys/shell/shell/src/main.c
@@ -9,11 +9,11 @@
  *
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
-#include <shell/shell.h>
-#include <shell/shell_dummy.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_dummy.h>
 
 #define MAX_CMD_SYNTAX_LEN	(11)
 static char dynamic_cmd_buffer[][MAX_CMD_SYNTAX_LEN] = {
diff --git a/tests/subsys/shell/shell/src/test_module.c b/tests/subsys/shell/shell/src/test_module.c
index 75916332d1c..2ba31894891 100644
--- a/tests/subsys/shell/shell/src/test_module.c
+++ b/tests/subsys/shell/shell/src/test_module.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 static int cmd2_handler(const struct shell *sh, size_t argc, char **argv)
 {
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 a30f3c49126..9ad77521301 100644
--- a/tests/subsys/shell/shell_flash/src/shell_flash_test.c
+++ b/tests/subsys/shell/shell_flash/src/shell_flash_test.c
@@ -9,13 +9,13 @@
  *
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <device.h>
+#include <zephyr/device.h>
 
-#include <drivers/flash.h>
-#include <shell/shell.h>
-#include <shell/shell_dummy.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_dummy.h>
 
 /* configuration derived from DT */
 #ifdef CONFIG_ARCH_POSIX
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 4e2ee28a84c..8fc636f76e4 100644
--- a/tests/subsys/shell/shell_history/src/shell_history_test.c
+++ b/tests/subsys/shell/shell_history/src/shell_history_test.c
@@ -9,10 +9,10 @@
  *
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
-#include <shell/shell_history.h>
+#include <zephyr/shell/shell_history.h>
 
 #define HIST_BUF_SIZE 160
 Z_SHELL_HISTORY_DEFINE(history, HIST_BUF_SIZE);
diff --git a/tests/subsys/storage/flash_map/src/main.c b/tests/subsys/storage/flash_map/src/main.c
index 171a9e8ee2c..0dca42031bb 100644
--- a/tests/subsys/storage/flash_map/src/main.c
+++ b/tests/subsys/storage/flash_map/src/main.c
@@ -7,8 +7,8 @@
  */
 
 #include <ztest.h>
-#include <drivers/flash.h>
-#include <storage/flash_map.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/storage/flash_map.h>
 
 extern int flash_map_entries;
 struct flash_sector fs_sectors[256];
diff --git a/tests/subsys/storage/stream/stream_flash/src/main.c b/tests/subsys/storage/stream/stream_flash/src/main.c
index 3a58a4b4a6f..9b6de014709 100644
--- a/tests/subsys/storage/stream/stream_flash/src/main.c
+++ b/tests/subsys/storage/stream/stream_flash/src/main.c
@@ -8,10 +8,10 @@
 #include <zephyr/types.h>
 #include <stdbool.h>
 #include <ztest.h>
-#include <drivers/flash.h>
-#include <settings/settings.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/settings/settings.h>
 
-#include <storage/stream_flash.h>
+#include <zephyr/storage/stream_flash.h>
 
 #define BUF_LEN 512
 #define MAX_PAGE_SIZE 0x1000 /* Max supported page size to run test on */
diff --git a/tests/subsys/tracing/tracing_api/src/main.c b/tests/subsys/tracing/tracing_api/src/main.c
index 422df00af09..0b74aca650b 100644
--- a/tests/subsys/tracing/tracing_api/src/main.c
+++ b/tests/subsys/tracing/tracing_api/src/main.c
@@ -5,11 +5,11 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/logging/log.h>
 #include <tracing_buffer.h>
 #include <tracing_core.h>
-#include <tracing/tracing_format.h>
+#include <zephyr/tracing/tracing_format.h>
 #if defined(CONFIG_TRACING_BACKEND_UART)
 #include "../../../../subsys/tracing/include/tracing_backend.h"
 #endif
diff --git a/tests/subsys/usb/bos/src/test_bos.c b/tests/subsys/usb/bos/src/test_bos.c
index 5789c663f6f..ac7a480f49e 100644
--- a/tests/subsys/usb/bos/src/test_bos.c
+++ b/tests/subsys/usb/bos/src/test_bos.c
@@ -7,12 +7,12 @@
 #include <ztest.h>
 #include <tc_util.h>
 
-#include <sys/byteorder.h>
-#include <usb/usb_device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/usb/usb_device.h>
 
-#include <usb/bos.h>
+#include <zephyr/usb/bos.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test_main, LOG_LEVEL_DBG);
 
 /*
diff --git a/tests/subsys/usb/desc_sections/src/desc_sections.c b/tests/subsys/usb/desc_sections/src/desc_sections.c
index 2e460ddf852..81e069bd5de 100644
--- a/tests/subsys/usb/desc_sections/src/desc_sections.c
+++ b/tests/subsys/usb/desc_sections/src/desc_sections.c
@@ -7,11 +7,11 @@
 #include <ztest.h>
 #include <tc_util.h>
 
-#include <sys/byteorder.h>
-#include <usb/usb_device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/usb/usb_device.h>
 #include <usb_descriptor.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test_main, LOG_LEVEL_DBG);
 
 #ifdef CONFIG_USB_COMPOSITE_DEVICE
diff --git a/tests/subsys/usb/device/src/main.c b/tests/subsys/usb/device/src/main.c
index 50a5dc0d2ce..8b79a4b35dc 100644
--- a/tests/subsys/usb/device/src/main.c
+++ b/tests/subsys/usb/device/src/main.c
@@ -7,8 +7,8 @@
 #include <ztest.h>
 #include <tc_util.h>
 
-#include <sys/byteorder.h>
-#include <usb/usb_device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/usb/usb_device.h>
 
 /* Max packet size for endpoints */
 #if IS_ENABLED(CONFIG_USB_DC_HAS_HS_SUPPORT)
diff --git a/tests/subsys/usb/os_desc/src/usb_osdesc.c b/tests/subsys/usb/os_desc/src/usb_osdesc.c
index 1cc970721c8..3dadd44e31a 100644
--- a/tests/subsys/usb/os_desc/src/usb_osdesc.c
+++ b/tests/subsys/usb/os_desc/src/usb_osdesc.c
@@ -7,8 +7,8 @@
 #include <ztest.h>
 #include <tc_util.h>
 
-#include <sys/byteorder.h>
-#include <usb/usb_device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/usb/usb_device.h>
 #include <os_desc.h>
 
 #define MSOS_STRING_LENGTH	18
diff --git a/tests/unit/base64/main.c b/tests/unit/base64/main.c
index 5de99f8f2cb..f4afd7192a3 100644
--- a/tests/unit/base64/main.c
+++ b/tests/unit/base64/main.c
@@ -26,7 +26,7 @@
 #include <zephyr/types.h>
 #include <stdbool.h>
 #include <ztest.h>
-#include <sys/base64.h>
+#include <zephyr/sys/base64.h>
 
 #include "../../../lib/os/base64.c"
 
diff --git a/tests/unit/cbprintf/main.c b/tests/unit/cbprintf/main.c
index bf24790d85b..e572ccafb29 100644
--- a/tests/unit/cbprintf/main.c
+++ b/tests/unit/cbprintf/main.c
@@ -14,7 +14,7 @@
 #include <wctype.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define CBPRINTF_VIA_UNIT_TEST
 
@@ -131,7 +131,7 @@
 #define PACKAGE_FLAGS 0
 #endif
 
-#include <sys/cbprintf.h>
+#include <zephyr/sys/cbprintf.h>
 #include "../../../lib/os/cbprintf.c"
 
 #if defined(CONFIG_CBPRINTF_COMPLETE)
diff --git a/tests/unit/crc/main.c b/tests/unit/crc/main.c
index bc46a6c8739..f05701b0e4b 100644
--- a/tests/unit/crc/main.c
+++ b/tests/unit/crc/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <sys/crc.h>
+#include <zephyr/sys/crc.h>
 #include "../../../lib/os/crc8_sw.c"
 #include "../../../lib/os/crc16_sw.c"
 #include "../../../lib/os/crc32_sw.c"
diff --git a/tests/unit/list/dlist.c b/tests/unit/list/dlist.c
index 0ece0197931..1184a775981 100644
--- a/tests/unit/list/dlist.c
+++ b/tests/unit/list/dlist.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <sys/dlist.h>
+#include <zephyr/sys/dlist.h>
 
 static sys_dlist_t test_list;
 
diff --git a/tests/unit/list/sflist.c b/tests/unit/list/sflist.c
index 8ac3b783d7a..4b036ae8737 100644
--- a/tests/unit/list/sflist.c
+++ b/tests/unit/list/sflist.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <sys/sflist.h>
+#include <zephyr/sys/sflist.h>
 
 static sys_sflist_t test_list;
 static sys_sflist_t append_list;
diff --git a/tests/unit/list/slist.c b/tests/unit/list/slist.c
index 1de94c47506..150b25b79c9 100644
--- a/tests/unit/list/slist.c
+++ b/tests/unit/list/slist.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <sys/slist.h>
+#include <zephyr/sys/slist.h>
 
 static sys_slist_t test_list;
 static sys_slist_t append_list;
diff --git a/tests/unit/net_timeout/main.c b/tests/unit/net_timeout/main.c
index 8decf00c0f4..56703f97c55 100644
--- a/tests/unit/net_timeout/main.c
+++ b/tests/unit/net_timeout/main.c
@@ -7,7 +7,7 @@
 #include <ztest.h>
 #include <string.h>
 #include <inttypes.h>
-#include <net/net_timeout.h>
+#include <zephyr/net/net_timeout.h>
 
 #include "../../../subsys/net/ip/net_timeout.c"
 
diff --git a/tests/unit/rbtree/main.c b/tests/unit/rbtree/main.c
index 38d3f6214b1..a20c34a6f3f 100644
--- a/tests/unit/rbtree/main.c
+++ b/tests/unit/rbtree/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-#include <sys/rb.h>
+#include <zephyr/sys/rb.h>
 
 #include "../../../lib/os/rb.c"
 
diff --git a/tests/unit/timeutil/timeutil_test.h b/tests/unit/timeutil/timeutil_test.h
index dc74953e410..a904983c159 100644
--- a/tests/unit/timeutil/timeutil_test.h
+++ b/tests/unit/timeutil/timeutil_test.h
@@ -8,7 +8,7 @@
 #define TIMEUTIL_TEST_H
 
 #include <stdlib.h>
-#include <sys/timeutil.h>
+#include <zephyr/sys/timeutil.h>
 
 struct timeutil_test_data {
 	time_t ux;
diff --git a/tests/unit/util/main.c b/tests/unit/util/main.c
index 0720b8cba83..3c09e97feca 100644
--- a/tests/unit/util/main.c
+++ b/tests/unit/util/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <string.h>
 
 #include "test.inc"
diff --git a/tests/unit/winstream/main.c b/tests/unit/winstream/main.c
index ff261c6f05e..35640383037 100644
--- a/tests/unit/winstream/main.c
+++ b/tests/unit/winstream/main.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-#include <sys/winstream.h>
+#include <zephyr/sys/winstream.h>
 
 /* This, uh, seems to be the standard way to unit test library code.
  * Or so I gather from tests/unit/rbtree ...
diff --git a/tests/ztest/error_hook/src/main.c b/tests/ztest/error_hook/src/main.c
index 932d952f1e6..d502cd67cfc 100644
--- a/tests/ztest/error_hook/src/main.c
+++ b/tests/ztest/error_hook/src/main.c
@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <irq_offload.h>
-#include <syscall_handler.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/syscall_handler.h>
 #include <ztest_error_hook.h>
 
 #define STACK_SIZE (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)