zephyr: Add `test_` prefix to ZTEST function names

Twister parsing fails when `test_` prefix is missing from the test name. BUG=None BRANCH=NONE TEST=./twister -T zephyr/test Change-Id: Ic7148a66c761eaf45619b4e764e5aac9b869092c Signed-off-by: Al Semjonovs <asemjonovs@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4409346 Reviewed-by: Keith Short <keithshort@chromium.org>
author: Al Semjonovs <asemjonovs@google.com> 2023-04-07 09:04:09 -0600
committer: Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> 2023-04-07 22:12:01 +0000
commit: b5eb344ca4965a798b8c849a9294f2f5798fcc3d (patch)
tree: 462362431f74fb4add21e56b99bb86e6e6daa39a
parent: 2508ef893b1fb8a0381f18b2aa7007c6217bb219 (diff)
download: chrome-ec-b5eb344ca4965a798b8c849a9294f2f5798fcc3d.tar.gz
48 files changed, 230 insertions, 228 deletions
diff --git a/zephyr/test/drivers/anx7447/src/low_power_mode.c b/zephyr/test/drivers/anx7447/src/low_power_mode.c
index cbcea1955c..91f132ef6d 100644
--- a/zephyr/test/drivers/anx7447/src/low_power_mode.c
+++ b/zephyr/test/drivers/anx7447/src/low_power_mode.c
@@ -20,7 +20,7 @@ static const int tcpm_anx7447_port = USBC_PORT_C0;
 ZTEST_SUITE(low_power_mode, drivers_predicate_post_main, NULL, NULL, NULL,
 	    NULL);
 
-ZTEST(low_power_mode, enter_low_power_in_source_mode)
+ZTEST(low_power_mode, test_enter_low_power_in_source_mode)
 {
 	uint16_t reg_val = 0;
 	const struct emul *anx7447_emul = EMUL_DT_GET(ANX7447_NODE);
@@ -40,7 +40,7 @@ ZTEST(low_power_mode, enter_low_power_in_source_mode)
 		"Role register value is not as expected while entering low power mode");
 }
 
-ZTEST(low_power_mode, enter_low_power_not_in_source_mode)
+ZTEST(low_power_mode, test_enter_low_power_not_in_source_mode)
 {
 	uint16_t reg_val = 0;
 	const struct emul *anx7447_emul = EMUL_DT_GET(ANX7447_NODE);
diff --git a/zephyr/test/drivers/default/src/console_cmd/vboot_hash.c b/zephyr/test/drivers/default/src/console_cmd/vboot_hash.c
index bdc9dddc66..83a14ff46f 100644
--- a/zephyr/test/drivers/default/src/console_cmd/vboot_hash.c
+++ b/zephyr/test/drivers/default/src/console_cmd/vboot_hash.c
@@ -24,7 +24,7 @@ struct console_cmd_hash_fixture {
 	uint8_t ro_hash[SHA256_DIGEST_SIZE];
 };
 
-ZTEST_F(console_cmd_hash, get_rw)
+ZTEST_F(console_cmd_hash, test_get_rw)
 {
 	const char *outbuffer;
 	size_t buffer_size;
@@ -50,7 +50,7 @@ ZTEST_F(console_cmd_hash, get_rw)
 	zassert_ok(!strstr(outbuffer, hash_buf), "Output was: `%s`", outbuffer);
 }
 
-ZTEST_F(console_cmd_hash, get_ro)
+ZTEST_F(console_cmd_hash, test_get_ro)
 {
 	const char *outbuffer;
 	size_t buffer_size;
@@ -76,7 +76,7 @@ ZTEST_F(console_cmd_hash, get_ro)
 	zassert_ok(!strstr(outbuffer, hash_buf), "Output was: `%s`", outbuffer);
 }
 
-ZTEST_F(console_cmd_hash, abort)
+ZTEST_F(console_cmd_hash, test_abort)
 {
 	const char *outbuffer;
 	size_t buffer_size;
@@ -99,7 +99,7 @@ ZTEST_F(console_cmd_hash, abort)
 		     "Output was: `%s`", outbuffer);
 }
 
-ZTEST_F(console_cmd_hash, custom_range)
+ZTEST_F(console_cmd_hash, test_custom_range)
 {
 	char command[256];
 	uint32_t offset = flash_get_rw_offset(system_get_active_copy());
@@ -140,7 +140,7 @@ ZTEST_F(console_cmd_hash, custom_range)
 		   outbuffer, hash_buf);
 }
 
-ZTEST_F(console_cmd_hash, custom_range_with_nonce)
+ZTEST_F(console_cmd_hash, test_custom_range_with_nonce)
 {
 	char command[256];
 	uint32_t offset = flash_get_rw_offset(system_get_active_copy());
@@ -183,7 +183,7 @@ ZTEST_F(console_cmd_hash, custom_range_with_nonce)
 		   outbuffer, hash_buf);
 }
 
-ZTEST(console_cmd_hash, invalid)
+ZTEST(console_cmd_hash, test_invalid)
 {
 	/* Invalid subcommand */
 	zassert_ok(!shell_execute_cmd(get_ec_shell(), "hash foo"));
diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c
index 6795e72c11..930e393691 100644
--- a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c
+++ b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c
@@ -224,7 +224,7 @@ ZTEST_F(usb_attach_5v_3a_pd_sink, test_disconnect_power_info)
  * Expected Results
  *  - Sink completes Goto Min PD negotiation
  */
-ZTEST_F(usb_attach_5v_3a_pd_sink, verify_goto_min)
+ZTEST_F(usb_attach_5v_3a_pd_sink, test_verify_goto_min)
 {
 	pd_dpm_request(0, DPM_REQUEST_GOTO_MIN);
 	k_sleep(K_SECONDS(1));
@@ -243,7 +243,7 @@ ZTEST_F(usb_attach_5v_3a_pd_sink, verify_goto_min)
  * Expected Results
  *  - Sink received ping message
  */
-ZTEST_F(usb_attach_5v_3a_pd_sink, verify_ping_msg)
+ZTEST_F(usb_attach_5v_3a_pd_sink, test_verify_ping_msg)
 {
 	tcpci_snk_emul_clear_ping_received(&fixture->snk_ext);
 
diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c b/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c
index 401a89cb11..c53a416f77 100644
--- a/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c
+++ b/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c
@@ -266,7 +266,7 @@ static void integration_usb_attach_snk_then_src_after(void *state)
 	attach_src_snk_common_after(&fixture->my_emulator_state);
 }
 
-ZTEST_F(integration_usb_attach_src_then_snk, verify_snk_port_pd_info)
+ZTEST_F(integration_usb_attach_src_then_snk, test_verify_snk_port_pd_info)
 {
 	struct ec_response_usb_pd_power_info response;
 
@@ -304,7 +304,7 @@ ZTEST_F(integration_usb_attach_src_then_snk, verify_snk_port_pd_info)
 		      response.max_power);
 }
 
-ZTEST_F(integration_usb_attach_src_then_snk, verify_src_port_pd_info)
+ZTEST_F(integration_usb_attach_src_then_snk, test_verify_src_port_pd_info)
 {
 	struct ec_response_usb_pd_power_info response;
 
@@ -335,7 +335,7 @@ ZTEST_F(integration_usb_attach_src_then_snk, verify_src_port_pd_info)
 	/* current limit */
 }
 
-ZTEST_F(integration_usb_attach_snk_then_src, verify_snk_port_pd_info)
+ZTEST_F(integration_usb_attach_snk_then_src, test_verify_snk_port_pd_info)
 {
 	struct ec_response_usb_pd_power_info response;
 
@@ -374,7 +374,7 @@ ZTEST_F(integration_usb_attach_snk_then_src, verify_snk_port_pd_info)
 		      response.max_power);
 }
 
-ZTEST_F(integration_usb_attach_snk_then_src, verify_src_port_pd_info)
+ZTEST_F(integration_usb_attach_snk_then_src, test_verify_src_port_pd_info)
 {
 	struct ec_response_usb_pd_power_info response;
 
@@ -406,7 +406,7 @@ ZTEST_F(integration_usb_attach_snk_then_src, verify_src_port_pd_info)
 	/* current limit */
 }
 
-ZTEST_F(integration_usb_attach_src_then_snk, verify_snk_port_typec_status)
+ZTEST_F(integration_usb_attach_src_then_snk, test_verify_snk_port_typec_status)
 {
 	struct ec_response_typec_status response =
 		host_cmd_typec_status(SNK_PORT);
@@ -436,7 +436,7 @@ ZTEST_F(integration_usb_attach_src_then_snk, verify_snk_port_typec_status)
 		      response.power_role);
 }
 
-ZTEST_F(integration_usb_attach_src_then_snk, verify_src_port_typec_status)
+ZTEST_F(integration_usb_attach_src_then_snk, test_verify_src_port_typec_status)
 {
 	struct ec_response_typec_status response =
 		host_cmd_typec_status(SRC_PORT);
@@ -466,7 +466,7 @@ ZTEST_F(integration_usb_attach_src_then_snk, verify_src_port_typec_status)
 		      response.power_role);
 }
 
-ZTEST_F(integration_usb_attach_snk_then_src, verify_snk_port_typec_status)
+ZTEST_F(integration_usb_attach_snk_then_src, test_verify_snk_port_typec_status)
 {
 	struct ec_response_typec_status response =
 		host_cmd_typec_status(SNK_PORT);
@@ -496,7 +496,7 @@ ZTEST_F(integration_usb_attach_snk_then_src, verify_snk_port_typec_status)
 		      response.power_role);
 }
 
-ZTEST_F(integration_usb_attach_snk_then_src, verify_src_port_typec_status)
+ZTEST_F(integration_usb_attach_snk_then_src, test_verify_src_port_typec_status)
 {
 	struct ec_response_typec_status response =
 		host_cmd_typec_status(SRC_PORT);
@@ -591,7 +591,7 @@ static void usb_detach_test_after(void *state)
 	attach_src_snk_common_after(&fixture->fixture);
 }
 
-ZTEST_F(usb_detach_test, verify_detach_src_snk)
+ZTEST_F(usb_detach_test, test_verify_detach_src_snk)
 {
 	struct emul_state *emul_state = &fixture->fixture;
 	struct ec_response_usb_pd_power_info src_power_info = { 0 };
@@ -653,7 +653,7 @@ ZTEST_F(usb_detach_test, verify_detach_src_snk)
 		      src_power_info.meas.current_max);
 }
 
-ZTEST_F(usb_detach_test, verify_detach_snk_src)
+ZTEST_F(usb_detach_test, test_verify_detach_snk_src)
 {
 	struct emul_state *emul_state = &fixture->fixture;
 	struct ec_response_usb_pd_power_info src_power_info = { 0 };
@@ -715,7 +715,7 @@ ZTEST_F(usb_detach_test, verify_detach_snk_src)
 		      src_power_info.meas.current_max);
 }
 
-ZTEST_F(usb_detach_test, verify_detach_sink)
+ZTEST_F(usb_detach_test, test_verify_detach_sink)
 {
 	struct emul_state *emul_state = &fixture->fixture;
 	struct ec_response_usb_pd_power_info pd_power_info = { 0 };
@@ -757,7 +757,7 @@ ZTEST_F(usb_detach_test, verify_detach_sink)
 		      pd_power_info.max_power);
 }
 
-ZTEST_F(usb_detach_test, verify_detach_source)
+ZTEST_F(usb_detach_test, test_verify_detach_source)
 {
 	struct emul_state *emul_state = &fixture->fixture;
 	struct ec_response_usb_pd_power_info pd_power_info = { SNK_PORT };
diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c
index 36a417d22c..6284881690 100644
--- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c
+++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c
@@ -80,7 +80,7 @@ ZTEST_SUITE(usb_pd_bist_shared, drivers_predicate_post_main,
 	    usb_pd_bist_shared_setup, usb_pd_bist_shared_before,
 	    usb_pd_bist_shared_after, NULL);
 
-ZTEST_F(usb_pd_bist_shared, verify_bist_shared_mode)
+ZTEST_F(usb_pd_bist_shared, test_verify_bist_shared_mode)
 {
 	uint32_t bist_data;
 	uint32_t f5v_cap;
@@ -135,7 +135,7 @@ ZTEST_F(usb_pd_bist_shared, verify_bist_shared_mode)
 		      "PDO current didn't decrease after BIST exit");
 }
 
-ZTEST_F(usb_pd_bist_shared, verify_bist_shared_no_snk_entry)
+ZTEST_F(usb_pd_bist_shared, test_verify_bist_shared_no_snk_entry)
 {
 	uint32_t bist_data;
 	uint32_t f5v_cap;
@@ -169,7 +169,7 @@ ZTEST_F(usb_pd_bist_shared, verify_bist_shared_no_snk_entry)
 		      "PDO current incorrect after bad BIST entry");
 }
 
-ZTEST_F(usb_pd_bist_shared, verify_bist_shared_exit_no_action)
+ZTEST_F(usb_pd_bist_shared, test_verify_bist_shared_exit_no_action)
 {
 	uint32_t bist_data;
 	uint32_t f5v_cap;
@@ -193,7 +193,7 @@ ZTEST_F(usb_pd_bist_shared, verify_bist_shared_exit_no_action)
 	zassert_equal(f5v_cap, 0, "Received unexpected source cap");
 }
 
-ZTEST_F(usb_pd_bist_shared, verify_control_bist_shared_mode)
+ZTEST_F(usb_pd_bist_shared, test_verify_control_bist_shared_mode)
 {
 	uint32_t f5v_cap;
 
diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c
index 0e5d3eecad..af7564635c 100644
--- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c
+++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c
@@ -158,7 +158,7 @@ ZTEST_SUITE(usb_pd_ctrl_msg_test_source, drivers_predicate_post_main,
 	    usb_pd_ctrl_msg_source_setup, usb_pd_ctrl_msg_before,
 	    usb_pd_ctrl_msg_after, NULL);
 
-ZTEST_F(usb_pd_ctrl_msg_test_sink, verify_vconn_swap)
+ZTEST_F(usb_pd_ctrl_msg_test_sink, test_verify_vconn_swap)
 {
 	struct usb_pd_ctrl_msg_test_fixture *super_fixture = &fixture->fixture;
 	struct ec_response_typec_status snk_resp = { 0 };
@@ -181,7 +181,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_sink, verify_vconn_swap)
 		      "SNK Returned vconn_role=%u", snk_resp.vconn_role);
 }
 
-ZTEST_F(usb_pd_ctrl_msg_test_sink, verify_pr_swap)
+ZTEST_F(usb_pd_ctrl_msg_test_sink, test_verify_pr_swap)
 {
 	struct usb_pd_ctrl_msg_test_fixture *super_fixture = &fixture->fixture;
 	struct ec_response_typec_status snk_resp = { 0 };
@@ -228,7 +228,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_sink, verify_pr_swap)
  * Expected Results
  *  - TypeC status query returns PD_ROLE_DFP
  */
-ZTEST_F(usb_pd_ctrl_msg_test_sink, verify_dr_swap)
+ZTEST_F(usb_pd_ctrl_msg_test_sink, test_verify_dr_swap)
 {
 	struct ec_response_typec_status typec_status =
 		host_cmd_typec_status(TEST_USB_PORT);
@@ -250,7 +250,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_sink, verify_dr_swap)
  * Expected Results
  *  - Data role does not change on TEST_USB_PORT after DR Swap request.
  */
-ZTEST_F(usb_pd_ctrl_msg_test_source, verify_dr_swap_rejected)
+ZTEST_F(usb_pd_ctrl_msg_test_source, test_verify_dr_swap_rejected)
 {
 	struct usb_pd_ctrl_msg_test_fixture *super_fixture = &fixture->fixture;
 	struct ec_response_typec_status typec_status = { 0 };
@@ -286,7 +286,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_source, verify_dr_swap_rejected)
  * Expected Results
  *  - Data role changes after DPM DR Swap request
  */
-ZTEST_F(usb_pd_ctrl_msg_test_source, verify_dpm_dr_swap)
+ZTEST_F(usb_pd_ctrl_msg_test_source, test_verify_dpm_dr_swap)
 {
 	struct ec_response_typec_status typec_status = { 0 };
 
@@ -313,7 +313,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_source, verify_dpm_dr_swap)
  * Expected Results
  *  - TypeC Status Host Command reveals sink capabilility PDOs.
  */
-ZTEST(usb_pd_ctrl_msg_test_source, verify_dpm_get_sink_cap)
+ZTEST(usb_pd_ctrl_msg_test_source, test_verify_dpm_get_sink_cap)
 {
 	struct ec_response_typec_status typec_status = { 0 };
 
@@ -334,7 +334,7 @@ ZTEST(usb_pd_ctrl_msg_test_source, verify_dpm_get_sink_cap)
  * Expected Results
  *  - TypeC Status Host Command reveals sink capabilility PDOs.
  */
-ZTEST(usb_pd_ctrl_msg_test_sink, verify_get_sink_cap)
+ZTEST(usb_pd_ctrl_msg_test_sink, test_verify_get_sink_cap)
 {
 	struct ec_response_typec_status typec_status = { 0 };
 
@@ -354,7 +354,7 @@ ZTEST(usb_pd_ctrl_msg_test_sink, verify_get_sink_cap)
  * Expected Results
  *  - BIST occurs and we transition back to READY state
  */
-ZTEST_F(usb_pd_ctrl_msg_test_source, verify_bist_tx_mode2)
+ZTEST_F(usb_pd_ctrl_msg_test_source, test_verify_bist_tx_mode2)
 {
 	struct usb_pd_ctrl_msg_test_fixture *super_fixture = &fixture->fixture;
 	uint32_t bdo = BDO(BDO_MODE_CARRIER2, 0);
@@ -381,7 +381,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_source, verify_bist_tx_mode2)
  * Expected Results
  *  - Partner remains in BIST_TX state until hard reset is received.
  */
-ZTEST_F(usb_pd_ctrl_msg_test_source, verify_bist_tx_test_data)
+ZTEST_F(usb_pd_ctrl_msg_test_source, test_verify_bist_tx_test_data)
 {
 	struct usb_pd_ctrl_msg_test_fixture *super_fixture = &fixture->fixture;
 	uint32_t bdo = BDO(BDO_MODE_TEST_DATA, 0);
diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c
index 6a93e4704d..0ae92b88b4 100644
--- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c
+++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c
@@ -176,7 +176,7 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, test_batt_cap_invalid)
 		"Invalid battery ref bit should be set");
 }
 
-ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_typec_status_using_rmdo)
+ZTEST_F(usb_attach_5v_3a_pd_source_rev3, test_verify_typec_status_using_rmdo)
 {
 	struct ec_params_typec_status params = { .port = TEST_PORT };
 	struct ec_response_typec_status response;
@@ -190,7 +190,7 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_typec_status_using_rmdo)
 	zassert_equal(response.sop_revision, fixture->source_5v_3a.rmdo >> 16);
 }
 
-ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_msg)
+ZTEST_F(usb_attach_5v_3a_pd_source_rev3, test_verify_alert_msg)
 {
 	zassert_equal(pd_broadcast_alert_msg(ADO_OTP_EVENT), EC_SUCCESS);
 
@@ -198,7 +198,8 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_msg)
 	zassert_true(fixture->src_ext.alert_received);
 }
 
-ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_on_power_state_change)
+ZTEST_F(usb_attach_5v_3a_pd_source_rev3,
+	test_verify_alert_on_power_state_change)
 {
 	/* Suspend and check partner received Alert and Status messages */
 	hook_notify(HOOK_CHIPSET_SUSPEND);
@@ -238,7 +239,7 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_on_power_state_change)
 }
 
 ZTEST_F(usb_attach_5v_3a_pd_source_rev3,
-	verify_simultaneous_alert_status_resolution)
+	test_verify_simultaneous_alert_status_resolution)
 {
 	zassert_false(fixture->src_ext.alert_received);
 	zassert_false(fixture->src_ext.status_received);
@@ -292,7 +293,7 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3,
 }
 
 ZTEST_F(usb_attach_5v_3a_pd_source_rev3,
-	verify_inaction_on_pd_button_press_while_awake)
+	test_verify_inaction_on_pd_button_press_while_awake)
 {
 	uint32_t ado;
 
@@ -311,7 +312,7 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3,
 }
 
 ZTEST_F(usb_attach_5v_3a_pd_source_rev3,
-	verify_inaction_on_invalid_pd_button_press)
+	test_verify_inaction_on_invalid_pd_button_press)
 {
 	uint32_t ado;
 
@@ -344,7 +345,7 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3,
 	k_sleep(K_SECONDS(10));
 }
 
-ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_startup_on_pd_button_press)
+ZTEST_F(usb_attach_5v_3a_pd_source_rev3, test_verify_startup_on_pd_button_press)
 {
 	uint32_t ado;
 
@@ -376,7 +377,8 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_startup_on_pd_button_press)
 	zassert_true(chipset_in_state(CHIPSET_STATE_ON));
 }
 
-ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_chipset_on_pd_button_behavior)
+ZTEST_F(usb_attach_5v_3a_pd_source_rev3,
+	test_verify_chipset_on_pd_button_behavior)
 {
 	uint32_t ado;
 
@@ -443,7 +445,7 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_chipset_on_pd_button_behavior)
 	k_sleep(K_SECONDS(10));
 }
 
-ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_uvdm_not_supported)
+ZTEST_F(usb_attach_5v_3a_pd_source_rev3, test_verify_uvdm_not_supported)
 {
 	uint32_t vdm_header = VDO(USB_VID_GOOGLE, 0 /* unstructured */, 0);
 
diff --git a/zephyr/test/drivers/default/src/motion_sense/motion_sense.c b/zephyr/test/drivers/default/src/motion_sense/motion_sense.c
index 8291e0e1c6..9ea6509fe3 100644
--- a/zephyr/test/drivers/default/src/motion_sense/motion_sense.c
+++ b/zephyr/test/drivers/default/src/motion_sense/motion_sense.c
@@ -12,7 +12,7 @@ extern enum chipset_state_mask sensor_active;
 
 ZTEST_SUITE(motion_sense, drivers_predicate_post_main, NULL, NULL, NULL, NULL);
 
-ZTEST_USER(motion_sense, ec_motion_sensor_fill_values)
+ZTEST_USER(motion_sense, test_ec_motion_sensor_fill_values)
 {
 	struct ec_response_motion_sensor_data dst = {
 		.data = { 1, 2, 3 },
@@ -25,7 +25,7 @@ ZTEST_USER(motion_sense, ec_motion_sensor_fill_values)
 	zassert_equal(dst.data[2], v[2]);
 }
 
-ZTEST_USER(motion_sense, ec_motion_sensor_clamp_i16)
+ZTEST_USER(motion_sense, test_ec_motion_sensor_clamp_i16)
 {
 	zassert_equal(ec_motion_sensor_clamp_i16(0), 0);
 	zassert_equal(ec_motion_sensor_clamp_i16(200), 200);
@@ -36,7 +36,7 @@ ZTEST_USER(motion_sense, ec_motion_sensor_clamp_i16)
 		      NULL);
 }
 
-ZTEST_USER(motion_sense, ec_motion_sense_get_ec_config)
+ZTEST_USER(motion_sense, test_ec_motion_sense_get_ec_config)
 {
 	/* illegal state, should be translated to S5 */
 	sensor_active = 42;
diff --git a/zephyr/test/drivers/default/src/power_common.c b/zephyr/test/drivers/default/src/power_common.c
index 58ca3977f9..529258e553 100644
--- a/zephyr/test/drivers/default/src/power_common.c
+++ b/zephyr/test/drivers/default/src/power_common.c
@@ -448,7 +448,7 @@ ZTEST(power_common, test_power_board_system_is_idle)
 /**
  * Test power console command
  */
-ZTEST(power_common, power_console_cmd)
+ZTEST(power_common, test_power_console_cmd)
 {
 	const char *buffer;
 	size_t buffer_size;
@@ -484,7 +484,7 @@ ZTEST(power_common, power_console_cmd)
 /**
  * Test powerinfo console command
  */
-ZTEST_USER(power_common, powerinfo_console_cmd)
+ZTEST_USER(power_common, test_powerinfo_console_cmd)
 {
 	char expected_buffer[32];
 
diff --git a/zephyr/test/drivers/default/src/util.c b/zephyr/test/drivers/default/src/util.c
index 342ce9b971..ac5aed9736 100644
--- a/zephyr/test/drivers/default/src/util.c
+++ b/zephyr/test/drivers/default/src/util.c
@@ -8,7 +8,7 @@
 #include <zephyr/fff.h>
 #include <zephyr/ztest.h>
 
-ZTEST(util, reverse)
+ZTEST(util, test_reverse)
 {
 	uint8_t input[] = { 0, 1, 2, 3, 4 };
 	uint8_t expected[] = { 4, 3, 2, 1, 0 };
@@ -18,7 +18,7 @@ ZTEST(util, reverse)
 	zassert_mem_equal(input, expected, sizeof(input), NULL);
 }
 
-ZTEST(util, parse_offset_size__normal)
+ZTEST(util, test_parse_offset_size__normal)
 {
 	const char *argv[] = { "cmd", "123", "456" };
 	int argc = ARRAY_SIZE(argv);
@@ -30,7 +30,7 @@ ZTEST(util, parse_offset_size__normal)
 	zassert_equal(456, size, NULL);
 }
 
-ZTEST(util, parse_offset_size__invalid_param1)
+ZTEST(util, test_parse_offset_size__invalid_param1)
 {
 	const char *argv[] = { "cmd", "xyz" /* <- bad */, "456" };
 	int argc = ARRAY_SIZE(argv);
@@ -41,7 +41,7 @@ ZTEST(util, parse_offset_size__invalid_param1)
 		      parse_offset_size(argc, argv, 1, &offset, &size), NULL);
 }
 
-ZTEST(util, parse_offset_size__invalid_param2)
+ZTEST(util, test_parse_offset_size__invalid_param2)
 {
 	const char *argv[] = { "cmd", "123", "xyz" /* <- bad */ };
 	int argc = ARRAY_SIZE(argv);
@@ -52,7 +52,7 @@ ZTEST(util, parse_offset_size__invalid_param2)
 		      parse_offset_size(argc, argv, 1, &offset, &size), NULL);
 }
 
-ZTEST(util, wait_for_ready)
+ZTEST(util, test_wait_for_ready)
 {
 	uint32_t reg;
 
@@ -66,7 +66,7 @@ ZTEST(util, wait_for_ready)
 	wait_for_ready(&reg, 1, 1);
 }
 
-ZTEST(util, binary_from_bits)
+ZTEST(util, test_binary_from_bits)
 {
 	int input[] = {
 		0,
@@ -79,7 +79,7 @@ ZTEST(util, binary_from_bits)
 	zassert_equal(0, binary_from_bits(NULL, 0), NULL);
 }
 
-ZTEST(util, ternary_from_bits)
+ZTEST(util, test_ternary_from_bits)
 {
 	int input[] = {
 		0,
diff --git a/zephyr/test/drivers/dps/src/dps_config.c b/zephyr/test/drivers/dps/src/dps_config.c
index a3c7736e31..aaa3ac14ff 100644
--- a/zephyr/test/drivers/dps/src/dps_config.c
+++ b/zephyr/test/drivers/dps/src/dps_config.c
@@ -69,13 +69,13 @@ ZTEST_F(dps_config, test_config)
 	*config = fixture->saved_config;
 }
 
-ZTEST(dps_config, console_cmd__print_info)
+ZTEST(dps_config, test_console_cmd__print_info)
 {
 	/* Print current status to console */
 	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps"), NULL);
 }
 
-ZTEST(dps_config, console_cmd__enable)
+ZTEST(dps_config, test_console_cmd__enable)
 {
 	/* Disable DPS first, then try enabling */
 	dps_enable(false);
@@ -86,7 +86,7 @@ ZTEST(dps_config, console_cmd__enable)
 	zassert_true(dps_is_enabled(), NULL);
 }
 
-ZTEST(dps_config, console_cmd__disable)
+ZTEST(dps_config, test_console_cmd__disable)
 {
 	/* Should already by enabled due to before() function */
 	zassert_true(dps_is_enabled(), NULL);
@@ -96,13 +96,13 @@ ZTEST(dps_config, console_cmd__disable)
 	zassert_false(dps_is_enabled(), NULL);
 }
 
-ZTEST(dps_config, console_cmd__fakepwr_print)
+ZTEST(dps_config, test_console_cmd__fakepwr_print)
 {
 	/* Print current fake power status to console */
 	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps fakepwr"), NULL);
 }
 
-ZTEST(dps_config, console_cmd__fakepwr_enable_disable)
+ZTEST(dps_config, test_console_cmd__fakepwr_enable_disable)
 {
 	zassert_false(dps_is_fake_enabled(),
 		      "fakepwr shouldn't be enabled by default");
@@ -119,7 +119,7 @@ ZTEST(dps_config, console_cmd__fakepwr_enable_disable)
 	zassert_false(dps_is_fake_enabled(), NULL);
 }
 
-ZTEST(dps_config, console_cmd__fakepwr_invalid)
+ZTEST(dps_config, test_console_cmd__fakepwr_invalid)
 {
 	/* Various invalid parameters */
 	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps fakepwr 100"), NULL);
@@ -129,7 +129,7 @@ ZTEST(dps_config, console_cmd__fakepwr_invalid)
 		   NULL);
 }
 
-ZTEST(dps_config, console_cmd__debuglevel)
+ZTEST(dps_config, test_console_cmd__debuglevel)
 {
 	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps debug 999"), NULL);
 
@@ -137,7 +137,7 @@ ZTEST(dps_config, console_cmd__debuglevel)
 		      *dps_get_debug_level());
 }
 
-ZTEST(dps_config, console_cmd__setkmore)
+ZTEST(dps_config, test_console_cmd__setkmore)
 {
 	struct dps_config_t *config = dps_get_config();
 	char cmd[32];
@@ -165,7 +165,7 @@ ZTEST(dps_config, console_cmd__setkmore)
 		      config->k_less_pwr + 1);
 }
 
-ZTEST(dps_config, console_cmd__setkless)
+ZTEST(dps_config, test_console_cmd__setkless)
 {
 	struct dps_config_t *config = dps_get_config();
 	char cmd[32];
@@ -193,7 +193,7 @@ ZTEST(dps_config, console_cmd__setkless)
 		      config->k_more_pwr - 1);
 }
 
-ZTEST(dps_config, console_cmd__setksample)
+ZTEST(dps_config, test_console_cmd__setksample)
 {
 	struct dps_config_t *config = dps_get_config();
 
@@ -209,7 +209,7 @@ ZTEST(dps_config, console_cmd__setksample)
 		      config->k_sample);
 }
 
-ZTEST(dps_config, console_cmd__setkwindow)
+ZTEST(dps_config, test_console_cmd__setkwindow)
 {
 	struct dps_config_t *config = dps_get_config();
 
@@ -222,7 +222,7 @@ ZTEST(dps_config, console_cmd__setkwindow)
 	zassert_equal(4, config->k_window, "k_window is %d", config->k_window);
 }
 
-ZTEST(dps_config, console_cmd__settcheck)
+ZTEST(dps_config, test_console_cmd__settcheck)
 {
 	struct dps_config_t *config = dps_get_config();
 
@@ -237,7 +237,7 @@ ZTEST(dps_config, console_cmd__settcheck)
 		      config->t_check);
 }
 
-ZTEST(dps_config, console_cmd__settstable)
+ZTEST(dps_config, test_console_cmd__settstable)
 {
 	struct dps_config_t *config = dps_get_config();
 
@@ -252,7 +252,7 @@ ZTEST(dps_config, console_cmd__settstable)
 		      config->t_stable);
 }
 
-ZTEST(dps_config, console_cmd__invalid)
+ZTEST(dps_config, test_console_cmd__invalid)
 {
 	/* Non-existent subcommand should fail */
 	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps foobar xyz"), NULL);
diff --git a/zephyr/test/drivers/dps/src/dps_selection.c b/zephyr/test/drivers/dps/src/dps_selection.c
index a06aabc67f..4fd0175ffa 100644
--- a/zephyr/test/drivers/dps/src/dps_selection.c
+++ b/zephyr/test/drivers/dps/src/dps_selection.c
@@ -167,7 +167,7 @@ static void dps_selection_after(void *data)
 	reset();
 }
 
