diff --git a/samples/drivers/clock_control_litex/sample.yaml b/samples/drivers/clock_control_litex/sample.yaml
index 5c9ae55424f..cf5618313c5 100644
--- a/samples/drivers/clock_control_litex/sample.yaml
+++ b/samples/drivers/clock_control_litex/sample.yaml
@@ -4,7 +4,5 @@ tests:
   sample.driver.clock_control_litex:
     platform_allow: litex_vexriscv
     tags:
-      - clock
-      - litex
-      - vexriscv
+      - clock_control
       - mmcm
diff --git a/tests/drivers/clock_control/adsp_clock/testcase.yaml b/tests/drivers/clock_control/adsp_clock/testcase.yaml
index 5abe4765022..48df05a8462 100644
--- a/tests/drivers/clock_control/adsp_clock/testcase.yaml
+++ b/tests/drivers/clock_control/adsp_clock/testcase.yaml
@@ -2,7 +2,7 @@ tests:
   drivers.clock.adsp_clock_control:
     tags:
       - drivers
-      - clock
+      - clock_control
     platform_allow: intel_adsp_cavs25
     integration_platforms:
       - intel_adsp_cavs25
diff --git a/tests/drivers/clock_control/clock_control_api/testcase.yaml b/tests/drivers/clock_control/clock_control_api/testcase.yaml
index 18d75385551..be789c8382a 100644
--- a/tests/drivers/clock_control/clock_control_api/testcase.yaml
+++ b/tests/drivers/clock_control/clock_control_api/testcase.yaml
@@ -2,7 +2,7 @@ tests:
   drivers.clock.clock_control_nrf5:
     tags:
       - drivers
-      - cloc
+      - clock_control
     platform_allow:
       - nrf51dk_nrf51422
       - nrf52dk_nrf52832
@@ -13,7 +13,7 @@ tests:
   drivers.clock.clock_control_nrf5_lfclk_rc:
     tags:
       - drivers
-      - clock
+      - clock_control
     platform_allow:
       - nrf51dk_nrf51422
       - nrf52dk_nrf52832
diff --git a/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml b/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
index e7ac90ec7b9..092471d30e4 100644
--- a/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
@@ -2,7 +2,7 @@ tests:
   drivers.clock.nrf5_clock_calibration:
     tags:
       - drivers
-      - clock
+      - clock_control
     platform_allow:
       - nrf51dk_nrf51422
       - nrf52dk_nrf52832
diff --git a/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml b/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
index 01ba725e780..f4940d79896 100644
--- a/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
@@ -1,7 +1,7 @@
 common:
   tags:
     - drivers
-    - clock
+    - clock_control
   integration_platforms:
     - nrf51dk_nrf51422
 tests:
diff --git a/tests/drivers/clock_control/nrf_onoff_and_bt/testcase.yaml b/tests/drivers/clock_control/nrf_onoff_and_bt/testcase.yaml
index 04c107da954..19c77496933 100644
--- a/tests/drivers/clock_control/nrf_onoff_and_bt/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_onoff_and_bt/testcase.yaml
@@ -2,7 +2,7 @@ tests:
   drivers.clock.nrf_onoff_and_bt:
     tags:
       - drivers
-      - clock
+      - clock_control
     platform_allow:
       - nrf51dk_nrf51422
       - nrf52dk_nrf52832
diff --git a/tests/drivers/clock_control/onoff/testcase.yaml b/tests/drivers/clock_control/onoff/testcase.yaml
index abedf82f2a4..a6e03d9a0ec 100644
--- a/tests/drivers/clock_control/onoff/testcase.yaml
+++ b/tests/drivers/clock_control/onoff/testcase.yaml
@@ -2,7 +2,7 @@ tests:
   drivers.clock.clock_control_onoff:
     tags:
       - drivers
-      - clock
+      - clock_control
     platform_allow:
       - nrf51dk_nrf51422
       - nrf52dk_nrf52832
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_core/testcase.yaml b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_core/testcase.yaml
index da7df163972..563108bfe91 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_core/testcase.yaml
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_core/testcase.yaml
@@ -6,7 +6,8 @@
 # - add the fixture in map file
 common:
   timeout: 5
-  tags: clock-control
+  tags:
+    - clock_control
 tests:
   drivers.clock.stm32_clock_configuration.common_core.l4_l5.sysclksrc_pll_48_msi_4:
     extra_args: