8 files changed, 12 insertions, 12 deletions
diff --git a/zephyr/test/drivers/CMakeLists.txt b/zephyr/test/drivers/CMakeLists.txt
index 10909688e8..b03e3e4edd 100644
--- a/zephyr/test/drivers/CMakeLists.txt
+++ b/zephyr/test/drivers/CMakeLists.txt
@@ -31,9 +31,9 @@ add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_SHIM_GPIO_ID shim_gpio_id)
 add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_SHIM_PWM_HC shim_pwm_hc)
 add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_SHIM_RTC shim_rtc)
 add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_TIMER timer)
+add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_COMMON usb_common)
 add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_MALFUNCTION_SINK usb_malfunction_sink)
 add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_PD_DPS dps)
-add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_PD_FLAGS usb_pd_flags)
 add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_PORT_POWER_DUMB usb_port_power_dumb)
 add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_RETIMER_FW_UPDATE usb_retimer_fw_update)
 add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USBC_ALT_MODE usbc_alt_mode)
diff --git a/zephyr/test/drivers/Kconfig b/zephyr/test/drivers/Kconfig
index 0bcf8fb39b..9254bb9e31 100644
--- a/zephyr/test/drivers/Kconfig
+++ b/zephyr/test/drivers/Kconfig
@@ -77,15 +77,15 @@ config LINK_TEST_SUITE_SYSTEM
 config LINK_TEST_SUITE_TIMER
 	bool "Link and test the timer tests"
 
+config LINK_TEST_SUITE_USB_COMMON
+	bool "Link and test USB common code tests"
+
 config LINK_TEST_SUITE_USB_MALFUNCTION_SINK
 	bool "Link and test the usb_malfunction_sink tests"
 
 config LINK_TEST_SUITE_USB_PD_DPS
 	bool "Link and test the dps tests"
 
-config LINK_TEST_SUITE_USB_PD_FLAGS
-	bool "Link and test USB PD flags"
-
 config LINK_TEST_SUITE_USB_PORT_POWER_DUMB
 	bool "Link and test the usb_port_power_dumb tests"
 
diff --git a/zephyr/test/drivers/testcase.yaml b/zephyr/test/drivers/testcase.yaml
index 494055cf97..0aa89b560d 100644
--- a/zephyr/test/drivers/testcase.yaml
+++ b/zephyr/test/drivers/testcase.yaml
@@ -164,13 +164,13 @@ tests:
       - CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y
   drivers.usb_pd_discharge:
     extra_configs:
-      - CONFIG_LINK_TEST_SUITE_USB_PD_FLAGS=y
+      - CONFIG_LINK_TEST_SUITE_USB_COMMON=y
       - CONFIG_PLATFORM_EC_USB_PD_DISCHARGE=y
       - CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y
       - CONFIG_PLATFORM_EC_USB_PD_FLAGS=y
   drivers.usb_pd_flags:
     extra_configs:
-      - CONFIG_LINK_TEST_SUITE_USB_PD_FLAGS=y
+      - CONFIG_LINK_TEST_SUITE_USB_COMMON=y
       - CONFIG_PLATFORM_EC_USB_PD_FLAGS=y
       - CONFIG_PLATFORM_EC_USB_PD_RUNTIME_FLAGS=y
   drivers.usb_retimer_fw_update:
diff --git a/zephyr/test/drivers/usb_pd_flags/CMakeLists.txt b/zephyr/test/drivers/usb_common/CMakeLists.txt
index 282d4f2ae4..282d4f2ae4 100644
--- a/zephyr/test/drivers/usb_pd_flags/CMakeLists.txt
+++ b/zephyr/test/drivers/usb_common/CMakeLists.txt
diff --git a/zephyr/test/drivers/usb_pd_flags/include/suite.h b/zephyr/test/drivers/usb_common/include/suite.h
index d76fca46b9..d76fca46b9 100644
--- a/zephyr/test/drivers/usb_pd_flags/include/suite.h
+++ b/zephyr/test/drivers/usb_common/include/suite.h
diff --git a/zephyr/test/drivers/usb_pd_flags/src/suite.c b/zephyr/test/drivers/usb_common/src/suite.c
index 191fb741c3..56f3434d4c 100644
--- a/zephyr/test/drivers/usb_pd_flags/src/suite.c
+++ b/zephyr/test/drivers/usb_common/src/suite.c
@@ -20,4 +20,4 @@ static void usb_pd_flags_after(void *fixture)
 /* TODO(b/255413715): Convert this suite to use the unit testing framework when
  * practical.
  */