-ZTEST_USER_F(dps_selection, dps_pdo_switch)
+ZTEST_USER_F(dps_selection, test_dps_pdo_switch)
 {
 	struct common_fixture *common = &fixture->common;
 	struct tcpci_src_emul_data *src_ext = &common->src_ext;
diff --git a/zephyr/test/drivers/gpio_unhook/src/is_not_ready.c b/zephyr/test/drivers/gpio_unhook/src/is_not_ready.c
index ad0e41aa57..b0b6e627b0 100644
--- a/zephyr/test/drivers/gpio_unhook/src/is_not_ready.c
+++ b/zephyr/test/drivers/gpio_unhook/src/is_not_ready.c
@@ -13,7 +13,7 @@
 
 ZTEST_SUITE(not_ready, drivers_predicate_post_main, NULL, NULL, NULL, NULL);
 
-ZTEST(not_ready, bad_tcpc)
+ZTEST(not_ready, test_bad_tcpc)
 {
 	for (int i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) {
 		gpio_flags_t flags;
diff --git a/zephyr/test/drivers/host_cmd/src/adc.c b/zephyr/test/drivers/host_cmd/src/adc.c
index a6e9beb62c..0931f667d3 100644
--- a/zephyr/test/drivers/host_cmd/src/adc.c
+++ b/zephyr/test/drivers/host_cmd/src/adc.c
@@ -14,7 +14,7 @@
 
 FAKE_VALUE_FUNC(int, adc_read_channel, enum adc_channel);
 
-ZTEST(hc_adc, normal_path)
+ZTEST(hc_adc, test_normal_path)
 {
 	struct ec_params_adc_read params = {
 		.adc_channel = ADC_TEMP_SENSOR_CHARGER,
@@ -31,7 +31,7 @@ ZTEST(hc_adc, normal_path)
 	zassert_equal(123, response.adc_value);
 }
 
-ZTEST(hc_adc, bad_ch_number)
+ZTEST(hc_adc, test_bad_ch_number)
 {
 	struct ec_params_adc_read params = {
 		.adc_channel = ADC_CH_COUNT + 1, /* Invalid */
diff --git a/zephyr/test/drivers/host_cmd/src/battery_display_soc.c b/zephyr/test/drivers/host_cmd/src/battery_display_soc.c
index 34a3881b5d..b158051195 100644
--- a/zephyr/test/drivers/host_cmd/src/battery_display_soc.c
+++ b/zephyr/test/drivers/host_cmd/src/battery_display_soc.c
@@ -10,7 +10,7 @@
 
 #include <zephyr/ztest.h>
 
-ZTEST_USER(battery_display_soc, happy_path)
+ZTEST_USER(battery_display_soc, test_happy_path)
 {
 	const uint32_t full_charge_as_tenths =
 		CONFIG_BATT_HOST_FULL_FACTOR * 10;
diff --git a/zephyr/test/drivers/host_cmd/src/host_command.c b/zephyr/test/drivers/host_cmd/src/host_command.c
index e1168648d9..7118fbaab1 100644
--- a/zephyr/test/drivers/host_cmd/src/host_command.c
+++ b/zephyr/test/drivers/host_cmd/src/host_command.c
@@ -9,7 +9,7 @@
 
 #include <zephyr/ztest.h>
 
-ZTEST(host_cmd_host_commands, get_command_versions__v1)
+ZTEST(host_cmd_host_commands, test_get_command_versions__v1)
 {
 	struct ec_response_get_cmd_versions response;
 	struct ec_params_get_cmd_versions_v1 params = {
@@ -23,7 +23,7 @@ ZTEST(host_cmd_host_commands, get_command_versions__v1)
 	zassert_equal(EC_VER_MASK(0) | EC_VER_MASK(1), response.version_mask);
 }
 
-ZTEST(host_cmd_host_commands, get_command_versions__invalid_cmd)
+ZTEST(host_cmd_host_commands, test_get_command_versions__invalid_cmd)
 {
 	struct ec_response_get_cmd_versions response;
 	struct ec_params_get_cmd_versions_v1 params = {
@@ -37,7 +37,7 @@ ZTEST(host_cmd_host_commands, get_command_versions__invalid_cmd)
 	zassert_equal(EC_RES_INVALID_PARAM, rv, "Got %d", rv);
 }
 
-ZTEST(host_cmd_host_commands, get_comms_status)
+ZTEST(host_cmd_host_commands, test_get_comms_status)
 {
 	struct ec_response_get_comms_status response;
 	int rv;
@@ -52,7 +52,7 @@ ZTEST(host_cmd_host_commands, get_comms_status)
 	zassert_false(response.flags);
 }
 
-ZTEST(host_cmd_host_commands, resend_response)
+ZTEST(host_cmd_host_commands, test_resend_response)
 {
 	struct host_cmd_handler_args args =
 		(struct host_cmd_handler_args)BUILD_HOST_COMMAND_SIMPLE(
@@ -70,7 +70,7 @@ ZTEST(host_cmd_host_commands, resend_response)
 	 */
 }
 
-ZTEST(host_cmd_host_commands, get_proto_version)
+ZTEST(host_cmd_host_commands, test_get_proto_version)
 {
 	struct ec_response_proto_version response;
 	int rv;
diff --git a/zephyr/test/drivers/host_cmd/src/motion_sense.c b/zephyr/test/drivers/host_cmd/src/motion_sense.c
index 919baf7219..c231f6f55e 100644
--- a/zephyr/test/drivers/host_cmd/src/motion_sense.c
+++ b/zephyr/test/drivers/host_cmd/src/motion_sense.c
@@ -872,7 +872,7 @@ ZTEST(host_cmd_motion_sense, test_spoof_invalid_mode)
 		      NULL);
 }
 
-ZTEST(host_cmd_motion_sense, set_kb_wake_lid_angle)
+ZTEST(host_cmd_motion_sense, test_set_kb_wake_lid_angle)
 {
 	struct ec_response_motion_sense response;
 	int16_t expected_lid_angle = 45;
@@ -885,7 +885,7 @@ ZTEST(host_cmd_motion_sense, set_kb_wake_lid_angle)
 	zassert_equal(expected_lid_angle, response.kb_wake_angle.ret);
 }
 
-ZTEST(host_cmd_motion_sense, get_lid_angle)
+ZTEST(host_cmd_motion_sense, test_get_lid_angle)
 {
 	struct ec_response_motion_sense response;
 	int rv;
diff --git a/zephyr/test/drivers/host_cmd_read_memmap/src/read_memmap.c b/zephyr/test/drivers/host_cmd_read_memmap/src/read_memmap.c
index 17ae4109f9..88472a3467 100644
--- a/zephyr/test/drivers/host_cmd_read_memmap/src/read_memmap.c
+++ b/zephyr/test/drivers/host_cmd_read_memmap/src/read_memmap.c
@@ -14,7 +14,7 @@
 FAKE_VOID_FUNC(switch_interrupt, int);
 #endif
 
-ZTEST(ec_cmd_read_memmap, id)
+ZTEST(ec_cmd_read_memmap, test_id)
 {
 	struct ec_params_read_memmap params = {
 		.offset = EC_MEMMAP_ID,
@@ -38,7 +38,7 @@ ZTEST(ec_cmd_read_memmap, id)
 	zassert_equal('C', response[1]);
 }
 
-ZTEST(ec_cmd_read_memmap, switches)
+ZTEST(ec_cmd_read_memmap, test_switches)
 {
 	struct ec_params_read_memmap params = {
 		.offset = EC_MEMMAP_SWITCHES,
@@ -66,7 +66,7 @@ ZTEST(ec_cmd_read_memmap, switches)
 	}
 }
 
-ZTEST(ec_cmd_read_memmap, invalid)
+ZTEST(ec_cmd_read_memmap, test_invalid)
 {
 	struct ec_params_read_memmap params = {
 		.offset = EC_MEMMAP_ID,
diff --git a/zephyr/test/drivers/host_command_memory_dump/src/host_command_memory_dump.c b/zephyr/test/drivers/host_command_memory_dump/src/host_command_memory_dump.c
index 322980b784..373c066a3c 100644
--- a/zephyr/test/drivers/host_command_memory_dump/src/host_command_memory_dump.c
+++ b/zephyr/test/drivers/host_command_memory_dump/src/host_command_memory_dump.c
@@ -222,7 +222,7 @@ static enum ec_status fetch_memory_dump(struct mem_dump *dump)
  * Ensure that a memory dump returns empty list if requested before being
  * initialized.
  */
-ZTEST_USER(memory_dump, dump_before_registered)
+ZTEST_USER(memory_dump, test_dump_before_registered)
 {
 	struct ec_response_memory_dump_get_metadata metadata_response;
 	int rv;
@@ -236,7 +236,7 @@ ZTEST_USER(memory_dump, dump_before_registered)
 }
 
 /* Check if thread stack is included in memory dump */
-ZTEST_USER(memory_dump, dump_thread_stack)
+ZTEST_USER(memory_dump, test_dump_thread_stack)
 {
 	const uint32_t magic_val_1 = 0x11111111;
 	const uint32_t magic_val_2 = 0x22222222;
@@ -301,7 +301,7 @@ ZTEST_USER(memory_dump, dump_thread_stack)
 }
 
 /* Check if keyscan thread stack is included in memory dump */
-ZTEST_USER(memory_dump, verify_excluded_threads_not_dumped)
+ZTEST_USER(memory_dump, test_verify_excluded_threads_not_dumped)
 {
 	struct mem_dump dump;
 	k_tid_t main_thread;
diff --git a/zephyr/test/drivers/i2c_controller/src/i2c_controller.c b/zephyr/test/drivers/i2c_controller/src/i2c_controller.c
index 594c3e6888..1044d14cd7 100644
--- a/zephyr/test/drivers/i2c_controller/src/i2c_controller.c
+++ b/zephyr/test/drivers/i2c_controller/src/i2c_controller.c
@@ -18,7 +18,7 @@ struct i2c_controller_fixture {
 	struct basic_i2c_device_data *emul_data;
 };
 
-ZTEST_F(i2c_controller, write_read32_le)
+ZTEST_F(i2c_controller, test_write_read32_le)
 {
 	uint32_t expected = 0xAABBCCDD;
 	uint32_t actual;
@@ -38,7 +38,7 @@ ZTEST_F(i2c_controller, write_read32_le)
 		      expected);
 }
 
-ZTEST_F(i2c_controller, write_read32_be)
+ZTEST_F(i2c_controller, test_write_read32_be)
 {
 	uint32_t expected = 0xAABBCCDD;
 	uint32_t actual;
@@ -61,7 +61,7 @@ ZTEST_F(i2c_controller, write_read32_be)
 		      expected);
 }
 
-ZTEST_F(i2c_controller, write_read16_be)
+ZTEST_F(i2c_controller, test_write_read16_be)
 {
 	uint16_t expected = 0x1122;
 	int actual;
@@ -84,7 +84,7 @@ ZTEST_F(i2c_controller, write_read16_be)
 		      (uint16_t)actual, expected);
 }
 
-ZTEST_F(i2c_controller, read32_fail)
+ZTEST_F(i2c_controller, test_read32_fail)
 {
 	int ret;
 	uint32_t data;
@@ -95,7 +95,7 @@ ZTEST_F(i2c_controller, read32_fail)
 	zassert_equal(EC_ERROR_INVAL, ret, "Got %d", ret);
 }
 
-ZTEST_F(i2c_controller, write32_fail)
+ZTEST_F(i2c_controller, test_write32_fail)
 {
 	int ret;
 
@@ -105,7 +105,7 @@ ZTEST_F(i2c_controller, write32_fail)
 	zassert_equal(EC_ERROR_INVAL, ret, "Got %d", ret);
 }
 
-ZTEST_F(i2c_controller, field_update16)
+ZTEST_F(i2c_controller, test_field_update16)
 {
 	/* Write a 16-bit value with mask */
 
@@ -131,7 +131,7 @@ ZTEST_F(i2c_controller, field_update16)
 		      EC_ERROR_INVAL);
 }
 
-ZTEST_F(i2c_controller, read_offset16__one_byte)
+ZTEST_F(i2c_controller, test_read_offset16__one_byte)
 {
 	/* Read 1 byte from a 16-bit register offset, which will cause us to
 	 * access the extended register space of our i2c device
@@ -149,7 +149,7 @@ ZTEST_F(i2c_controller, read_offset16__one_byte)
 		      expected);
 }
 
-ZTEST_F(i2c_controller, read_offset16__two_bytes)
+ZTEST_F(i2c_controller, test_read_offset16__two_bytes)
 {
 	/* Read 2 bytes from a 16-bit register offset, which will cause us to
 	 * access the extended register space of our i2c device
@@ -168,7 +168,7 @@ ZTEST_F(i2c_controller, read_offset16__two_bytes)
 		      expected);
 }
 
-ZTEST_F(i2c_controller, read_offset16__two_bytes_be)
+ZTEST_F(i2c_controller, test_read_offset16__two_bytes_be)
 {
 	/* Read 2 bytes from a 16-bit register offset, which will cause us to
 	 * access the extended register space of our i2c device
@@ -190,7 +190,7 @@ ZTEST_F(i2c_controller, read_offset16__two_bytes_be)
 		      expected);
 }
 
-ZTEST_F(i2c_controller, read_offset16__invalid)
+ZTEST_F(i2c_controller, test_read_offset16__invalid)
 {
 	/* Check length limits */
 	zassert_ok(
@@ -203,7 +203,7 @@ ZTEST_F(i2c_controller, read_offset16__invalid)
 				      1));
 }
 
-ZTEST_F(i2c_controller, write_offset16__one_byte)
+ZTEST_F(i2c_controller, test_write_offset16__one_byte)
 {
 	/* Write 1 byte to a 16-bit register offset, which will cause us to
 	 * access the extended register space of our i2c device
@@ -221,7 +221,7 @@ ZTEST_F(i2c_controller, write_offset16__one_byte)
 		      expected);
 }
 
-ZTEST_F(i2c_controller, write_offset16__two_bytes)
+ZTEST_F(i2c_controller, test_write_offset16__two_bytes)
 {
 	/* Write 2 bytes to a 16-bit register offset, which will cause us to
 	 * access the extended register space of our i2c device
@@ -239,7 +239,7 @@ ZTEST_F(i2c_controller, write_offset16__two_bytes)
 		      expected);
 }
 
-ZTEST_F(i2c_controller, write_offset16__two_bytes_be)
+ZTEST_F(i2c_controller, test_write_offset16__two_bytes_be)
 {
 	/* Write 2 bytes to a 16-bit register offset, which will cause us to
 	 * access the extended register space of our i2c device
@@ -259,14 +259,14 @@ ZTEST_F(i2c_controller, write_offset16__two_bytes_be)
 		      expected);
 }
 
-ZTEST_F(i2c_controller, write_offset16__invalid)
+ZTEST_F(i2c_controller, test_write_offset16__invalid)
 {
 	/* Check length limits */
 	zassert_ok(!i2c_write_offset16(fixture->port, fixture->addr, 0, 0, 3));
 	zassert_ok(!i2c_write_offset16(fixture->port, fixture->addr, 0, 0, -1));
 }
 
-ZTEST_F(i2c_controller, read_offset16_block)
+ZTEST_F(i2c_controller, test_read_offset16_block)
 {
 	/* Read 4 bytes from a 16-bit register offset, which will cause us to
 	 * access the extended register space of our i2c device
@@ -285,7 +285,7 @@ ZTEST_F(i2c_controller, read_offset16_block)
 		      expected);
 }
 
-ZTEST_F(i2c_controller, write_offset16_block)
+ZTEST_F(i2c_controller, test_write_offset16_block)
 {
 	/* Write 4 bytes to a 16-bit register offset, which will cause us to
 	 * access the extended register space of our i2c device
@@ -304,7 +304,7 @@ ZTEST_F(i2c_controller, write_offset16_block)
 		      expected);
 }
 
-ZTEST_F(i2c_controller, pec_disabled)
+ZTEST_F(i2c_controller, test_pec_disabled)
 {
 	uint16_t addr_flags;
 	uint8_t write_data[] = {
@@ -346,7 +346,7 @@ ZTEST_F(i2c_controller, pec_disabled)
 		      EC_ERROR_UNIMPLEMENTED);
 }
 
-ZTEST_F(i2c_controller, i2c_xfer_unlocked__error_paths)
+ZTEST_F(i2c_controller, test_i2c_xfer_unlocked__error_paths)
 {
 	uint8_t out_buffer[1];
 	int out_size;
diff --git a/zephyr/test/drivers/keyboard_scan/src/keyboard_backlight.c b/zephyr/test/drivers/keyboard_scan/src/keyboard_backlight.c
index 77131d5d5f..0f07b2fbcd 100644
--- a/zephyr/test/drivers/keyboard_scan/src/keyboard_backlight.c
+++ b/zephyr/test/drivers/keyboard_scan/src/keyboard_backlight.c
@@ -37,7 +37,7 @@ static uint16_t set_backlight_percent_helper(uint8_t percent)
 	return ec_cmd_pwm_set_keyboard_backlight(NULL, &params);
 }
 
-ZTEST(keyboard_backlight, host_command_set_backlight__normal)
+ZTEST(keyboard_backlight, test_host_command_set_backlight__normal)
 {
 	/* Set the backlight intensity level to this and verify */
 	uint8_t expected_percentage = 50;
@@ -46,7 +46,7 @@ ZTEST(keyboard_backlight, host_command_set_backlight__normal)
 	zassert_equal(expected_percentage, kblight_get(), NULL);
 }
 
-ZTEST(keyboard_backlight, host_command_set_backlight__out_of_range)
+ZTEST(keyboard_backlight, test_host_command_set_backlight__out_of_range)
 {
 	/* Too high */
 	uint8_t expected_percentage = 101;
@@ -55,7 +55,7 @@ ZTEST(keyboard_backlight, host_command_set_backlight__out_of_range)
 		      set_backlight_percent_helper(expected_percentage), NULL);
 }
 
-ZTEST(keyboard_backlight, host_command_get_backlight__normal)
+ZTEST(keyboard_backlight, test_host_command_get_backlight__normal)
 {
 	/* Set this backlight intensity and verify via host command */
 	uint8_t expected_percentage = 50;
@@ -74,7 +74,7 @@ ZTEST(keyboard_backlight, host_command_get_backlight__normal)
 	zassert_equal(1, response.enabled, "Got 0x%02x", response.enabled);
 }
 
-ZTEST(keyboard_backlight, console_command__noargs)
+ZTEST(keyboard_backlight, test_console_command__noargs)
 {
 	/* Command should print current status. Set backlight on and to 70% */
 
@@ -94,7 +94,7 @@ ZTEST(keyboard_backlight, console_command__noargs)
 		   "Actual string: `%s`", outbuffer);
 }
 
-ZTEST(keyboard_backlight, console_command__set_on)
+ZTEST(keyboard_backlight, test_console_command__set_on)
 {
 	/* Command should enable backlight to given intensity */
 
@@ -103,7 +103,7 @@ ZTEST(keyboard_backlight, console_command__set_on)
 	zassert_equal(1, kblight_get_current_enable(), NULL);
 }
 
-ZTEST(keyboard_backlight, console_command__set_off)
+ZTEST(keyboard_backlight, test_console_command__set_off)
 {
 	zassert_ok(set_backlight_percent_helper(40), NULL);
 	k_sleep(K_MSEC(50));
@@ -114,7 +114,7 @@ ZTEST(keyboard_backlight, console_command__set_off)
 	zassert_equal(0, kblight_get_current_enable(), NULL);
 }
 
-ZTEST(keyboard_backlight, console_command__bad_params)
+ZTEST(keyboard_backlight, test_console_command__bad_params)
 {
 	zassert_equal(EC_ERROR_PARAM1,
 		      shell_execute_cmd(get_ec_shell(), "kblight NaN"), NULL);
@@ -124,7 +124,7 @@ ZTEST(keyboard_backlight, console_command__bad_params)
 		      shell_execute_cmd(get_ec_shell(), "kblight 101"), NULL);
 }
 
-ZTEST(keyboard_backlight, set_backlight__device_not_ready)
+ZTEST(keyboard_backlight, test_set_backlight__device_not_ready)
 {
 	const struct pwm_dt_spec kblight_pwm_dt =
 		PWM_DT_SPEC_GET(KBLIGHT_PWM_NODE);
diff --git a/zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c b/zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c
index 30b5e4521c..fdae74cac1 100644
--- a/zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c
+++ b/zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c
@@ -102,7 +102,7 @@ ZTEST(keyboard_scan, test_press_enter)
 	k_sleep(K_MSEC(100));
 }
 
-ZTEST(keyboard_scan, console_command_ksstate__noargs)
+ZTEST(keyboard_scan, test_console_command_ksstate__noargs)
 {
 	const char *outbuffer;
 	size_t buffer_size;
@@ -124,7 +124,7 @@ ZTEST(keyboard_scan, console_command_ksstate__noargs)
 	zassert_true(keyboard_scan_is_enabled());
 }
 
-ZTEST(keyboard_scan, console_command_ksstate__force)
+ZTEST(keyboard_scan, test_console_command_ksstate__force)
 {
 	/* This command forces the keyboard to start scanning (if not already)
 	 * and enable state change printing. To test: turn scanning off, run
@@ -140,7 +140,7 @@ ZTEST(keyboard_scan, console_command_ksstate__force)
 	zassert_true(keyboard_scan_get_print_state_changes());
 }
 
-ZTEST(keyboard_scan, console_command_ksstate__on_off)
+ZTEST(keyboard_scan, test_console_command_ksstate__on_off)
 {
 	/* This command turns state change printing on/off */
 
@@ -153,13 +153,13 @@ ZTEST(keyboard_scan, console_command_ksstate__on_off)
 	zassert_false(keyboard_scan_get_print_state_changes());
 }
 
-ZTEST(keyboard_scan, console_command_ksstate__invalid)
+ZTEST(keyboard_scan, test_console_command_ksstate__invalid)
 {
 	/* Pass a string that cannot be parsed as a bool */
 	zassert_ok(!shell_execute_cmd(get_ec_shell(), "ksstate xyz"));
 }
 
-ZTEST(keyboard_scan, console_command_kbpress__noargs)
+ZTEST(keyboard_scan, test_console_command_kbpress__noargs)
 {
 	const char *outbuffer;
 	size_t buffer_size;
@@ -176,7 +176,7 @@ ZTEST(keyboard_scan, console_command_kbpress__noargs)
 		   outbuffer);
 }
 
-ZTEST(keyboard_scan, console_command_kbpress__invalid)
+ZTEST(keyboard_scan, test_console_command_kbpress__invalid)
 {
 	/* Row or column number out of range, or wrong type */
 	zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress -1 0"));
@@ -244,7 +244,7 @@ ZTEST(keyboard_scan, test_console_command_kbpress__down_and_up)
 	zassert_false(key_state_changed_fake.arg2_history[1]);
 }
 
-ZTEST(keyboard_scan, host_command_simulate_key__locked)
+ZTEST(keyboard_scan, test_host_command_simulate_key__locked)
 {
 	uint16_t ret;
 
@@ -256,7 +256,7 @@ ZTEST(keyboard_scan, host_command_simulate_key__locked)
 	zassert_equal(EC_RES_ACCESS_DENIED, ret, "Command returned %u", ret);
 }
 
-ZTEST(keyboard_scan, host_command_simulate_key__bad_params)
+ZTEST(keyboard_scan, test_host_command_simulate_key__bad_params)
 {
 	uint16_t ret;
 
@@ -295,7 +295,7 @@ static uint16_t send_keypress_host_command(uint8_t col, uint8_t row,
 	return host_command_process(&args);
 }
 
-ZTEST(keyboard_scan, host_command_simulate__key_press)
+ZTEST(keyboard_scan, test_host_command_simulate__key_press)
 {
 	uint16_t ret;
 
@@ -327,7 +327,7 @@ ZTEST(keyboard_scan, host_command_simulate__key_press)
 FAKE_VOID_FUNC(system_enter_hibernate, uint32_t, uint32_t);
 FAKE_VOID_FUNC(chipset_reset, int);
 
-ZTEST(keyboard_scan, special_key_combos)
+ZTEST(keyboard_scan, test_special_key_combos)
 {
 	system_is_locked_fake.return_val = 0;
 	zassert_false(system_is_locked(), "Expecting unlocked system.");
diff --git a/zephyr/test/drivers/keyboard_scan/src/mkbp_info.c b/zephyr/test/drivers/keyboard_scan/src/mkbp_info.c
index 2e3e3ecf94..0588324c91 100644
--- a/zephyr/test/drivers/keyboard_scan/src/mkbp_info.c
+++ b/zephyr/test/drivers/keyboard_scan/src/mkbp_info.c
@@ -15,7 +15,7 @@
 
 #include <emul/emul_kb_raw.h>
 
-ZTEST(mkbp_info, host_command_mkbp_info__keyboard_info)
+ZTEST(mkbp_info, test_host_command_mkbp_info__keyboard_info)
 {
 	/* Get the number of keyboard rows and columns */
 
@@ -31,7 +31,7 @@ ZTEST(mkbp_info, host_command_mkbp_info__keyboard_info)
 	zassert_equal(KEYBOARD_COLS_MAX, response.cols, NULL);
 }
 
-ZTEST(mkbp_info, host_command_mkbp_info__supported_buttons)
+ZTEST(mkbp_info, test_host_command_mkbp_info__supported_buttons)
 {
 	/* Get the set of supported buttons */
 
@@ -47,7 +47,7 @@ ZTEST(mkbp_info, host_command_mkbp_info__supported_buttons)
 	zassert_equal(get_supported_buttons(), response.buttons, NULL);
 }
 
-ZTEST(mkbp_info, host_command_mkbp_info__supported_switches)
+ZTEST(mkbp_info, test_host_command_mkbp_info__supported_switches)
 {
 	/* Get the set of supported switches */
 
@@ -63,7 +63,7 @@ ZTEST(mkbp_info, host_command_mkbp_info__supported_switches)
 	zassert_equal(get_supported_switches(), response.switches, NULL);
 }
 
-ZTEST(mkbp_info, host_command_mkbp_info__supported_invalid)
+ZTEST(mkbp_info, test_host_command_mkbp_info__supported_invalid)
 {
 	/* Request support info on a non-existent type of input device. */
 
@@ -79,7 +79,7 @@ ZTEST(mkbp_info, host_command_mkbp_info__supported_invalid)
 		      "Host command didn't fail properly: %d", ret);
 }
 
-ZTEST(mkbp_info, host_command_mkbp_info__current_keyboard_matrix)
+ZTEST(mkbp_info, test_host_command_mkbp_info__current_keyboard_matrix)
 {
 	/* Hold down a key so we can validate the returned keyboard matrix state
 	 */
@@ -107,7 +107,7 @@ ZTEST(mkbp_info, host_command_mkbp_info__current_keyboard_matrix)
 		     "Expected key is not pressed");
 }
 
-ZTEST(mkbp_info, host_command_mkbp_info__current_host_events)
+ZTEST(mkbp_info, test_host_command_mkbp_info__current_host_events)
 {
 	int ret;
 	union ec_response_get_next_data response;
@@ -121,7 +121,7 @@ ZTEST(mkbp_info, host_command_mkbp_info__current_host_events)
 	zassert_equal((uint32_t)host_get_events(), response.host_event, NULL);
 }
 
-ZTEST(mkbp_info, host_command_mkbp_info__current_host_events64)
+ZTEST(mkbp_info, test_host_command_mkbp_info__current_host_events64)
 {
 	int ret;
 	union ec_response_get_next_data response;
@@ -135,7 +135,7 @@ ZTEST(mkbp_info, host_command_mkbp_info__current_host_events64)
 	zassert_equal(host_get_events(), response.host_event64, NULL);
 }
 
-ZTEST(mkbp_info, host_command_mkbp_info__current_buttons)
+ZTEST(mkbp_info, test_host_command_mkbp_info__current_buttons)
 {
 	int ret;
 	union ec_response_get_next_data response;
@@ -149,7 +149,7 @@ ZTEST(mkbp_info, host_command_mkbp_info__current_buttons)
 	zassert_equal(mkbp_get_button_state(), response.buttons, NULL);
 }
 
-ZTEST(mkbp_info, host_command_mkbp_info__current_switches)
+ZTEST(mkbp_info, test_host_command_mkbp_info__current_switches)
 {
 	int ret;
 	union ec_response_get_next_data response;
@@ -163,7 +163,7 @@ ZTEST(mkbp_info, host_command_mkbp_info__current_switches)
 	zassert_equal(mkbp_get_switch_state(), response.switches, NULL);
 }
 
-ZTEST(mkbp_info, host_command_mkbp_info__current_invalid)
+ZTEST(mkbp_info, test_host_command_mkbp_info__current_invalid)
 {
 	int ret;
 	union ec_response_get_next_data response;
@@ -177,7 +177,7 @@ ZTEST(mkbp_info, host_command_mkbp_info__current_invalid)
 		      ret);
 }
 
-ZTEST(mkbp_info, host_command_mkbp_info__invalid)
+ZTEST(mkbp_info, test_host_command_mkbp_info__invalid)
 {
 	int ret;
 	union ec_response_get_next_data response;
diff --git a/zephyr/test/drivers/led_driver/src/led_common.c b/zephyr/test/drivers/led_driver/src/led_common.c
index 7bab7498db..d865aba8e0 100644
--- a/zephyr/test/drivers/led_driver/src/led_common.c
+++ b/zephyr/test/drivers/led_driver/src/led_common.c
@@ -9,7 +9,7 @@
 #include <zephyr/fff.h>
 #include <zephyr/ztest.h>
 
-ZTEST(led_common, host_command__query)
+ZTEST(led_common, test_host_command__query)
 {
 	/* Gets the brightness range for an LED */
 
@@ -34,7 +34,7 @@ ZTEST(led_common, host_command__query)
 			  sizeof(expected_brightness_ranges), NULL);
 }
 
-ZTEST(led_common, host_command__invalid_led)
+ZTEST(led_common, test_host_command__invalid_led)
 {
 	/* Try accessing info on a non-existent LED */
 
@@ -51,7 +51,7 @@ ZTEST(led_common, host_command__invalid_led)
 		      ret);
 }
 
-ZTEST(led_common, host_command__supported_channel)
+ZTEST(led_common, test_host_command__supported_channel)
 {
 	/* Try setting brightness on a color channel that is not supported */
 
@@ -72,7 +72,7 @@ ZTEST(led_common, host_command__supported_channel)
 		      ret);
 }
 
-ZTEST(led_common, host_command__manual_control)
+ZTEST(led_common, test_host_command__manual_control)
 {
 	/* Set brightness for an LED directly */
 
@@ -100,7 +100,7 @@ ZTEST(led_common, host_command__manual_control)
 
 FAKE_VOID_FUNC(board_led_auto_control);
 
-ZTEST(led_common, host_command__auto_control)
+ZTEST(led_common, test_host_command__auto_control)
 {
 	/* Configure an LED for automatic control */
 
diff --git a/zephyr/test/drivers/ps8xxx/src/multi_port.c b/zephyr/test/drivers/ps8xxx/src/multi_port.c
index f3b5d7d066..76bcbb4c38 100644
--- a/zephyr/test/drivers/ps8xxx/src/multi_port.c
+++ b/zephyr/test/drivers/ps8xxx/src/multi_port.c
@@ -41,7 +41,7 @@ ZTEST(multi_port, test_multiple_ports)
 		     "port 0 and port 1 contains duplicate information.\n");
 }
 
-ZTEST(multi_port, fw_version_cache)
+ZTEST(multi_port, test_fw_version_cache)
 {
 	zassert_ok(tcpci_emul_set_reg(ps8xxx_emul_0, PS8XXX_REG_FW_REV, 0x12),
 		   "Unable to set firmware rev for emulator 0.\n");
diff --git a/zephyr/test/drivers/rt9490/src/charger.c b/zephyr/test/drivers/rt9490/src/charger.c
index 2d892f9432..4c08065e09 100644
--- a/zephyr/test/drivers/rt9490/src/charger.c
+++ b/zephyr/test/drivers/rt9490/src/charger.c
@@ -14,7 +14,7 @@
 static const struct emul *emul = EMUL_DT_GET(DT_NODELABEL(rt9490));
 static const int chgnum = CHARGER_SOLO;
 
-ZTEST(rt9490_chg, current)
+ZTEST(rt9490_chg, test_current)
 {
 	struct {
 		int reg;
@@ -51,7 +51,7 @@ ZTEST(rt9490_chg, current)
 	zassert_not_equal(rt9490_drv.set_current(chgnum, 5001), 0, NULL);
 }
 
-ZTEST(rt9490_chg, voltage)
+ZTEST(rt9490_chg, test_voltage)
 {
 	struct {
 		int reg;
@@ -89,7 +89,7 @@ ZTEST(rt9490_chg, voltage)
 	zassert_not_equal(rt9490_drv.set_voltage(chgnum, 18801), 0, NULL);
 }
 
-ZTEST(rt9490_chg, otg)
+ZTEST(rt9490_chg, test_otg)
 {
 	struct {
 		int reg_v, reg_c, expected_v, expected_c;
@@ -134,7 +134,7 @@ ZTEST(rt9490_chg, otg)
 	zassert_equal(rt9490_drv.is_sourcing_otg_power(chgnum, 0), false, NULL);
 }
 
-ZTEST(rt9490_chg, aicr)
+ZTEST(rt9490_chg, test_aicr)
 {
 	struct {
 		int reg;
@@ -206,7 +206,7 @@ ZTEST(rt9490_chg, test_option)
 	zassert_true(opt == 0, NULL);
 }
 
-ZTEST(rt9490_chg, misc_info)
+ZTEST(rt9490_chg, test_misc_info)
 {
 	int status;
 	int device_id;
diff --git a/zephyr/test/drivers/timer/src/timer.c b/zephyr/test/drivers/timer/src/timer.c
index 5cbdae1ea8..abc5d0a88f 100644
--- a/zephyr/test/drivers/timer/src/timer.c
+++ b/zephyr/test/drivers/timer/src/timer.c
@@ -25,7 +25,7 @@ FAKE_VALUE_FUNC(int, __hw_clock_source_init64, uint64_t);
 
 FAKE_VALUE_FUNC(uint8_t *, system_get_jump_tag, uint16_t, int *, int *);
 
-ZTEST(timer, init_from_jump_tag)
+ZTEST(timer, test_init_from_jump_tag)
 {
 	/* When initializing after a system jump, the timer should get set to
 	 * the time before the jump (stored in a jump tag)
@@ -42,7 +42,7 @@ ZTEST(timer, init_from_jump_tag)
 		      __hw_clock_source_init64_fake.arg0_history[0], NULL);
 }
 
-ZTEST(timer, init_from_zero)
+ZTEST(timer, test_init_from_zero)
 {
 	/* When there is no jump tag, the timer should initialize to zero. */
 
@@ -56,7 +56,7 @@ ZTEST(timer, init_from_zero)
 	zassert_equal(0, __hw_clock_source_init64_fake.arg0_history[0], NULL);
 }
 
-ZTEST(timer, console_cmd_gettime)
+ZTEST(timer, test_console_cmd_gettime)
 {
 	/* Should print the current time */
 	timestamp_t fake_time;
@@ -76,7 +76,7 @@ ZTEST(timer, console_cmd_gettime)
 		   "Actual: '%s'", outbuffer);
 }
 
-ZTEST(timer, console_cmd_timerinfo)
+ZTEST(timer, test_console_cmd_timerinfo)
 {
 	/* Prints current time and info on running timers. */
 	timestamp_t fake_time;
diff --git a/zephyr/test/drivers/usb_pd_discovery/src/usb_pd_discovery.c b/zephyr/test/drivers/usb_pd_discovery/src/usb_pd_discovery.c
index 8696fb68f3..fb466d66ab 100644
--- a/zephyr/test/drivers/usb_pd_discovery/src/usb_pd_discovery.c
+++ b/zephyr/test/drivers/usb_pd_discovery/src/usb_pd_discovery.c
@@ -69,7 +69,7 @@ ZTEST_SUITE(usb_pd_discovery, drivers_predicate_post_main,
 	    usb_pd_discovery_after, NULL);
 
 /* First up: Plain and correct DP response */
-ZTEST_F(usb_pd_discovery, verify_discovery)
+ZTEST_F(usb_pd_discovery, test_verify_discovery)
 {
 	struct tcpci_partner_data *partner = &fixture->partner;
 	uint8_t response_buffer[EC_LPC_HOST_PACKET_SIZE];
@@ -132,7 +132,7 @@ ZTEST_F(usb_pd_discovery, verify_discovery)
 }
 
 /* Now: Duplicate the DP SID */
-ZTEST_F(usb_pd_discovery, verify_svid_duplicate)
+ZTEST_F(usb_pd_discovery, test_verify_svid_duplicate)
 {
 	struct tcpci_partner_data *partner = &fixture->partner;
 	uint8_t response_buffer[EC_LPC_HOST_PACKET_SIZE];
@@ -188,7 +188,7 @@ ZTEST_F(usb_pd_discovery, verify_svid_duplicate)
 }
 
 /* Forget to 0 terminate the SVIDs */
-ZTEST_F(usb_pd_discovery, verify_bad_termination)
+ZTEST_F(usb_pd_discovery, test_verify_bad_termination)
 {
 	struct tcpci_partner_data *partner = &fixture->partner;
 	uint8_t response_buffer[EC_LPC_HOST_PACKET_SIZE];
@@ -244,7 +244,7 @@ ZTEST_F(usb_pd_discovery, verify_bad_termination)
 }
 
 /* Reply with a NAK to DiscoverModes */
-ZTEST_F(usb_pd_discovery, verify_modes_nak)
+ZTEST_F(usb_pd_discovery, test_verify_modes_nak)
 {
 	struct tcpci_partner_data *partner = &fixture->partner;
 	uint8_t response_buffer[EC_LPC_HOST_PACKET_SIZE];
@@ -294,7 +294,7 @@ ZTEST_F(usb_pd_discovery, verify_modes_nak)
 }
 
 /* Reply with the wrong SVID to DiscoverModes */
-ZTEST_F(usb_pd_discovery, verify_bad_mode)
+ZTEST_F(usb_pd_discovery, test_verify_bad_mode)
 {
 	struct tcpci_partner_data *partner = &fixture->partner;
 	uint8_t response_buffer[EC_LPC_HOST_PACKET_SIZE];
@@ -347,7 +347,7 @@ ZTEST_F(usb_pd_discovery, verify_bad_mode)
 }
 
 /* Reply without required mode VDO */
-ZTEST_F(usb_pd_discovery, verify_modes_missing)
+ZTEST_F(usb_pd_discovery, test_verify_modes_missing)
 {
 	struct tcpci_partner_data *partner = &fixture->partner;
 	uint8_t response_buffer[EC_LPC_HOST_PACKET_SIZE];
diff --git a/zephyr/test/drivers/usb_port_power_dumb/src/usb_port_power_dumb.c b/zephyr/test/drivers/usb_port_power_dumb/src/usb_port_power_dumb.c
index e651bb57d8..67bf48453e 100644
--- a/zephyr/test/drivers/usb_port_power_dumb/src/usb_port_power_dumb.c
+++ b/zephyr/test/drivers/usb_port_power_dumb/src/usb_port_power_dumb.c
@@ -37,7 +37,7 @@ static int check_gpio_status_for_port(int port_id)
 	return gpio_get_level(usb_port_enable[port_id]);
 }
 
-ZTEST(usb_port_power_dumb, console_command__noargs)
+ZTEST(usb_port_power_dumb, test_console_command__noargs)
 {
 	const char *outbuffer;
 	size_t buffer_size;
@@ -54,7 +54,7 @@ ZTEST(usb_port_power_dumb, console_command__noargs)
 	zassert_false(check_gpio_status_for_port(PORT_ID), NULL);
 }
 
-ZTEST(usb_port_power_dumb, console_command__modify_port_status)
+ZTEST(usb_port_power_dumb, test_console_command__modify_port_status)
 {
 	const char *outbuffer;
 	size_t buffer_size;
@@ -73,7 +73,7 @@ ZTEST(usb_port_power_dumb, console_command__modify_port_status)
 	zassert_true(check_gpio_status_for_port(PORT_ID), NULL);
 }
 
-ZTEST(usb_port_power_dumb, console_command__invalid)
+ZTEST(usb_port_power_dumb, test_console_command__invalid)
 {
 	/* Various bad input */
 	zassert_ok(!shell_execute_cmd(get_ec_shell(), "usbchargemode NaN"),
@@ -88,7 +88,7 @@ ZTEST(usb_port_power_dumb, console_command__invalid)
 		NULL);
 }
 
-ZTEST(usb_port_power_dumb, host_command__enable)
+ZTEST(usb_port_power_dumb, test_host_command__enable)
 {
 	int ret;
 	struct ec_params_usb_charge_set_mode params = {
@@ -102,7 +102,7 @@ ZTEST(usb_port_power_dumb, host_command__enable)
 	zassert_true(check_gpio_status_for_port(PORT_ID), NULL);
 }
 
-ZTEST(usb_port_power_dumb, host_command__invalid_port_id)
+ZTEST(usb_port_power_dumb, test_host_command__invalid_port_id)
 {
 	int ret;
 	struct ec_params_usb_charge_set_mode params = {
@@ -117,7 +117,7 @@ ZTEST(usb_port_power_dumb, host_command__invalid_port_id)
 	zassert_false(check_gpio_status_for_port(PORT_ID), NULL);
 }
 
-ZTEST(usb_port_power_dumb, host_command__invalid_mode)
+ZTEST(usb_port_power_dumb, test_host_command__invalid_mode)
 {
 	int ret;
 	struct ec_params_usb_charge_set_mode params = {
diff --git a/zephyr/test/drivers/usb_retimer_fw_update/src/usb_retimer_fw_update.c b/zephyr/test/drivers/usb_retimer_fw_update/src/usb_retimer_fw_update.c
index 21a471f22a..e5f6c23ed6 100644
--- a/zephyr/test/drivers/usb_retimer_fw_update/src/usb_retimer_fw_update.c
+++ b/zephyr/test/drivers/usb_retimer_fw_update/src/usb_retimer_fw_update.c
@@ -77,7 +77,7 @@ static void usb_retimer_fw_update_after(void *data)
 ZTEST_SUITE(usb_retimer_fw_update, drivers_predicate_post_main, NULL,
 	    usb_retimer_fw_update_before, usb_retimer_fw_update_after, NULL);
 
-ZTEST(usb_retimer_fw_update, verify_query_port)
+ZTEST(usb_retimer_fw_update, test_verify_query_port)
 {
 	/* Write our command to query ports */
 	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
@@ -88,7 +88,7 @@ ZTEST(usb_retimer_fw_update, verify_query_port)
 		     "Failed to see port in query");
 }
 
-ZTEST(usb_retimer_fw_update, verify_suspend_port)
+ZTEST(usb_retimer_fw_update, test_verify_suspend_port)
 {
 	/* Write our command to suspend the port */
 	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
@@ -104,7 +104,7 @@ ZTEST(usb_retimer_fw_update, verify_suspend_port)
 		     "Failed to see successful suspend");
 }
 
-ZTEST(usb_retimer_fw_update, verify_resume_port)
+ZTEST(usb_retimer_fw_update, test_verify_resume_port)
 {
 	usb_retimer_fw_update_suspend_port();
 
@@ -122,7 +122,7 @@ ZTEST(usb_retimer_fw_update, verify_resume_port)
 		     "Failed to see successful resume");
 }
 
-ZTEST(usb_retimer_fw_update, verify_get_mux)
+ZTEST(usb_retimer_fw_update, test_verify_get_mux)
 {
 	struct ec_response_typec_status typec_status;
 
@@ -141,7 +141,7 @@ ZTEST(usb_retimer_fw_update, verify_get_mux)
 }
 
 /* Commands which first require suspend to be run */
-ZTEST(usb_retimer_fw_update, verify_set_mux_usb)
+ZTEST(usb_retimer_fw_update, test_verify_set_mux_usb)
 {
 	struct ec_response_typec_status typec_status;
 
@@ -165,7 +165,7 @@ ZTEST(usb_retimer_fw_update, verify_set_mux_usb)
 		      USB_PD_MUX_USB_ENABLED, "Status mux disagreement");
 }
 
-ZTEST(usb_retimer_fw_update, verify_set_mux_safe)
+ZTEST(usb_retimer_fw_update, test_verify_set_mux_safe)
 {
 	struct ec_response_typec_status typec_status;
 
@@ -189,7 +189,7 @@ ZTEST(usb_retimer_fw_update, verify_set_mux_safe)
 		      USB_PD_MUX_SAFE_MODE, "Status mux disagreement");
 }
 
-ZTEST(usb_retimer_fw_update, verify_set_mux_tbt)
+ZTEST(usb_retimer_fw_update, test_verify_set_mux_tbt)
 {
 	struct ec_response_typec_status typec_status;
 
@@ -213,7 +213,7 @@ ZTEST(usb_retimer_fw_update, verify_set_mux_tbt)
 		      USB_PD_MUX_TBT_COMPAT_ENABLED, "Status mux disagreement");
 }
 
-ZTEST(usb_retimer_fw_update, verify_update_disconnect)
+ZTEST(usb_retimer_fw_update, test_verify_update_disconnect)
 {
 	uint64_t command_start;
 
@@ -252,7 +252,7 @@ ZTEST(usb_retimer_fw_update, verify_update_disconnect)
 }
 
 /* Verify we get an error if port isn't suspended */
-ZTEST(usb_retimer_fw_update, verify_mux_usb_error)
+ZTEST(usb_retimer_fw_update, test_verify_mux_usb_error)
 {
 	/* Set the mux to USB  on unsuspended port */
 	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
diff --git a/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c b/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c
index 9f57db83fa..17959e185a 100644
--- a/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c
+++ b/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c
@@ -208,7 +208,7 @@ static void usbc_alt_mode_after(void *data)
 				     fixture->charger_emul);
 }
 
-ZTEST_F(usbc_alt_mode, verify_discovery)
+ZTEST_F(usbc_alt_mode, test_verify_discovery)
 {
 	uint8_t response_buffer[EC_LPC_HOST_PACKET_SIZE];
 	struct ec_response_typec_discovery *discovery =
@@ -239,7 +239,7 @@ ZTEST_F(usbc_alt_mode, verify_discovery)
 		      "DP mode VDOs did not match");
 }
 
-ZTEST_F(usbc_alt_mode, verify_discovery_params_too_small)
+ZTEST_F(usbc_alt_mode, test_verify_discovery_params_too_small)
 {
 	struct ec_response_typec_discovery discovery;
 
@@ -252,7 +252,7 @@ ZTEST_F(usbc_alt_mode, verify_discovery_params_too_small)
 	zassert_equal(discovery.svid_count, 0);
 }
 
-ZTEST_F(usbc_alt_mode, verify_displayport_mode_entry)
+ZTEST_F(usbc_alt_mode, test_verify_displayport_mode_entry)
 {
 	const struct gpio_dt_spec *gpio =
 		GPIO_DT_FROM_NODELABEL(gpio_usb_c0_hpd);
@@ -303,7 +303,7 @@ ZTEST_F(usbc_alt_mode, verify_displayport_mode_entry)
 	zassert_equal(gpio_emul_output_get(gpio->port, gpio->pin), 1);
 }
 
-ZTEST_F(usbc_alt_mode, verify_bad_hpd_irq_reject)
+ZTEST_F(usbc_alt_mode, test_verify_bad_hpd_irq_reject)
 {
 	const struct gpio_dt_spec *gpio =
 		GPIO_DT_FROM_NODELABEL(gpio_usb_c0_hpd);
@@ -344,7 +344,7 @@ ZTEST_F(usbc_alt_mode, verify_bad_hpd_irq_reject)
 	zassert_equal(gpio_emul_output_get(gpio->port, gpio->pin), 0);
 }
 
-ZTEST_F(usbc_alt_mode, verify_hpd_clear)
+ZTEST_F(usbc_alt_mode, test_verify_hpd_clear)
 {
 	const struct gpio_dt_spec *gpio =
 		GPIO_DT_FROM_NODELABEL(gpio_usb_c0_hpd);
@@ -402,7 +402,7 @@ ZTEST_F(usbc_alt_mode, verify_hpd_clear)
 	zassert_equal(gpio_emul_output_get(gpio->port, gpio->pin), 0);
 }
 
-ZTEST_F(usbc_alt_mode, verify_hpd_irq_set)
+ZTEST_F(usbc_alt_mode, test_verify_hpd_irq_set)
 {
 	const struct gpio_dt_spec *gpio =
 		GPIO_DT_FROM_NODELABEL(gpio_usb_c0_hpd);
@@ -463,7 +463,7 @@ ZTEST_F(usbc_alt_mode, verify_hpd_irq_set)
 	zassert_equal(gpio_emul_output_get(gpio->port, gpio->pin), 1);
 }
 
-ZTEST_F(usbc_alt_mode, verify_discovery_via_pd_host_cmd)
+ZTEST_F(usbc_alt_mode, test_verify_discovery_via_pd_host_cmd)
 {
 	struct ec_params_usb_pd_info_request params = { .port = TEST_PORT };
 	struct ec_params_usb_pd_discovery_entry response;
@@ -528,7 +528,7 @@ static void usbc_alt_mode_dp_unsupported_after(void *data)
  * When the partner advertises DP mode support but refuses to enter, discovery
  * should still work as if the partner were compliant.
  */
-ZTEST_F(usbc_alt_mode_dp_unsupported, verify_discovery)
+ZTEST_F(usbc_alt_mode_dp_unsupported, test_verify_discovery)
 {
 	if (IS_ENABLED(CONFIG_PLATFORM_EC_USB_PD_REQUIRE_AP_MODE_ENTRY)) {
 		host_cmd_typec_control_enter_mode(TEST_PORT, TYPEC_MODE_DP);
@@ -568,7 +568,7 @@ ZTEST_F(usbc_alt_mode_dp_unsupported, verify_discovery)
  * When the partner advertises DP support but refuses to enter DP mode, the TCPM
  * should try once and then give up.
  */
-ZTEST_F(usbc_alt_mode_dp_unsupported, verify_displayport_mode_nonentry)
+ZTEST_F(usbc_alt_mode_dp_unsupported, test_verify_displayport_mode_nonentry)
 {
 	if (IS_ENABLED(CONFIG_PLATFORM_EC_USB_PD_REQUIRE_AP_MODE_ENTRY)) {
 		host_cmd_typec_control_enter_mode(TEST_PORT, TYPEC_MODE_DP);
diff --git a/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode__require_ap_mode_entry.c b/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode__require_ap_mode_entry.c
index 10bc4a7012..6d1286b2e5 100644
--- a/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode__require_ap_mode_entry.c
+++ b/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode__require_ap_mode_entry.c
@@ -14,7 +14,7 @@
 
 /* Tests that require CONFIG_PLATFORM_EC_USB_PD_REQUIRE_AP_MODE_ENTRY enabled */
 
-ZTEST_F(usbc_alt_mode, verify_displayport_mode_reentry)
+ZTEST_F(usbc_alt_mode, test_verify_displayport_mode_reentry)
 {
 	if (!IS_ENABLED(CONFIG_PLATFORM_EC_USB_PD_REQUIRE_AP_MODE_ENTRY)) {
 		ztest_test_skip();
@@ -46,7 +46,7 @@ ZTEST_F(usbc_alt_mode, verify_displayport_mode_reentry)
 		      USB_PD_MUX_DP_ENABLED, "Failed to see DP mux set");
 }
 
-ZTEST_F(usbc_alt_mode, verify_mode_exit_via_pd_host_cmd)
+ZTEST_F(usbc_alt_mode, test_verify_mode_exit_via_pd_host_cmd)
 {
 	const struct gpio_dt_spec *gpio =
 		GPIO_DT_FROM_NODELABEL(gpio_usb_c0_hpd);
@@ -95,7 +95,7 @@ ZTEST_F(usbc_alt_mode, verify_mode_exit_via_pd_host_cmd)
 	zassert_equal((status.mux_state & USB_PD_MUX_DP_ENABLED), 0);
 }
 
-ZTEST_F(usbc_alt_mode, verify_early_status_hpd_set)
+ZTEST_F(usbc_alt_mode, test_verify_early_status_hpd_set)
 {
 	const struct gpio_dt_spec *gpio =
 		GPIO_DT_FROM_NODELABEL(gpio_usb_c0_hpd);
diff --git a/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode_ec_mode_entry.c b/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode_ec_mode_entry.c
index e36ba57e26..8344b37ee9 100644
--- a/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode_ec_mode_entry.c
+++ b/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode_ec_mode_entry.c
@@ -17,7 +17,7 @@
 /* Tests that require CONFIG_PLATFORM_EC_USB_PD_REQUIRE_AP_MODE_ENTRY disabled
  */
 
-ZTEST_F(usbc_alt_mode, verify_displayport_mode_power_cycle)
+ZTEST_F(usbc_alt_mode, test_verify_displayport_mode_power_cycle)
 {
 	struct ec_response_typec_status status;
 
diff --git a/zephyr/test/drivers/usbc_console_pd/src/usbc_console_pd.c b/zephyr/test/drivers/usbc_console_pd/src/usbc_console_pd.c
index 37908ce1e4..3e876052f9 100644
--- a/zephyr/test/drivers/usbc_console_pd/src/usbc_console_pd.c
+++ b/zephyr/test/drivers/usbc_console_pd/src/usbc_console_pd.c
@@ -124,7 +124,7 @@ static void usbc_console_pd_after(void *data)
 	common_after(&outer->common);
 }
 
-ZTEST_USER_F(usbc_console_pd, pd_command)
+ZTEST_USER_F(usbc_console_pd, test_pd_command)
 {
 	struct common_fixture *common = &fixture->common;
 	struct tcpci_src_emul_data *src_ext = &common->src_ext;
diff --git a/zephyr/test/drivers/usbc_ctvpd/src/main.c b/zephyr/test/drivers/usbc_ctvpd/src/main.c
index 0bd6639d83..909a52daa9 100644
--- a/zephyr/test/drivers/usbc_ctvpd/src/main.c
+++ b/zephyr/test/drivers/usbc_ctvpd/src/main.c
@@ -125,7 +125,7 @@ static void usbc_ctvpd_after(void *data)
 ZTEST_SUITE(usbc_ctvpd, drivers_predicate_post_main, usbc_ctvpd_setup,
 	    usbc_ctvpd_before, usbc_ctvpd_after, NULL);
 
-ZTEST_USER_F(usbc_ctvpd, verify_discovery)
+ZTEST_USER_F(usbc_ctvpd, test_verify_discovery)
 {
 	uint8_t response_buffer[EC_LPC_HOST_PACKET_SIZE];
 	struct ec_response_typec_discovery *discovery =
@@ -148,7 +148,7 @@ ZTEST_USER_F(usbc_ctvpd, verify_discovery)
 			  "Discovered SOP identity ACK did not match");
 }
 
-ZTEST_USER_F(usbc_ctvpd, verify_no_vconn_swap)
+ZTEST_USER_F(usbc_ctvpd, test_verify_no_vconn_swap)
 {
 	struct ec_response_typec_status status =
 		host_cmd_typec_status(TEST_PORT);
diff --git a/zephyr/test/drivers/usbc_tbt_mode/src/usbc_tbt_mode.c b/zephyr/test/drivers/usbc_tbt_mode/src/usbc_tbt_mode.c
index 2fc895bb27..38476eb36c 100644
--- a/zephyr/test/drivers/usbc_tbt_mode/src/usbc_tbt_mode.c
+++ b/zephyr/test/drivers/usbc_tbt_mode/src/usbc_tbt_mode.c
@@ -211,7 +211,7 @@ static void usbc_tbt_mode_after(void *data)
 	tcpci_partner_common_clear_logged_msgs(&fix->partner);
 }
 
-ZTEST_F(usbc_tbt_mode, verify_discovery)
+ZTEST_F(usbc_tbt_mode, test_verify_discovery)
 {
 	uint8_t response_buffer[EC_LPC_HOST_PACKET_SIZE];
 	struct ec_response_typec_discovery *discovery =
@@ -247,7 +247,7 @@ ZTEST_F(usbc_tbt_mode, verify_discovery)
 }
 
 /* Without an e-marked cable, TBT mode cannot be entered */
-ZTEST_F(usbc_tbt_mode, verify_tbt_entry_fail)
+ZTEST_F(usbc_tbt_mode, test_verify_tbt_entry_fail)
 {
 	struct ec_response_typec_status status;
 
@@ -285,7 +285,7 @@ ZTEST_F(usbc_tbt_mode, verify_tbt_entry_fail)
 }
 
 /* With passive e-marked cable, TBT mode can be entered on SOP only */
-ZTEST_F(usbc_tbt_mode, verify_tbt_passive_entry_exit)
+ZTEST_F(usbc_tbt_mode, test_verify_tbt_passive_entry_exit)
 {
 	struct ec_response_typec_status status;
 
diff --git a/zephyr/test/drivers/usbc_usb4_mode/src/usbc_usb4_mode.c b/zephyr/test/drivers/usbc_usb4_mode/src/usbc_usb4_mode.c
index b8bb6809a4..4c21aaeac4 100644
--- a/zephyr/test/drivers/usbc_usb4_mode/src/usbc_usb4_mode.c
+++ b/zephyr/test/drivers/usbc_usb4_mode/src/usbc_usb4_mode.c
@@ -163,7 +163,7 @@ static void usbc_usb4_mode_after(void *data)
 	tcpci_partner_common_clear_logged_msgs(&fix->partner);
 }
 
-ZTEST_F(usbc_usb4_mode, verify_discovery)
+ZTEST_F(usbc_usb4_mode, test_verify_discovery)
 {
 	uint8_t response_buffer[EC_LPC_HOST_PACKET_SIZE];
 	struct ec_response_typec_discovery *discovery =
@@ -188,7 +188,7 @@ ZTEST_F(usbc_usb4_mode, verify_discovery)
 }
 
 /* Without an e-marked cable, USB4 mode cannot be entered */
-ZTEST_F(usbc_usb4_mode, verify_usb4_entry_fail)
+ZTEST_F(usbc_usb4_mode, test_verify_usb4_entry_fail)
 {
 	struct ec_response_typec_status status;
 
@@ -217,7 +217,7 @@ ZTEST_F(usbc_usb4_mode, verify_usb4_entry_fail)
 }
 
 /* With passive e-marked cable, USB4 mode can be entered on SOP only */
-ZTEST_F(usbc_usb4_mode, verify_usb4_passive_entry_exit)
+ZTEST_F(usbc_usb4_mode, test_verify_usb4_passive_entry_exit)
 {
 	struct ec_response_typec_status status;
 
diff --git a/zephyr/test/drivers/usbc_vconn_swap/src/usbc_vconn_swap.c b/zephyr/test/drivers/usbc_vconn_swap/src/usbc_vconn_swap.c
index bc1eb6cd0d..a0e373c9d8 100644
--- a/zephyr/test/drivers/usbc_vconn_swap/src/usbc_vconn_swap.c
+++ b/zephyr/test/drivers/usbc_vconn_swap/src/usbc_vconn_swap.c
@@ -153,7 +153,7 @@ static void usbc_vconn_swap_not_supported_after(void *data)
 	common_after(&outer->common);
 }
 
-ZTEST_F(usbc_vconn_swap, vconn_swap_before_discovery)
+ZTEST_F(usbc_vconn_swap, test_vconn_swap_before_discovery)
 {
 	struct ec_response_typec_status status =
 		host_cmd_typec_status(TEST_PORT);
@@ -162,7 +162,7 @@ ZTEST_F(usbc_vconn_swap, vconn_swap_before_discovery)
 		      "TCPM did not initiate VCONN Swap after attach");
 }
 
-ZTEST_F(usbc_vconn_swap, vconn_swap_via_host_command)
+ZTEST_F(usbc_vconn_swap, test_vconn_swap_via_host_command)
 {
 	struct ec_response_typec_status status =
 		host_cmd_typec_status(TEST_PORT);
@@ -181,7 +181,7 @@ ZTEST_F(usbc_vconn_swap, vconn_swap_via_host_command)
 ZTEST_SUITE(usbc_vconn_swap, drivers_predicate_post_main, usbc_vconn_swap_setup,
 	    usbc_vconn_swap_before, usbc_vconn_swap_after, NULL);
 
-ZTEST_F(usbc_vconn_swap_not_supported, vconn_swap_force_vconn)
+ZTEST_F(usbc_vconn_swap_not_supported, test_vconn_swap_force_vconn)
 {
 	struct ec_response_typec_status status =
 		host_cmd_typec_status(TEST_PORT);
diff --git a/zephyr/test/math/src/fixed_point_int_sqrtf.c b/zephyr/test/math/src/fixed_point_int_sqrtf.c
index 4403980a96..f949084f28 100644
--- a/zephyr/test/math/src/fixed_point_int_sqrtf.c
+++ b/zephyr/test/math/src/fixed_point_int_sqrtf.c
@@ -8,12 +8,12 @@
 
 #include <zephyr/ztest.h>
 
-ZTEST_USER(math, int_sqrtf_negative)
+ZTEST_USER(math, test_int_sqrtf_negative)
 {
 	zassert_equal(int_sqrtf(-100), 0);
 }
 
-ZTEST_USER(math, int_sqrtf_overflow)
+ZTEST_USER(math, test_int_sqrtf_overflow)
 {
 	zassert_equal(int_sqrtf(INT64_MAX), INT32_MAX);
 }
diff --git a/zephyr/test/math/src/mask.c b/zephyr/test/math/src/mask.c
index c986834eb8..e3bce982a5 100644
--- a/zephyr/test/math/src/mask.c
+++ b/zephyr/test/math/src/mask.c
@@ -10,7 +10,7 @@
 
 #include <zephyr/ztest.h>
 
-ZTEST_USER(math, bitmask_uint64)
+ZTEST_USER(math, test_bitmask_uint64)
 {
 	zassert_equal(bitmask_uint64(-1), 0);
 	zassert_equal(bitmask_uint64(64), 0);
diff --git a/zephyr/test/math/src/math_util.c b/zephyr/test/math/src/math_util.c
index 184dd2b999..e5d9d8c9f2 100644
--- a/zephyr/test/math/src/math_util.c
+++ b/zephyr/test/math/src/math_util.c
@@ -10,7 +10,7 @@
 
 #include <zephyr/ztest.h>
 
-ZTEST_USER(math, arc_cos__x_below_range)
+ZTEST_USER(math, test_arc_cos__x_below_range)
 {
 	fp_t result = arc_cos(FLOAT_TO_FP(-1.1));
 
@@ -18,7 +18,7 @@ ZTEST_USER(math, arc_cos__x_below_range)
 		       "arc_cos(-1.1) was %d", FP_TO_INT(result));
 }
 
-ZTEST_USER(math, arc_cos__x_above_range)
+ZTEST_USER(math, test_arc_cos__x_above_range)
 {
 	fp_t result = arc_cos(FLOAT_TO_FP(1.1));
 
@@ -26,7 +26,7 @@ ZTEST_USER(math, arc_cos__x_above_range)
 		       "arc_cos(1.1) was %d", FP_TO_INT(result));
 }
 
-ZTEST_USER(math, int_sqrtf)
+ZTEST_USER(math, test_int_sqrtf)
 {
 	zassert_equal(int_sqrtf(0), 0);
 	zassert_equal(int_sqrtf(15), 3);
@@ -36,13 +36,13 @@ ZTEST_USER(math, int_sqrtf)
 	zassert_equal(int_sqrtf(1000000000000000005), 1000000000);
 }
 
-ZTEST_USER(math, fp_sqrtf)
+ZTEST_USER(math, test_fp_sqrtf)
 {
 	zassert_within(fp_sqrtf(FLOAT_TO_FP(15)), FLOAT_TO_FP(3.872983),
 		       FLOAT_TO_FP(0.001), NULL);
 }
 
-ZTEST_USER(math, print_ints)
+ZTEST_USER(math, test_print_ints)
 {
 	char buffer[10];
 
diff --git a/zephyr/test/math/src/vector.c b/zephyr/test/math/src/vector.c
index e588be52af..344cb80f48 100644
--- a/zephyr/test/math/src/vector.c
+++ b/zephyr/test/math/src/vector.c
@@ -8,7 +8,7 @@
 
 #include <zephyr/ztest.h>
 
-ZTEST_USER(math, cosine_of_angle_diff__zero_magnitude_vector)
+ZTEST_USER(math, test_cosine_of_angle_diff__zero_magnitude_vector)
 {
 	intv3_t v0 = { 0, 0, 0 };
 	intv3_t v1 = { 1, 1, 1 };
@@ -17,7 +17,7 @@ ZTEST_USER(math, cosine_of_angle_diff__zero_magnitude_vector)
 	zassert_equal(cosine_of_angle_diff(v1, v0), 0);
 }
 
-ZTEST_USER(math, rotate_inv__null_matrix)
+ZTEST_USER(math, test_rotate_inv__null_matrix)
 {
 	intv3_t v = { 1, 2, 3 };
 	intv3_t r = { 4, 5, 6 };
diff --git a/zephyr/test/skyrim/tests/baseboard/src/usb_pd_policy.c b/zephyr/test/skyrim/tests/baseboard/src/usb_pd_policy.c
index 1a8e5e8805..10c9e93b1a 100644
--- a/zephyr/test/skyrim/tests/baseboard/src/usb_pd_policy.c
+++ b/zephyr/test/skyrim/tests/baseboard/src/usb_pd_policy.c
@@ -19,7 +19,7 @@ FAKE_VALUE_FUNC(int, ppc_vbus_sink_enable, int, int);
 
 int board_is_sourcing_vbus(int port);
 
-ZTEST(usb_pd_policy, pd_check_vconn_swap)
+ZTEST(usb_pd_policy, test_pd_check_vconn_swap)
 {
 	const struct gpio_dt_spec *gpio =
 		GPIO_DT_FROM_NODELABEL(gpio_pg_pwr_s5);
@@ -37,7 +37,7 @@ ZTEST(usb_pd_policy, pd_check_vconn_swap)
 	zassert_false(pd_check_vconn_swap(1));
 }
 
-ZTEST(usb_pd_policy, pd_power_supply_reset_c0_success)
+ZTEST(usb_pd_policy, test_pd_power_supply_reset_c0_success)
 {
 	ppc_vbus_source_enable_fake.return_val = EC_SUCCESS;
 	ppc_vbus_sink_enable_fake.return_val = EC_SUCCESS;
@@ -61,7 +61,7 @@ ZTEST(usb_pd_policy, pd_power_supply_reset_c0_success)
 	zassert_equal(pd_send_host_event_fake.call_count, 1);
 }
 
-ZTEST(usb_pd_policy, pd_power_supply_reset_c1_success)
+ZTEST(usb_pd_policy, test_pd_power_supply_reset_c1_success)
 {
 	ppc_vbus_source_enable_fake.return_val = EC_SUCCESS;
 	ppc_vbus_sink_enable_fake.return_val = EC_SUCCESS;
@@ -85,7 +85,7 @@ ZTEST(usb_pd_policy, pd_power_supply_reset_c1_success)
 	zassert_equal(pd_send_host_event_fake.call_count, 1);
 }
 
-ZTEST(usb_pd_policy, pd_set_power_supply_ready_c0_success)
+ZTEST(usb_pd_policy, test_pd_set_power_supply_ready_c0_success)
 {
 	ppc_vbus_source_enable_fake.return_val = EC_SUCCESS;
 	ppc_vbus_sink_enable_fake.return_val = EC_SUCCESS;
@@ -115,7 +115,7 @@ ZTEST(usb_pd_policy, pd_set_power_supply_ready_c0_success)
 	zassert_equal(pd_send_host_event_fake.call_count, 1);
 }
 
-ZTEST(usb_pd_policy, pd_set_power_supply_ready_c1_success)
+ZTEST(usb_pd_policy, test_pd_set_power_supply_ready_c1_success)
 {
 	ppc_vbus_source_enable_fake.return_val = EC_SUCCESS;
 	ppc_vbus_sink_enable_fake.return_val = EC_SUCCESS;
@@ -145,7 +145,7 @@ ZTEST(usb_pd_policy, pd_set_power_supply_ready_c1_success)
 	zassert_equal(pd_send_host_event_fake.call_count, 1);
 }
 
-ZTEST(usb_pd_policy, pd_set_power_supply_ready_c0_failure)
+ZTEST(usb_pd_policy, test_pd_set_power_supply_ready_c0_failure)
 {
 	/* Test with ppc_vbus_sink_enable_fake failing. */
 	ppc_vbus_sink_enable_fake.return_val = EC_ERROR_INVAL;
@@ -169,7 +169,7 @@ ZTEST(usb_pd_policy, pd_set_power_supply_ready_c0_failure)
 	zassert_equal(pd_send_host_event_fake.call_count, 0);
 }
 
-ZTEST(usb_pd_policy, pd_set_power_supply_ready_c1_failure)
+ZTEST(usb_pd_policy, test_pd_set_power_supply_ready_c1_failure)
 {
 	/* Test with ppc_vbus_sink_enable_fake failing. */
 	ppc_vbus_sink_enable_fake.return_val = EC_ERROR_INVAL;
@@ -193,7 +193,7 @@ ZTEST(usb_pd_policy, pd_set_power_supply_ready_c1_failure)
 	zassert_equal(pd_send_host_event_fake.call_count, 0);
 }
 
-ZTEST(usb_pd_policy, board_pd_set_frs_enable)
+ZTEST(usb_pd_policy, test_board_pd_set_frs_enable)
 {
 	const struct gpio_dt_spec *c0 =
 		GPIO_DT_FROM_NODELABEL(gpio_usb_c0_tcpc_fastsw_ctl_en);
@@ -214,7 +214,7 @@ ZTEST(usb_pd_policy, board_pd_set_frs_enable)
 	zassert_equal(gpio_emul_output_get(c1->port, c1->pin), 0);
 }
 
-ZTEST(usb_pd_policy, board_is_sourcing_vbus_c0_true)
+ZTEST(usb_pd_policy, test_board_is_sourcing_vbus_c0_true)
 {
 	tcpm_get_src_ctrl_fake.return_val = true;
 	zassert_true(board_is_sourcing_vbus(0));
@@ -223,7 +223,7 @@ ZTEST(usb_pd_policy, board_is_sourcing_vbus_c0_true)
 	zassert_equal(tcpm_get_src_ctrl_fake.arg0_val, 0);
 }
 
-ZTEST(usb_pd_policy, board_is_sourcing_vbus_c0_false)
+ZTEST(usb_pd_policy, test_board_is_sourcing_vbus_c0_false)
 {
 	tcpm_get_src_ctrl_fake.return_val = false;
 	zassert_false(board_is_sourcing_vbus(0));
@@ -232,7 +232,7 @@ ZTEST(usb_pd_policy, board_is_sourcing_vbus_c0_false)
 	zassert_equal(tcpm_get_src_ctrl_fake.arg0_val, 0);
 }
 
-ZTEST(usb_pd_policy, board_is_sourcing_vbus_c1_true)
+ZTEST(usb_pd_policy, test_board_is_sourcing_vbus_c1_true)
 {
 	tcpm_get_src_ctrl_fake.return_val = true;
 	zassert_true(board_is_sourcing_vbus(1));
@@ -241,7 +241,7 @@ ZTEST(usb_pd_policy, board_is_sourcing_vbus_c1_true)
 	zassert_equal(tcpm_get_src_ctrl_fake.arg0_val, 1);
 }
 
-ZTEST(usb_pd_policy, board_is_sourcing_vbus_c1_false)
+ZTEST(usb_pd_policy, test_board_is_sourcing_vbus_c1_false)
 {
 	tcpm_get_src_ctrl_fake.return_val = false;
 	zassert_false(board_is_sourcing_vbus(1));
diff --git a/zephyr/test/skyrim/tests/common/src/alt_charger.c b/zephyr/test/skyrim/tests/common/src/alt_charger.c
index c03d31aaeb..0bd641fad0 100644
--- a/zephyr/test/skyrim/tests/common/src/alt_charger.c
+++ b/zephyr/test/skyrim/tests/common/src/alt_charger.c
@@ -38,7 +38,7 @@ static void alt_charger_before(void *fixture)
 
 ZTEST_SUITE(alt_charger, NULL, NULL, alt_charger_before, NULL, NULL);
 
-ZTEST(alt_charger, normal_charger)
+ZTEST(alt_charger, test_normal_charger)
 {
 	alt_charger = false;
 	alt_charger_init();
@@ -46,7 +46,7 @@ ZTEST(alt_charger, normal_charger)
 	zassert_equal(chg_enable_alternate_test_fake.call_count, 0);
 }
 
-ZTEST(alt_charger, alt_charger)
+ZTEST(alt_charger, test_alt_charger)
 {
 	alt_charger = true;
 	alt_charger_init();
diff --git a/zephyr/test/skyrim/tests/common/src/fan.c b/zephyr/test/skyrim/tests/common/src/fan.c
index 4968938298..275a7f1463 100644
--- a/zephyr/test/skyrim/tests/common/src/fan.c
+++ b/zephyr/test/skyrim/tests/common/src/fan.c
@@ -51,7 +51,7 @@ static void fan_before(void *fixture)
 
 ZTEST_SUITE(fan, NULL, NULL, fan_before, NULL, NULL);
 
-ZTEST(fan, board_supports_pcore_ocp)
+ZTEST(fan, test_board_supports_pcore_ocp)
 {
 	/* Only supported for board version > 3. */
 	board_version = 2;
@@ -62,7 +62,7 @@ ZTEST(fan, board_supports_pcore_ocp)
 	zassert_true(board_supports_pcore_ocp());
 }
 
-ZTEST(fan, fan_init)
+ZTEST(fan, test_fan_init)
 {
 	/* Only disable fans on board version >= 3. */
 	fan_present = false;
diff --git a/zephyr/test/skyrim/tests/common/src/ppc_config.c b/zephyr/test/skyrim/tests/common/src/ppc_config.c
index ca759fa66a..0527520413 100644
--- a/zephyr/test/skyrim/tests/common/src/ppc_config.c
+++ b/zephyr/test/skyrim/tests/common/src/ppc_config.c
@@ -25,7 +25,7 @@ int board_aoz1380_set_vbus_source_current_limit(int port,
 
 ZTEST_SUITE(ppc_config, NULL, NULL, ppc_config_before, NULL, NULL);
 
-ZTEST(ppc_config, board_aoz1380_set_vbus_source_current_limit)
+ZTEST(ppc_config, test_board_aoz1380_set_vbus_source_current_limit)
 {
 	int rv;
 	const struct gpio_dt_spec *gpio =
@@ -48,7 +48,7 @@ ZTEST(ppc_config, board_aoz1380_set_vbus_source_current_limit)
 	zassert_equal(rv, EC_ERROR_INVAL);
 }
 
-ZTEST(ppc_config, ppc_interrupt)
+ZTEST(ppc_config, test_ppc_interrupt)
 {
 	ppc_interrupt(GPIO_USB_C0_PPC_INT_ODL);
 	zassert_equal(aoz1380_interrupt_fake.call_count, 1);
diff --git a/zephyr/test/skyrim/tests/frostflow/src/usb_mux_config.c b/zephyr/test/skyrim/tests/frostflow/src/usb_mux_config.c
index 3a4b80d347..688453d13f 100644
--- a/zephyr/test/skyrim/tests/frostflow/src/usb_mux_config.c
+++ b/zephyr/test/skyrim/tests/frostflow/src/usb_mux_config.c
@@ -19,7 +19,7 @@ int board_c1_ps8818_mux_set(const struct usb_mux *me, mux_state_t mux_state);
 
 ZTEST_SUITE(usb_mux_config, NULL, NULL, NULL, NULL, NULL);
 
-ZTEST(usb_mux_config, board_c0_amd_fp6_mux_set)
+ZTEST(usb_mux_config, test_board_c0_amd_fp6_mux_set)
 {
 	const struct gpio_dt_spec *c0 =
 		GPIO_DT_FROM_NODELABEL(ioex_usb_c0_sbu_flip);
@@ -48,7 +48,7 @@ ZTEST(usb_mux_config, board_c0_amd_fp6_mux_set)
 	zassert_equal(gpio_emul_output_get(c1->port, c1->pin), 1);
 }
 
-ZTEST(usb_mux_config, board_c1_ps8818_mux_set)
+ZTEST(usb_mux_config, test_board_c1_ps8818_mux_set)
 {
 	const struct gpio_dt_spec *gpio =
 		GPIO_DT_FROM_NODELABEL(gpio_usb_c1_in_hpd);
diff --git a/zephyr/test/skyrim/tests/winterhold/src/ppc_config.c b/zephyr/test/skyrim/tests/winterhold/src/ppc_config.c
index 4fce497faf..0f319d8ea4 100644
--- a/zephyr/test/skyrim/tests/winterhold/src/ppc_config.c
+++ b/zephyr/test/skyrim/tests/winterhold/src/ppc_config.c
@@ -20,7 +20,7 @@ void ppc_interrupt(enum gpio_signal signal);
 
 ZTEST_SUITE(ppc_config, NULL, NULL, ppc_config_before, NULL, NULL);
 
-ZTEST(ppc_config, ppc_interrupt_c0)
+ZTEST(ppc_config, test_ppc_interrupt_c0)
 {
 	ppc_interrupt(GPIO_USB_C0_PPC_INT_ODL);
 	zassert_equal(nx20p348x_interrupt_fake.call_count, 1);
@@ -28,7 +28,7 @@ ZTEST(ppc_config, ppc_interrupt_c0)
 	zassert_equal(nx20p348x_interrupt_fake.arg0_val, 0);
 }
 
-ZTEST(ppc_config, ppc_interrupt_c1)
+ZTEST(ppc_config, test_ppc_interrupt_c1)
 {
 	ppc_interrupt(GPIO_USB_C1_PPC_INT_ODL);
 	zassert_equal(nx20p348x_interrupt_fake.call_count, 1);
author	Al Semjonovs <asemjonovs@google.com>	2023-04-07 09:04:09 -0600
committer	Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>	2023-04-07 22:12:01 +0000
commit	b5eb344ca4965a798b8c849a9294f2f5798fcc3d (patch)
tree	462362431f74fb4add21e56b99bb86e6e6daa39a
parent	2508ef893b1fb8a0381f18b2aa7007c6217bb219 (diff)
download	chrome-ec-b5eb344ca4965a798b8c849a9294f2f5798fcc3d.tar.gz