diff --git a/samples/boards/stm32/power_mgmt/adc/sample.yaml b/samples/boards/stm32/power_mgmt/adc/sample.yaml
index e27cc5b268d..e3892df7b5c 100644
--- a/samples/boards/stm32/power_mgmt/adc/sample.yaml
+++ b/samples/boards/stm32/power_mgmt/adc/sample.yaml
@@ -3,7 +3,7 @@ sample:
 tests:
   sample.boards.stm32.power_mgmt.adc:
     tags:
-      - ADC
+      - adc
       - power
     harness: console
     harness_config:
diff --git a/samples/drivers/adc/sample.yaml b/samples/drivers/adc/sample.yaml
index 0af996a8bab..2ed1681a0e0 100644
--- a/samples/drivers/adc/sample.yaml
+++ b/samples/drivers/adc/sample.yaml
@@ -2,7 +2,8 @@ sample:
   name: ADC driver sample
 tests:
   sample.drivers.adc:
-    tags: ADC
+    tags:
+      - adc
     depends_on: adc
     platform_allow:
       - nucleo_l073rz
diff --git a/samples/drivers/soc_flash_nrf/sample.yaml b/samples/drivers/soc_flash_nrf/sample.yaml
index 6557988b6e3..b8a59328be4 100644
--- a/samples/drivers/soc_flash_nrf/sample.yaml
+++ b/samples/drivers/soc_flash_nrf/sample.yaml
@@ -10,8 +10,7 @@ tests:
       - nrf52dk_nrf52832
     tags:
       - flash
-      - nrf52
-      - nrf9160
+      - drivers
     harness: console
     harness_config:
       fixture: external_flash
diff --git a/tests/drivers/build_all/adc/testcase.yaml b/tests/drivers/build_all/adc/testcase.yaml
index c8a6fe5e3a7..a8102364b60 100644
--- a/tests/drivers/build_all/adc/testcase.yaml
+++ b/tests/drivers/build_all/adc/testcase.yaml
@@ -9,53 +9,30 @@ tests:
     platform_allow:
       - native_posix
       - native_posix_64
-    tags:
-      - adc_mcp302x
-      - adc_lmp90xxx
-      - adc_ads1x1x
-      - adc_ads1119
-      - adc_ads1112
-      - adc_ads114s08
-      - adc_emul
-      - adc_max1125x
-      - adc_ltc2451
     extra_args: "CONFIG_GPIO=y"
   drivers.adc.cc32xx.build:
     platform_allow: cc3220sf_launchxl
-    tags: adc_cc32xx
   drivers.adc.ite.it8xxx2.build:
     platform_allow: it8xxx2_evb
-    tags: adc_ite_it8xxx2
   drivers.adc.mcux.adc12.build:
     platform_allow: twr_ke18f
-    tags: adc_mcux_adc12
   drivers.adc.mcux.adc16.build:
     platform_allow: frdm_k22f
-    tags: adc_mcux_adc16
   drivers.adc.mcux.lpadc.build:
     platform_allow: lpcxpresso55s28
-    tags: adc_mcux_lpadc
   drivers.adc.npcx.build:
     platform_allow: npcx7m6fb_evb
-    tags: adc_npcx
   drivers.adc.nrf.build:
     platform_allow: nrf51dk_nrf51422
-    tags: adc_nrfx_adc
   drivers.adc.nrf.saadc.build:
     platform_allow: nrf21540dk_nrf52840
-    tags: adc_nrfx_saadc
   drivers.adc.sam0.build:
     platform_allow: atsame54_xpro
-    tags: adc_sam0
   drivers.adc.sam.afec.build:
     platform_allow: sam_e70_xplained
-    tags: adc_sam_afec
   drivers.adc.stm32.build:
     platform_allow: disco_l475_iot1
-    tags: adc_stm32
   drivers.adc.xec.build:
     platform_allow: mec15xxevb_assy6853
-    tags: adc_xec
   drivers.adc.test.build:
     platform_allow: qemu_cortex_m3
-    tags: adc_test