diff --git a/tests/drivers/adc/adc_dma/testcase.yaml b/tests/drivers/adc/adc_dma/testcase.yaml
index daf073bab5c..6db57d4be6c 100644
--- a/tests/drivers/adc/adc_dma/testcase.yaml
+++ b/tests/drivers/adc/adc_dma/testcase.yaml
@@ -4,7 +4,7 @@ common:
     - dma
     - trigger
 tests:
-  drivers.adc-dma:
+  drivers.adc.dma:
     depends_on:
       - adc
       - dma
diff --git a/tests/drivers/bbram/testcase.yaml b/tests/drivers/bbram/testcase.yaml
index 00f0eb9bcc9..db1d1640772 100644
--- a/tests/drivers/bbram/testcase.yaml
+++ b/tests/drivers/bbram/testcase.yaml
@@ -22,7 +22,7 @@ tests:
     filter: dt_compat_enabled("st,stm32-bbram")
     integration_platforms:
       - stm32f746g_disco
-  driver.bbram.stm32_rtc:
+  drivers.bbram.stm32_rtc:
     extra_args: OVERLAY_CONFIG="stm32_rtc.conf"
     filter: dt_compat_enabled("st,stm32-bbram")
     integration_platforms:
diff --git a/tests/drivers/bc12/testcase.yaml b/tests/drivers/bc12/testcase.yaml
index f7244908edf..1562b625592 100644
--- a/tests/drivers/bc12/testcase.yaml
+++ b/tests/drivers/bc12/testcase.yaml
@@ -1,6 +1,7 @@
 tests:
-  drivers.bc12:
+  drivers.usb.bc12:
     tags:
       - drivers
+      - usb
       - bc12
     platform_allow: native_posix
diff --git a/tests/drivers/charger/sbs_charger/testcase.yaml b/tests/drivers/charger/sbs_charger/testcase.yaml
index 680f0b6caa3..1cc4904010b 100644
--- a/tests/drivers/charger/sbs_charger/testcase.yaml
+++ b/tests/drivers/charger/sbs_charger/testcase.yaml
@@ -1,7 +1,9 @@
 tests:
   # section.subsection
-  drivers.sbs_charger.emulated:
-    tags: drivers charger
+  drivers.charger.sbs.emulated:
+    tags:
+      - drivers
+      - charger
     filter: >
       dt_compat_enabled("sbs,sbs-charger") and
       (CONFIG_QEMU_TARGET or CONFIG_BOARD_NATIVE_POSIX)
@@ -9,26 +11,28 @@ tests:
       CONF_FILE="prj.conf;boards/emulated_board.conf"
       DTC_OVERLAY_FILE="boards/emulated_board.overlay"
     platform_exclude:
-      qemu_cortex_a53
-      qemu_cortex_a53_smp
-      qemu_kvm_arm64
-      xenvm
-      xenvm_gicv3
-      hifive_unmatched
-      rcar_h3ulcb_ca57
-      rcar_salvator_xs_m3
-      numaker_pfm_m467
-  drivers.sbs_charger.emulated_64_bit_i2c_addr:
-    tags: drivers charger
+      - qemu_cortex_a53
+      - qemu_cortex_a53_smp
+      - qemu_kvm_arm64
+      - xenvm
+      - xenvm_gicv3
+      - hifive_unmatched
+      - rcar_h3ulcb_ca57
+      - rcar_salvator_xs_m3
+      - numaker_pfm_m467
+  drivers.charger.sbs.emulated_64_bit_i2c_addr:
+    tags:
+      - drivers
+      - charger
     filter: >
       dt_compat_enabled("sbs,sbs-charger") and
       (CONFIG_QEMU_TARGET or CONFIG_BOARD_NATIVE_POSIX)
     platform_allow:
-      qemu_cortex_a53
-      qemu_cortex_a53_smp
-      qemu_kvm_arm64
-      xenvm
-      xenvm_gicv3
+      - qemu_cortex_a53
+      - qemu_cortex_a53_smp
+      - qemu_kvm_arm64
+      - xenvm
+      - xenvm_gicv3
     extra_args:
       CONF_FILE="prj.conf;boards/qemu_cortex_a53.conf"
       DTC_OVERLAY_FILE="boards/qemu_cortex_a53.overlay"
diff --git a/tests/drivers/disk/disk_performance/testcase.yaml b/tests/drivers/disk/disk_performance/testcase.yaml
index f51e9f196e7..af008bf56e0 100644
--- a/tests/drivers/disk/disk_performance/testcase.yaml
+++ b/tests/drivers/disk/disk_performance/testcase.yaml
@@ -11,7 +11,7 @@ tests:
     integration_platforms:
       - mimxrt1064_evk
       - mimxrt595_evk_cm33
-  drivers.disk_performance.disk.nvme:
+  drivers.disk.disk_performance.disk.nvme:
     extra_configs:
       - CONFIG_NVME=y
     platform_allow: qemu_x86_64
diff --git a/tests/drivers/fuel_gauge/bq27z746/testcase.yaml b/tests/drivers/fuel_gauge/bq27z746/testcase.yaml
index 6d9096b3a98..21f149d4da2 100644
--- a/tests/drivers/fuel_gauge/bq27z746/testcase.yaml
+++ b/tests/drivers/fuel_gauge/bq27z746/testcase.yaml
@@ -1,5 +1,6 @@
 tests:
-  # section.subsection
-  drivers.bq27z746:
+  drivers.fuel_gauge.bq27z746:
+    tags:
+      - fuel_gauge
     filter: dt_compat_enabled("ti,bq27z746")
     platform_allow: native_posix
diff --git a/tests/drivers/fuel_gauge/max17048/testcase.yaml b/tests/drivers/fuel_gauge/max17048/testcase.yaml
index 742d2fee9ea..33c8def4195 100644
--- a/tests/drivers/fuel_gauge/max17048/testcase.yaml
+++ b/tests/drivers/fuel_gauge/max17048/testcase.yaml
@@ -1,5 +1,6 @@
 tests:
-  # section.subsection
-  drivers.max17048:
+  drivers.fuel_gauge.max17048:
+    tags:
+      - fuel_gauge
     filter: dt_compat_enabled("maxim,max17048")
     platform_allow: native_posix
diff --git a/tests/drivers/fuel_gauge/sbs_gauge/testcase.yaml b/tests/drivers/fuel_gauge/sbs_gauge/testcase.yaml
index d7f85f58bb6..66e3dde18df 100644
--- a/tests/drivers/fuel_gauge/sbs_gauge/testcase.yaml
+++ b/tests/drivers/fuel_gauge/sbs_gauge/testcase.yaml
@@ -1,6 +1,5 @@
 tests:
-  # section.subsection
-  drivers.sbs_gauge_new_api.emulated:
+  drivers.fuel_gauge.sbs_gauge_new_api.emulated:
     tags:
       - drivers
       - fuel_gauge
@@ -21,7 +20,7 @@ tests:
       - rcar_salvator_xs_m3
     integration_platforms:
       - qemu_x86
-  drivers.sbs_gauge_new_api.emulated_64_bit_i2c_addr:
+  drivers.fuel_gauge.sbs_gauge_new_api.emulated_64_bit_i2c_addr:
     tags:
       - drivers
       - fuel_gauge
@@ -40,7 +39,7 @@ tests:
     extra_args:
       - CONF_FILE="prj.conf;boards/qemu_cortex_a53.conf"
       - DTC_OVERLAY_FILE="boards/qemu_cortex_a53.overlay"
-  drivers.sbs_gauge_new_api.emulated.cutoff:
+  drivers.fuel_gauge.sbs_gauge_new_api.emulated.cutoff:
     tags:
       - drivers
       - fuel_gauge
diff --git a/tests/drivers/led/led_api/testcase.yaml b/tests/drivers/led/led_api/testcase.yaml
index 3af8b79d855..35e3eaca9d4 100644
--- a/tests/drivers/led/led_api/testcase.yaml
+++ b/tests/drivers/led/led_api/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  drivers.led_api.i2c:
+  drivers.led.api.i2c:
     tags:
       - drivers
       - led
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index 4abf97911ce..ed2339d8f54 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -110,31 +110,31 @@ tests:
       - gd32vf103v_eval
       - longan_nano
       - longan_nano_lite
-  drivers.pl022_spi_interrupt.loopback:
+  drivers.spi.pl022_spi_interrupt.loopback:
     extra_configs:
       - CONFIG_SPI_PL022_INTERRUPT=y
       - CONFIG_SPI_PL022_DMA=n
     platform_allow: rpi_pico
-  drivers.pl022_spi_dma.loopback:
+  drivers.spi.pl022_spi_dma.loopback:
     extra_configs:
       - CONFIG_SPI_PL022_INTERRUPT=n
       - CONFIG_SPI_PL022_DMA=y
       - CONFIG_DMA=y
     platform_allow: rpi_pico
-  drivers.pl022_spi_dma_and_interrupt.loopback:
+  drivers.spi.pl022_spi_dma_and_interrupt.loopback:
     extra_configs:
       - CONFIG_SPI_PL022_INTERRUPT=y
       - CONFIG_SPI_PL022_DMA=y
       - CONFIG_DMA=y
     platform_allow: rpi_pico
-  drivers.pl022_spi_dma_no_dma_props.loopback:
+  drivers.spi.pl022_spi_dma_no_dma_props.loopback:
     extra_args: DTC_OVERLAY_FILE="boards/rpi_pico_delete_dma_props.overlay"
     extra_configs:
       - CONFIG_SPI_PL022_INTERRUPT=n
       - CONFIG_SPI_PL022_DMA=y
       - CONFIG_DMA=y
     platform_allow: rpi_pico
-  drivers.pl022_spi_dma_and_interrupt_no_dma_props.loopback:
+  drivers.spi.pl022_spi_dma_and_interrupt_no_dma_props.loopback:
     extra_args: DTC_OVERLAY_FILE="boards/rpi_pico_delete_dma_props.overlay"
     extra_configs:
       - CONFIG_SPI_PL022_INTERRUPT=y
diff --git a/tests/drivers/udc/testcase.yaml b/tests/drivers/udc/testcase.yaml
index 0379e3de615..97b644d6d8c 100644
--- a/tests/drivers/udc/testcase.yaml
+++ b/tests/drivers/udc/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  drivers.udc:
+  drivers.usb.udc:
     tags:
       - usb
       - drivers