zephyr: test: move include files to scoped directory

The include path was getting too cluttered. In some cases seeing an
include for "utils.h" and "util.h". These were difficult to
understand, follow, and ensure uniqueness. Move all the test
specific headers to their own path.

BRANCH=none
BUG=none
TEST=zmake test test-drivers

Signed-off-by: Yuval Peress <peress@google.com>
Change-Id: Iab5e4d470321edb356c8b30f94c79b2ce1f38866
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3556801
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>

54 files changed, 84 insertions, 84 deletions

diff --git a/zephyr/test/drivers/include/charger_utils.h b/zephyr/test/drivers/include/test/drivers/charger_utils.h
index 1712a5a384..1712a5a384 100644
--- a/zephyr/test/drivers/include/charger_utils.h
+++ b/zephyr/test/drivers/include/test/drivers/charger_utils.h
diff --git a/zephyr/test/drivers/include/stubs.h b/zephyr/test/drivers/include/test/drivers/stubs.h
index 2e03142d72..2e03142d72 100644
--- a/zephyr/test/drivers/include/stubs.h
+++ b/zephyr/test/drivers/include/test/drivers/stubs.h
diff --git a/zephyr/test/drivers/include/tcpci_test_common.h b/zephyr/test/drivers/include/test/drivers/tcpci_test_common.h
index e39738a9d5..e39738a9d5 100644
--- a/zephyr/test/drivers/include/tcpci_test_common.h
+++ b/zephyr/test/drivers/include/test/drivers/tcpci_test_common.h
diff --git a/zephyr/test/drivers/include/test_mocks.h b/zephyr/test/drivers/include/test/drivers/test_mocks.h
index f29cce97cc..f29cce97cc 100644
--- a/zephyr/test/drivers/include/test_mocks.h
+++ b/zephyr/test/drivers/include/test/drivers/test_mocks.h
diff --git a/zephyr/test/drivers/include/test_state.h b/zephyr/test/drivers/include/test/drivers/test_state.h
index fe8b3e8ffc..fe8b3e8ffc 100644
--- a/zephyr/test/drivers/include/test_state.h
+++ b/zephyr/test/drivers/include/test/drivers/test_state.h
diff --git a/zephyr/test/drivers/include/utils.h b/zephyr/test/drivers/include/test/drivers/utils.h
index 6d5d0c33bf..6d5d0c33bf 100644
--- a/zephyr/test/drivers/include/utils.h
+++ b/zephyr/test/drivers/include/test/drivers/utils.h
diff --git a/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c b/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c
index a405fab963..c1ae9ce240 100644
--- a/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c
+++ b/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c
@@ -6,12 +6,12 @@
 
 #include <ztest.h>
 
-#include "charger_utils.h"
 #include "driver/charger/isl923x.h"
 #include "driver/charger/isl923x_public.h"
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_isl923x.h"
-#include "test_state.h"
+#include "test/drivers/charger_utils.h"
+#include "test/drivers/test_state.h"
 
 #define CHARGER_NUM get_charger_num(&isl923x_drv)
 #define ISL923X_EMUL emul_get_binding(DT_LABEL(DT_NODELABEL(isl923x_emul)))
diff --git a/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c b/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c
index fd78209e13..b70d67a750 100644
--- a/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c
+++ b/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c
@@ -10,14 +10,14 @@
 
 #include "adc.h"
 #include "console.h"
-#include "charger_utils.h"
 #include "driver/charger/isl923x.h"
 #include "driver/charger/isl923x_public.h"
 #include "ec_commands.h"
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_isl923x.h"
-#include "test_state.h"
-#include "utils.h"
+#include "test/drivers/charger_utils.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
 
 #define ADC_DEVICE_NODE DT_NODELABEL(adc0)
 #define CHARGER_NUM get_charger_num(&isl923x_drv)
diff --git a/zephyr/test/drivers/src/battery.c b/zephyr/test/drivers/src/battery.c
index c9c49e1ae8..71d45ac6af 100644
--- a/zephyr/test/drivers/src/battery.c
+++ b/zephyr/test/drivers/src/battery.c
@@ -9,7 +9,7 @@
 #include <drivers/gpio/gpio_emul.h>
 
 #include "battery.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 #define GPIO_BATT_PRES_ODL_PATH DT_PATH(named_gpios, ec_batt_pres_odl)
 #define GPIO_BATT_PRES_ODL_PORT DT_GPIO_PIN(GPIO_BATT_PRES_ODL_PATH, gpios)