-ZTEST_SUITE(usb_pd_flags, NULL, NULL, usb_pd_flags_after, NULL, NULL);
+ZTEST_SUITE(usb_common, NULL, NULL, usb_pd_flags_after, NULL, NULL);
diff --git a/zephyr/test/drivers/usb_pd_flags/src/usb_pd_discharge.c b/zephyr/test/drivers/usb_common/src/usb_pd_discharge.c
index 37b836c65d..e691d8e76b 100644
--- a/zephyr/test/drivers/usb_pd_flags/src/usb_pd_discharge.c
+++ b/zephyr/test/drivers/usb_common/src/usb_pd_discharge.c
@@ -13,7 +13,7 @@
 
 #define TEST_PORT 0
 
-ZTEST_USER(usb_pd_flags, test_pd_set_vbus_discharge)
+ZTEST_USER(usb_common, test_pd_set_vbus_discharge)
 {
 	board_vbus_source_enabled_fake.return_val = 0;
 
@@ -22,7 +22,7 @@ ZTEST_USER(usb_pd_flags, test_pd_set_vbus_discharge)
 	zassert_equal(ppc_discharge_vbus_fake.arg1_history[0], 1);
 }
 
-ZTEST_USER(usb_pd_flags, test_pd_set_vbus_discharge_wrong_args)
+ZTEST_USER(usb_common, test_pd_set_vbus_discharge_wrong_args)
 {
 	pd_set_vbus_discharge(100, true);
 	zassert_equal(ppc_discharge_vbus_fake.call_count, 0);
diff --git a/zephyr/test/drivers/usb_pd_flags/src/usb_pd_flags.c b/zephyr/test/drivers/usb_common/src/usb_pd_flags.c
index 866186a588..8fe73bd141 100644
--- a/zephyr/test/drivers/usb_pd_flags/src/usb_pd_flags.c
+++ b/zephyr/test/drivers/usb_common/src/usb_pd_flags.c
@@ -9,7 +9,7 @@
 #include "usb_pd.h"
 #include "usb_pd_flags.h"
 
-ZTEST_USER(usb_pd_flags, test_usb_pd_charger_otg)
+ZTEST_USER(usb_common, test_usb_pd_charger_otg)
 {
 	set_usb_pd_charger_otg(USB_PD_CHARGER_OTG_ENABLED);
 	zassert_equal(get_usb_pd_charger_otg(), USB_PD_CHARGER_OTG_ENABLED);
@@ -18,7 +18,7 @@ ZTEST_USER(usb_pd_flags, test_usb_pd_charger_otg)
 	zassert_equal(get_usb_pd_charger_otg(), USB_PD_CHARGER_OTG_DISABLED);
 }
 
-ZTEST_USER(usb_pd_flags, test_usb_pd_vbus_detect)
+ZTEST_USER(usb_common, test_usb_pd_vbus_detect)
 {
 	set_usb_pd_vbus_detect(USB_PD_VBUS_DETECT_TCPC);
 	zassert_equal(get_usb_pd_vbus_detect(), USB_PD_VBUS_DETECT_TCPC);
@@ -27,7 +27,7 @@ ZTEST_USER(usb_pd_flags, test_usb_pd_vbus_detect)
 	zassert_equal(get_usb_pd_vbus_detect(), USB_PD_VBUS_DETECT_CHARGER);
 }
 
-ZTEST_USER(usb_pd_flags, test_usb_pd_discharge)
+ZTEST_USER(usb_common, test_usb_pd_discharge)
 {
 	set_usb_pd_discharge(USB_PD_DISCHARGE_PPC);
 	zassert_equal(get_usb_pd_discharge(), USB_PD_DISCHARGE_PPC);