diff --git a/zephyr/test/drivers/src/bb_retimer.c b/zephyr/test/drivers/src/bb_retimer.c
index 84d8a4a836..82a50f5049 100644
--- a/zephyr/test/drivers/src/bb_retimer.c
+++ b/zephyr/test/drivers/src/bb_retimer.c
@@ -14,14 +14,14 @@
 #include "emul/emul_common_i2c.h"
 #include "hooks.h"
 #include "i2c.h"
-#include "stubs.h"
+#include "test/drivers/stubs.h"
 #include "usb_prl_sm.h"
 #include "usb_tc_sm.h"
 #include "chipset.h"
 
 #include "driver/retimer/bb_retimer.h"
-#include "test_state.h"
-#include "utils.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
 
 #define GPIO_USB_C1_LS_EN_PATH DT_PATH(named_gpios, usb_c1_ls_en)
 #define GPIO_USB_C1_LS_EN_PORT DT_GPIO_PIN(GPIO_USB_C1_LS_EN_PATH, gpios)
diff --git a/zephyr/test/drivers/src/bc12.c b/zephyr/test/drivers/src/bc12.c
index 088785aa18..df65d2f7a4 100644
--- a/zephyr/test/drivers/src/bc12.c
+++ b/zephyr/test/drivers/src/bc12.c
@@ -14,8 +14,8 @@
 #include "usb_charge.h"
 #include "battery.h"
 #include "extpower.h"
-#include "stubs.h"
-#include "test_state.h"
+#include "test/drivers/stubs.h"
+#include "test/drivers/test_state.h"
 
 #include <logging/log.h>
 LOG_MODULE_REGISTER(test_drivers_bc12, LOG_LEVEL_DBG);
diff --git a/zephyr/test/drivers/src/bma2x2.c b/zephyr/test/drivers/src/bma2x2.c
index 8a19e42267..4277ed1245 100644
--- a/zephyr/test/drivers/src/bma2x2.c
+++ b/zephyr/test/drivers/src/bma2x2.c
@@ -14,7 +14,7 @@
 #include "accelgyro.h"
 #include "motion_sense.h"
 #include "driver/accel_bma2x2.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 /** How accurate comparision of vectors should be. */
 #define V_EPS 8
diff --git a/zephyr/test/drivers/src/bmi160.c b/zephyr/test/drivers/src/bmi160.c
index 73cd33b2eb..5578b4a796 100644
--- a/zephyr/test/drivers/src/bmi160.c
+++ b/zephyr/test/drivers/src/bmi160.c
@@ -10,12 +10,12 @@
 #include "i2c.h"
 #include "emul/emul_bmi.h"
 #include "emul/emul_common_i2c.h"
-#include "test_mocks.h"
+#include "test/drivers/test_mocks.h"
 
 #include "motion_sense_fifo.h"
 #include "driver/accelgyro_bmi160.h"
 #include "driver/accelgyro_bmi_common.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 #define BMI_ORD			DT_DEP_ORD(DT_NODELABEL(accel_bmi160))
 #define BMI_ACC_SENSOR_ID	SENSOR_ID(DT_NODELABEL(ms_bmi160_accel))
diff --git a/zephyr/test/drivers/src/bmi260.c b/zephyr/test/drivers/src/bmi260.c
index 98be6a2d65..0146b37fe6 100644
--- a/zephyr/test/drivers/src/bmi260.c
+++ b/zephyr/test/drivers/src/bmi260.c
@@ -15,8 +15,8 @@
 #include "motion_sense_fifo.h"
 #include "driver/accelgyro_bmi260.h"
 #include "driver/accelgyro_bmi_common.h"
-#include "test_mocks.h"
-#include "test_state.h"
+#include "test/drivers/test_mocks.h"
+#include "test/drivers/test_state.h"
 
 #define BMI_ORD			DT_DEP_ORD(DT_NODELABEL(accel_bmi260))
 #define BMI_ACC_SENSOR_ID	SENSOR_ID(DT_NODELABEL(ms_bmi260_accel))
diff --git a/zephyr/test/drivers/src/charge_manager.c b/zephyr/test/drivers/src/charge_manager.c
index 6a3c842493..13668924fd 100644
--- a/zephyr/test/drivers/src/charge_manager.c
+++ b/zephyr/test/drivers/src/charge_manager.c
@@ -7,7 +7,7 @@
 
 #include "charge_manager.h"
 #include "ec_commands.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 ZTEST_SUITE(charge_manager, drivers_predicate_post_main, NULL, NULL, NULL,
 	    NULL);
diff --git a/zephyr/test/drivers/src/console_cmd/charge_manager.c b/zephyr/test/drivers/src/console_cmd/charge_manager.c
index cf33e4125f..8d66c4a7b8 100644
--- a/zephyr/test/drivers/src/console_cmd/charge_manager.c
+++ b/zephyr/test/drivers/src/console_cmd/charge_manager.c
@@ -11,8 +11,8 @@
 #include "emul/emul_isl923x.h"
 #include "emul/tcpc/emul_tcpci_partner_snk.h"
 #include "tcpm/tcpci.h"
-#include "test_state.h"
-#include "utils.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
 
 static void connect_sink_to_port(const struct emul *charger_emul,
 				 const struct emul *tcpci_emul,
diff --git a/zephyr/test/drivers/src/console_cmd/charge_state.c b/zephyr/test/drivers/src/console_cmd/charge_state.c
index 7715a84b9e..0b9378cbb7 100644
--- a/zephyr/test/drivers/src/console_cmd/charge_state.c
+++ b/zephyr/test/drivers/src/console_cmd/charge_state.c
@@ -10,8 +10,8 @@
 #include "charge_state_v2.h"
 #include "console.h"
 #include "ec_commands.h"
-#include "test_state.h"
-#include "utils.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
 
 ZTEST_USER(console_cmd_charge_state, test_idle_too_few_args)
 {
diff --git a/zephyr/test/drivers/src/cros_cbi.c b/zephyr/test/drivers/src/cros_cbi.c
index 37094e1a49..9acd6741ed 100644
--- a/zephyr/test/drivers/src/cros_cbi.c
+++ b/zephyr/test/drivers/src/cros_cbi.c
@@ -7,7 +7,7 @@
 #include <ztest.h>
 
 #include "cros_cbi.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 ZTEST(cros_cbi, test_check_match)
 {
diff --git a/zephyr/test/drivers/src/espi.c b/zephyr/test/drivers/src/espi.c
index 5b89ebdf10..f8293b4591 100644
--- a/zephyr/test/drivers/src/espi.c
+++ b/zephyr/test/drivers/src/espi.c
@@ -8,7 +8,7 @@
 
 #include "ec_commands.h"
 #include "host_command.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 
 #define PORT 0
diff --git a/zephyr/test/drivers/src/gpio.c b/zephyr/test/drivers/src/gpio.c
index 0edb389a3e..8e8b166092 100644
--- a/zephyr/test/drivers/src/gpio.c
+++ b/zephyr/test/drivers/src/gpio.c
@@ -20,9 +20,9 @@
 #include "gpio.h"
 #include "gpio/gpio.h"
 #include "gpio/gpio_int.h"
-#include "stubs.h"
+#include "test/drivers/stubs.h"
 #include "util.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 extern bool gpio_test_interrupt_triggered;
 /**
diff --git a/zephyr/test/drivers/src/host_cmd/motion_sense.c b/zephyr/test/drivers/src/host_cmd/motion_sense.c
index 46a3540ad0..3e4c8e0336 100644
--- a/zephyr/test/drivers/src/host_cmd/motion_sense.c
+++ b/zephyr/test/drivers/src/host_cmd/motion_sense.c
@@ -6,8 +6,8 @@
 #include <ztest.h>
 
 #include "motion_sense.h"
-#include "test_state.h"
-#include "utils.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
 
 /**
  * Get the size needed for a struct ec_response_motion_sense
diff --git a/zephyr/test/drivers/src/i2c_passthru.c b/zephyr/test/drivers/src/i2c_passthru.c
index fa8445d516..98bc181d84 100644
--- a/zephyr/test/drivers/src/i2c_passthru.c
+++ b/zephyr/test/drivers/src/i2c_passthru.c
@@ -8,7 +8,7 @@
 
 #include "ec_commands.h"
 #include "host_command.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 ZTEST_USER(i2c_passthru, test_read_without_write)
 {
diff --git a/zephyr/test/drivers/src/integration/usbc/usb.c b/zephyr/test/drivers/src/integration/usbc/usb.c
index 229b17e73c..3c2898b363 100644
--- a/zephyr/test/drivers/src/integration/usbc/usb.c
+++ b/zephyr/test/drivers/src/integration/usbc/usb.c
@@ -19,11 +19,11 @@
 #include "emul/tcpc/emul_tcpci_partner_snk.h"
 #include "emul/tcpc/emul_tcpci_partner_src.h"
 #include "host_command.h"
-#include "stubs.h"
+#include "test/drivers/stubs.h"
 #include "tcpm/tcpci.h"
 #include "test/usb_pe.h"
-#include "utils.h"
-#include "test_state.h"
+#include "test/drivers/utils.h"
+#include "test/drivers/test_state.h"
 
 #define TCPCI_EMUL_LABEL DT_NODELABEL(tcpci_emul)
 #define TCPCI_EMUL_LABEL2 DT_NODELABEL(tcpci_ps8xxx_emul)
diff --git a/zephyr/test/drivers/src/integration/usbc/usb_20v_3a_pd_charger.c b/zephyr/test/drivers/src/integration/usbc/usb_20v_3a_pd_charger.c
index b089d6c902..78029dd3ff 100644
--- a/zephyr/test/drivers/src/integration/usbc/usb_20v_3a_pd_charger.c
+++ b/zephyr/test/drivers/src/integration/usbc/usb_20v_3a_pd_charger.c
@@ -9,8 +9,8 @@
 #include "emul/emul_isl923x.h"
 #include "emul/emul_smart_battery.h"
 #include "emul/tcpc/emul_tcpci_partner_src.h"
-#include "test_state.h"
-#include "utils.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
 #include "usb_pd.h"
 
 #define BATTERY_ORD DT_DEP_ORD(DT_NODELABEL(battery))
diff --git a/zephyr/test/drivers/src/integration/usbc/usb_5v_3a_pd_sink.c b/zephyr/test/drivers/src/integration/usbc/usb_5v_3a_pd_sink.c
index d28a23d99e..9541f20dd3 100644
--- a/zephyr/test/drivers/src/integration/usbc/usb_5v_3a_pd_sink.c
+++ b/zephyr/test/drivers/src/integration/usbc/usb_5v_3a_pd_sink.c
@@ -11,8 +11,8 @@
 #include "emul/emul_smart_battery.h"
 #include "emul/tcpc/emul_tcpci_partner_snk.h"
 #include "tcpm/tcpci.h"
-#include "test_state.h"
-#include "utils.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
 #include "usb_pd.h"
 
 struct usb_attach_5v_3a_pd_sink_fixture {
diff --git a/zephyr/test/drivers/src/integration/usbc/usb_5v_3a_pd_source.c b/zephyr/test/drivers/src/integration/usbc/usb_5v_3a_pd_source.c
index 39c6d208bf..970870950c 100644
--- a/zephyr/test/drivers/src/integration/usbc/usb_5v_3a_pd_source.c
+++ b/zephyr/test/drivers/src/integration/usbc/usb_5v_3a_pd_source.c
@@ -9,8 +9,8 @@
 #include "emul/emul_isl923x.h"
 #include "emul/emul_smart_battery.h"
 #include "emul/tcpc/emul_tcpci_partner_src.h"
-#include "test_state.h"
-#include "utils.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
 #include "usb_pd.h"
 
 #define BATTERY_ORD DT_DEP_ORD(DT_NODELABEL(battery))
diff --git a/zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c b/zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c
index 3cbb306698..abef3f0b78 100644
--- a/zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c
+++ b/zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c
@@ -15,10 +15,10 @@
 #include "emul/tcpc/emul_tcpci.h"
 #include "emul/tcpc/emul_tcpci_partner_snk.h"
 #include "host_command.h"
-#include "stubs.h"
+#include "test/drivers/stubs.h"
 #include "tcpm/tcpci.h"
-#include "utils.h"
-#include "test_state.h"
+#include "test/drivers/utils.h"
+#include "test/drivers/test_state.h"
 
 struct usbc_alt_mode_fixture {
 	const struct emul *tcpci_emul;
diff --git a/zephyr/test/drivers/src/integration/usbc/usb_attach_src_snk.c b/zephyr/test/drivers/src/integration/usbc/usb_attach_src_snk.c
index 319e52eb4b..4ed9dcb8d1 100644
--- a/zephyr/test/drivers/src/integration/usbc/usb_attach_src_snk.c
+++ b/zephyr/test/drivers/src/integration/usbc/usb_attach_src_snk.c
@@ -17,11 +17,11 @@
 #include "emul/tcpc/emul_tcpci_partner_snk.h"
 #include "emul/tcpc/emul_tcpci_partner_src.h"
 #include "host_command.h"
-#include "stubs.h"
+#include "test/drivers/stubs.h"
 #include "tcpm/tcpci.h"
 #include "test/usb_pe.h"
-#include "utils.h"
-#include "test_state.h"
+#include "test/drivers/utils.h"
+#include "test/drivers/test_state.h"
 
 #define SNK_PORT USBC_PORT_C0
 #define SRC_PORT USBC_PORT_C1
diff --git a/zephyr/test/drivers/src/isl923x.c b/zephyr/test/drivers/src/isl923x.c
index 82bfd25032..667d05f57b 100644
--- a/zephyr/test/drivers/src/isl923x.c
+++ b/zephyr/test/drivers/src/isl923x.c
@@ -9,14 +9,14 @@
 
 #include "battery.h"
 #include "battery_smart.h"
-#include "charger_utils.h"
+#include "test/drivers/charger_utils.h"
 #include "driver/charger/isl923x.h"
 #include "driver/charger/isl923x_public.h"
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_isl923x.h"
 #include "system.h"
-#include "test_mocks.h"
-#include "test_state.h"
+#include "test/drivers/test_mocks.h"
+#include "test/drivers/test_state.h"
 
 BUILD_ASSERT(CONFIG_CHARGER_SENSE_RESISTOR == 10 ||
 	     CONFIG_CHARGER_SENSE_RESISTOR == 5);
diff --git a/zephyr/test/drivers/src/keyboard_scan.c b/zephyr/test/drivers/src/keyboard_scan.c
index 8977a4e495..6d438c2b76 100644
--- a/zephyr/test/drivers/src/keyboard_scan.c
+++ b/zephyr/test/drivers/src/keyboard_scan.c
@@ -8,7 +8,7 @@
 #include <drivers/gpio/gpio_emul.h>
 #include <emul/emul_kb_raw.h>
 
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 int emulate_keystate(int row, int col, int pressed)
 {
diff --git a/zephyr/test/drivers/src/lid_switch.c b/zephyr/test/drivers/src/lid_switch.c
index d3727d926c..c4794741fb 100644
--- a/zephyr/test/drivers/src/lid_switch.c
+++ b/zephyr/test/drivers/src/lid_switch.c
@@ -11,7 +11,7 @@
 #include <shell/shell_dummy.h>
 #include <console.h>
 
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 #include "ec_commands.h"
 #include "host_command.h"
 
diff --git a/zephyr/test/drivers/src/lis2dw12.c b/zephyr/test/drivers/src/lis2dw12.c
index 96c0389585..07faee0427 100644
--- a/zephyr/test/drivers/src/lis2dw12.c
+++ b/zephyr/test/drivers/src/lis2dw12.c
@@ -8,7 +8,7 @@
 #include "driver/accel_lis2dw12.h"
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_lis2dw12.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 #define LIS2DW12_NODELABEL DT_NODELABEL(ms_lis2dw12_accel)
 #define LIS2DW12_SENSOR_ID SENSOR_ID(LIS2DW12_NODELABEL)
diff --git a/zephyr/test/drivers/src/ln9310.c b/zephyr/test/drivers/src/ln9310.c
index 6eb13eabfb..9ff018fdba 100644
--- a/zephyr/test/drivers/src/ln9310.c
+++ b/zephyr/test/drivers/src/ln9310.c
@@ -13,7 +13,7 @@
 #include "emul/emul_ln9310.h"
 #include "emul/emul_common_i2c.h"
 #include "timer.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 /*
  * TODO(b/201420132): Implement approach for tests to immediately schedule work
diff --git a/zephyr/test/drivers/src/main.c b/zephyr/test/drivers/src/main.c
index b3bb18a4be..062d8224bd 100644
--- a/zephyr/test/drivers/src/main.c
+++ b/zephyr/test/drivers/src/main.c
@@ -6,7 +6,7 @@
 #include <zephyr.h>
 #include <ztest.h>
 #include "ec_app_main.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 bool drivers_predicate_pre_main(const void *state)
 {
diff --git a/zephyr/test/drivers/src/motion_sense/motion_sense.c b/zephyr/test/drivers/src/motion_sense/motion_sense.c
index 606440b5c5..5b6839bbae 100644
--- a/zephyr/test/drivers/src/motion_sense/motion_sense.c
+++ b/zephyr/test/drivers/src/motion_sense/motion_sense.c
@@ -6,7 +6,7 @@
 #include <ztest.h>
 
 #include "motion_sense.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 ZTEST_SUITE(motion_sense, drivers_predicate_post_main, NULL, NULL, NULL, NULL);
 
diff --git a/zephyr/test/drivers/src/panic.c b/zephyr/test/drivers/src/panic.c
index 664b12b87a..3dba6e0cfd 100644
--- a/zephyr/test/drivers/src/panic.c
+++ b/zephyr/test/drivers/src/panic.c
@@ -17,8 +17,8 @@
 #include "common.h"
 #include "ec_tasks.h"
 #include "panic.h"
-#include "stubs.h"
-#include "test_state.h"
+#include "test/drivers/stubs.h"
+#include "test/drivers/test_state.h"
 
 /**
  * @brief Test Suite: Verifies panic functionality.
diff --git a/zephyr/test/drivers/src/power_common.c b/zephyr/test/drivers/src/power_common.c
index e5eace0155..59e8db1f45 100644
--- a/zephyr/test/drivers/src/power_common.c
+++ b/zephyr/test/drivers/src/power_common.c
@@ -15,17 +15,17 @@
 #include "hooks.h"
 #include "host_command.h"
 #include "power.h"
-#include "stubs.h"
+#include "test/drivers/stubs.h"
 #include "task.h"
 #include "ec_tasks.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_smart_battery.h"
 
 #include "battery.h"
 #include "battery_smart.h"
-#include "utils.h"
+#include "test/drivers/utils.h"
 
 #define BATTERY_ORD DT_DEP_ORD(DT_NODELABEL(battery))
 
diff --git a/zephyr/test/drivers/src/ppc_sn5s330.c b/zephyr/test/drivers/src/ppc_sn5s330.c
index e0317cacf6..e7db47d5d5 100644
--- a/zephyr/test/drivers/src/ppc_sn5s330.c
+++ b/zephyr/test/drivers/src/ppc_sn5s330.c
@@ -15,8 +15,8 @@
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_sn5s330.h"
 #include "usbc_ppc.h"
-#include "test_mocks.h"
-#include "test_state.h"
+#include "test/drivers/test_mocks.h"
+#include "test/drivers/test_state.h"
 
 /** This must match the index of the sn5s330 in ppc_chips[] */
 #define SN5S330_PORT 0
diff --git a/zephyr/test/drivers/src/ppc_syv682c.c b/zephyr/test/drivers/src/ppc_syv682c.c
index 0d1b315628..4e257c8dee 100644
--- a/zephyr/test/drivers/src/ppc_syv682c.c
+++ b/zephyr/test/drivers/src/ppc_syv682c.c
@@ -12,10 +12,10 @@
 
 #include "emul/emul_syv682x.h"
 
-#include "stubs.h"
+#include "test/drivers/stubs.h"
 #include "syv682x.h"
 #include "timer.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 #include "usbc_ppc.h"
 
 #define SYV682X_ORD DT_DEP_ORD(DT_NODELABEL(syv682x_emul))
diff --git a/zephyr/test/drivers/src/ps8xxx.c b/zephyr/test/drivers/src/ps8xxx.c
index f4d7e33e76..b30d9ef0c3 100644
--- a/zephyr/test/drivers/src/ps8xxx.c
+++ b/zephyr/test/drivers/src/ps8xxx.c
@@ -12,13 +12,13 @@
 #include "emul/tcpc/emul_ps8xxx.h"
 #include "timer.h"
 #include "i2c.h"
-#include "stubs.h"
-#include "tcpci_test_common.h"
+#include "test/drivers/stubs.h"
+#include "test/drivers/tcpci_test_common.h"
 
 #include "tcpm/tcpci.h"
 #include "driver/tcpm/ps8xxx.h"
 #include "driver/tcpm/ps8xxx_public.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 #define PS8XXX_EMUL_LABEL	DT_LABEL(DT_NODELABEL(ps8xxx_emul))
 
diff --git a/zephyr/test/drivers/src/smart.c b/zephyr/test/drivers/src/smart.c
index efcc8ae003..f80563a40f 100644
--- a/zephyr/test/drivers/src/smart.c
+++ b/zephyr/test/drivers/src/smart.c
@@ -16,7 +16,7 @@
 
 #include "battery.h"
 #include "battery_smart.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 #define BATTERY_ORD	DT_DEP_ORD(DT_NODELABEL(battery))
 
diff --git a/zephyr/test/drivers/src/stm_mems_common.c b/zephyr/test/drivers/src/stm_mems_common.c
index 19d3e0f43d..358c20ee3d 100644
--- a/zephyr/test/drivers/src/stm_mems_common.c
+++ b/zephyr/test/drivers/src/stm_mems_common.c
@@ -13,7 +13,7 @@
 #include "emul/emul_common_i2c.h"
 #include "emul/i2c_mock.h"
 #include "i2c/i2c.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 #define MOCK_EMUL emul_get_binding(DT_LABEL(DT_NODELABEL(i2c_mock)))
 
diff --git a/zephyr/test/drivers/src/stubs.c b/zephyr/test/drivers/src/stubs.c
index 5c66a9d13f..b38bd1fd4e 100644
--- a/zephyr/test/drivers/src/stubs.c
+++ b/zephyr/test/drivers/src/stubs.c
@@ -19,7 +19,7 @@
 #include "ppc/sn5s330_public.h"
 #include "ppc/syv682x_public.h"
 #include "retimer/bb_retimer_public.h"
-#include "stubs.h"
+#include "test/drivers/stubs.h"
 #include "tcpm/ps8xxx_public.h"
 #include "tcpm/tcpci.h"
 #include "usb_mux.h"
diff --git a/zephyr/test/drivers/src/tcpci.c b/zephyr/test/drivers/src/tcpci.c
index b6eab298cc..972f9fd326 100644
--- a/zephyr/test/drivers/src/tcpci.c
+++ b/zephyr/test/drivers/src/tcpci.c
@@ -14,11 +14,11 @@
 #include "emul/tcpc/emul_tcpci.h"
 #include "hooks.h"
 #include "i2c.h"
-#include "stubs.h"
-#include "tcpci_test_common.h"
+#include "test/drivers/stubs.h"
+#include "test/drivers/tcpci_test_common.h"
 
 #include "tcpm/tcpci.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 #define EMUL_LABEL DT_NODELABEL(tcpci_emul)
 
diff --git a/zephyr/test/drivers/src/tcpci_test_common.c b/zephyr/test/drivers/src/tcpci_test_common.c
index 9b0ebffcaa..41b0c2db99 100644
--- a/zephyr/test/drivers/src/tcpci_test_common.c
+++ b/zephyr/test/drivers/src/tcpci_test_common.c
@@ -9,7 +9,7 @@
 #include "common.h"
 #include "emul/emul_common_i2c.h"
 #include "emul/tcpc/emul_tcpci.h"
-#include "tcpci_test_common.h"
+#include "test/drivers/tcpci_test_common.h"
 
 #include "tcpm/tcpci.h"
 
diff --git a/zephyr/test/drivers/src/tcs3400.c b/zephyr/test/drivers/src/tcs3400.c
index 58b4f05608..8b29259244 100644
--- a/zephyr/test/drivers/src/tcs3400.c
+++ b/zephyr/test/drivers/src/tcs3400.c
@@ -14,7 +14,7 @@
 #include "motion_sense.h"
 #include "motion_sense_fifo.h"
 #include "driver/als_tcs3400.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 #define TCS_ORD			DT_DEP_ORD(DT_NODELABEL(tcs_emul))
 #define TCS_CLR_SENSOR_ID	SENSOR_ID(DT_NODELABEL(tcs3400_clear))
diff --git a/zephyr/test/drivers/src/temp_sensor.c b/zephyr/test/drivers/src/temp_sensor.c
index acb2f1ac60..c9469476e1 100644
--- a/zephyr/test/drivers/src/temp_sensor.c
+++ b/zephyr/test/drivers/src/temp_sensor.c
@@ -15,7 +15,7 @@
 #include "common.h"
 #include "temp_sensor.h"
 #include "temp_sensor/temp_sensor.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 #define GPIO_PG_EC_DSW_PWROK_PATH DT_PATH(named_gpios, pg_ec_dsw_pwrok)
 #define GPIO_PG_EC_DSW_PWROK_PORT DT_GPIO_PIN(GPIO_PG_EC_DSW_PWROK_PATH, gpios)
diff --git a/zephyr/test/drivers/src/test_mocks.c b/zephyr/test/drivers/src/test_mocks.c
index 99629374dd..f8bbb1a6c1 100644
--- a/zephyr/test/drivers/src/test_mocks.c
+++ b/zephyr/test/drivers/src/test_mocks.c
@@ -5,7 +5,7 @@
 
 #include <ztest.h>
 
-#include "test_mocks.h"
+#include "test/drivers/test_mocks.h"
 
 DEFINE_FFF_GLOBALS;
 
diff --git a/zephyr/test/drivers/src/thermistor.c b/zephyr/test/drivers/src/thermistor.c
index 591faa9436..49e5e02234 100644
--- a/zephyr/test/drivers/src/thermistor.c
+++ b/zephyr/test/drivers/src/thermistor.c
@@ -14,7 +14,7 @@
 #include "common.h"
 #include "../driver/temp_sensor/thermistor.h"
 #include "temp_sensor/temp_sensor.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 
 #define GPIO_PG_EC_DSW_PWROK_PATH DT_PATH(named_gpios, pg_ec_dsw_pwrok)
diff --git a/zephyr/test/drivers/src/usb_mux.c b/zephyr/test/drivers/src/usb_mux.c
index 9dad48acdc..bd3024ae44 100644
--- a/zephyr/test/drivers/src/usb_mux.c
+++ b/zephyr/test/drivers/src/usb_mux.c
@@ -18,7 +18,7 @@
 #include "hooks.h"
 #include "host_command.h"
 #include "i2c.h"
-#include "stubs.h"
+#include "test/drivers/stubs.h"
 #include "task.h"
 #include "tcpm/ps8xxx_public.h"
 #include "tcpm/tcpci.h"
@@ -26,8 +26,8 @@
 #include "usb_tc_sm.h"
 
 #include "usb_mux.h"
-#include "test_state.h"
-#include "utils.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
 
 /** Copy of original usb_muxes[USB_PORT_C1] */
 struct usb_mux usb_mux_c1;
diff --git a/zephyr/test/drivers/src/usb_pd_host_cmd.c b/zephyr/test/drivers/src/usb_pd_host_cmd.c
index 5f8097e7ff..a22f3387c3 100644
--- a/zephyr/test/drivers/src/usb_pd_host_cmd.c
+++ b/zephyr/test/drivers/src/usb_pd_host_cmd.c
@@ -8,7 +8,7 @@
 
 #include "ec_commands.h"
 #include "host_command.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 ZTEST_USER(usb_pd_host_cmd, test_host_command_hc_pd_ports)
 {
diff --git a/zephyr/test/drivers/src/utils.c b/zephyr/test/drivers/src/utils.c
index 3021a98c90..ef2084ab07 100644
--- a/zephyr/test/drivers/src/utils.c
+++ b/zephyr/test/drivers/src/utils.c
@@ -15,9 +15,9 @@
 #include "emul/tcpc/emul_tcpci_partner_src.h"
 #include "hooks.h"
 #include "power.h"
-#include "stubs.h"
+#include "test/drivers/stubs.h"
 #include "chipset.h"
-#include "utils.h"
+#include "test/drivers/utils.h"
 
 #define BATTERY_ORD DT_DEP_ORD(DT_NODELABEL(battery))
 #define GPIO_BATT_PRES_ODL_PATH DT_PATH(named_gpios, ec_batt_pres_odl)
diff --git a/zephyr/test/drivers/src/vboot_hash.c b/zephyr/test/drivers/src/vboot_hash.c
index 841893c61b..aabffbbe74 100644
--- a/zephyr/test/drivers/src/vboot_hash.c
+++ b/zephyr/test/drivers/src/vboot_hash.c
@@ -9,7 +9,7 @@
 
 #include "ec_commands.h"
 #include "host_command.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 ZTEST_USER(vboot_hash, test_hostcmd)
 {
diff --git a/zephyr/test/drivers/src/watchdog.c b/zephyr/test/drivers/src/watchdog.c
index 86df3f14f3..acd8edc41a 100644
--- a/zephyr/test/drivers/src/watchdog.c
+++ b/zephyr/test/drivers/src/watchdog.c
@@ -19,9 +19,9 @@
 #include "ec_tasks.h"
 #include "fff.h"
 #include "hooks.h"
-#include "stubs.h"
+#include "test/drivers/stubs.h"
 #include "watchdog.h"
-#include "test_state.h"
+#include "test/drivers/test_state.h"
 
 /**
  * @brief Default watchdog timeout plus some time for it to expire.