diff --git a/tests/benchmarks/latency_measure/boards/atsame54_xpro.conf b/tests/benchmarks/latency_measure/boards/same54_xpro.conf
similarity index 100%
rename from tests/benchmarks/latency_measure/boards/atsame54_xpro.conf
rename to tests/benchmarks/latency_measure/boards/same54_xpro.conf
diff --git a/tests/drivers/adc/adc_api/boards/atsamc21n_xpro.overlay b/tests/drivers/adc/adc_api/boards/samc21n_xpro.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/boards/atsamc21n_xpro.overlay
rename to tests/drivers/adc/adc_api/boards/samc21n_xpro.overlay
diff --git a/tests/drivers/adc/adc_api/boards/atsamd20_xpro.overlay b/tests/drivers/adc/adc_api/boards/samd20_xpro.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/boards/atsamd20_xpro.overlay
rename to tests/drivers/adc/adc_api/boards/samd20_xpro.overlay
diff --git a/tests/drivers/adc/adc_api/boards/atsamd21_xpro.overlay b/tests/drivers/adc/adc_api/boards/samd21_xpro.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/boards/atsamd21_xpro.overlay
rename to tests/drivers/adc/adc_api/boards/samd21_xpro.overlay
diff --git a/tests/drivers/adc/adc_api/boards/atsame54_xpro.overlay b/tests/drivers/adc/adc_api/boards/same54_xpro.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/boards/atsame54_xpro.overlay
rename to tests/drivers/adc/adc_api/boards/same54_xpro.overlay
diff --git a/tests/drivers/adc/adc_api/boards/atsaml21_xpro.overlay b/tests/drivers/adc/adc_api/boards/saml21_xpro.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/boards/atsaml21_xpro.overlay
rename to tests/drivers/adc/adc_api/boards/saml21_xpro.overlay
diff --git a/tests/drivers/adc/adc_api/boards/atsamr21_xpro.overlay b/tests/drivers/adc/adc_api/boards/samr21_xpro.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/boards/atsamr21_xpro.overlay
rename to tests/drivers/adc/adc_api/boards/samr21_xpro.overlay
diff --git a/tests/drivers/adc/adc_api/boards/atsamr34_xpro.overlay b/tests/drivers/adc/adc_api/boards/samr34_xpro.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/boards/atsamr34_xpro.overlay
rename to tests/drivers/adc/adc_api/boards/samr34_xpro.overlay
diff --git a/tests/drivers/build_all/adc/testcase.yaml b/tests/drivers/build_all/adc/testcase.yaml
index 80f2ae8982d..ebff27aa838 100644
--- a/tests/drivers/build_all/adc/testcase.yaml
+++ b/tests/drivers/build_all/adc/testcase.yaml
@@ -30,7 +30,7 @@ tests:
   drivers.adc.nrf.saadc.build:
     platform_allow: nrf21540dk/nrf52840
   drivers.adc.sam0.build:
-    platform_allow: atsame54_xpro
+    platform_allow: same54_xpro
   drivers.adc.sam.afec.build:
     platform_allow: sam_e70_xplained/same70q21
   drivers.adc.stm32.build:
diff --git a/tests/drivers/build_all/dac/boards/atsamd21_xpro.overlay b/tests/drivers/build_all/dac/boards/samd21_xpro.overlay
similarity index 100%
rename from tests/drivers/build_all/dac/boards/atsamd21_xpro.overlay
rename to tests/drivers/build_all/dac/boards/samd21_xpro.overlay
diff --git a/tests/drivers/build_all/dac/testcase.yaml b/tests/drivers/build_all/dac/testcase.yaml
index a298ded77b4..4192c6ca085 100644
--- a/tests/drivers/build_all/dac/testcase.yaml
+++ b/tests/drivers/build_all/dac/testcase.yaml
@@ -15,6 +15,6 @@ tests:
   drivers.dac.mcux32.build:
     platform_allow: twr_ke18f
   drivers.dac.sam0.build:
-    platform_allow: atsamd21_xpro
+    platform_allow: samd21_xpro
   drivers.dac.stm32.build:
     platform_allow: nucleo_f091rc
diff --git a/tests/drivers/build_all/pwm/testcase.yaml b/tests/drivers/build_all/pwm/testcase.yaml
index 7c66424575e..11c09e8c213 100644
--- a/tests/drivers/build_all/pwm/testcase.yaml
+++ b/tests/drivers/build_all/pwm/testcase.yaml
@@ -38,7 +38,7 @@ tests:
     platform_allow: nrf52840dk/nrf52840
     extra_args: SHIELD=adafruit_pca9685
   drivers.pwm.sam0.tcc.build:
-    platform_allow: atsame54_xpro
+    platform_allow: same54_xpro
   drivers.pwm.build.sam:
     platform_allow:
       - sam_e70_xplained/same70q21
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/atsamc21n_xpro.overlay b/tests/drivers/dma/chan_blen_transfer/boards/samc21n_xpro.overlay
similarity index 100%
rename from tests/drivers/dma/chan_blen_transfer/boards/atsamc21n_xpro.overlay
rename to tests/drivers/dma/chan_blen_transfer/boards/samc21n_xpro.overlay
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/atsamd21_xpro.overlay b/tests/drivers/dma/chan_blen_transfer/boards/samd21_xpro.overlay
similarity index 100%
rename from tests/drivers/dma/chan_blen_transfer/boards/atsamd21_xpro.overlay
rename to tests/drivers/dma/chan_blen_transfer/boards/samd21_xpro.overlay
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/atsaml21_xpro.overlay b/tests/drivers/dma/chan_blen_transfer/boards/saml21_xpro.overlay
similarity index 100%
rename from tests/drivers/dma/chan_blen_transfer/boards/atsaml21_xpro.overlay
rename to tests/drivers/dma/chan_blen_transfer/boards/saml21_xpro.overlay
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/atsamr34_xpro.overlay b/tests/drivers/dma/chan_blen_transfer/boards/samr34_xpro.overlay
similarity index 100%
rename from tests/drivers/dma/chan_blen_transfer/boards/atsamr34_xpro.overlay
rename to tests/drivers/dma/chan_blen_transfer/boards/samr34_xpro.overlay
diff --git a/tests/drivers/dma/loop_transfer/boards/atsamc21n_xpro.overlay b/tests/drivers/dma/loop_transfer/boards/samc21n_xpro.overlay
similarity index 100%
rename from tests/drivers/dma/loop_transfer/boards/atsamc21n_xpro.overlay
rename to tests/drivers/dma/loop_transfer/boards/samc21n_xpro.overlay
diff --git a/tests/drivers/dma/loop_transfer/boards/atsamd21_xpro.overlay b/tests/drivers/dma/loop_transfer/boards/samd21_xpro.overlay
similarity index 100%
rename from tests/drivers/dma/loop_transfer/boards/atsamd21_xpro.overlay
rename to tests/drivers/dma/loop_transfer/boards/samd21_xpro.overlay
diff --git a/tests/drivers/dma/loop_transfer/boards/atsaml21_xpro.overlay b/tests/drivers/dma/loop_transfer/boards/saml21_xpro.overlay
similarity index 100%
rename from tests/drivers/dma/loop_transfer/boards/atsaml21_xpro.overlay
rename to tests/drivers/dma/loop_transfer/boards/saml21_xpro.overlay
diff --git a/tests/drivers/dma/loop_transfer/boards/atsamr34_xpro.overlay b/tests/drivers/dma/loop_transfer/boards/samr34_xpro.overlay
similarity index 100%
rename from tests/drivers/dma/loop_transfer/boards/atsamr34_xpro.overlay
rename to tests/drivers/dma/loop_transfer/boards/samr34_xpro.overlay
diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml
index b8303a64acd..7b7827db069 100644
--- a/tests/drivers/flash/common/testcase.yaml
+++ b/tests/drivers/flash/common/testcase.yaml
@@ -90,9 +90,9 @@ tests:
       fixture: external_flash_mx25v1635f
   drivers.flash.common.sam0:
     platform_allow:
-      - atsamd20_xpro
-      - atsamr21_xpro
-      - atsame54_xpro
+      - samd20_xpro
+      - samr21_xpro
+      - same54_xpro
   drivers.flash.common.gd32:
     platform_allow:
       - gd32vf103v_eval
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/atsamd21_xpro.overlay b/tests/drivers/gpio/gpio_basic_api/boards/samd21_xpro.overlay
similarity index 100%
rename from tests/drivers/gpio/gpio_basic_api/boards/atsamd21_xpro.overlay
rename to tests/drivers/gpio/gpio_basic_api/boards/samd21_xpro.overlay
diff --git a/tests/drivers/spi/spi_loopback/boards/atsamd21_xpro.conf b/tests/drivers/spi/spi_loopback/boards/samd21_xpro.conf
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/atsamd21_xpro.conf
rename to tests/drivers/spi/spi_loopback/boards/samd21_xpro.conf
diff --git a/tests/drivers/spi/spi_loopback/boards/atsamd21_xpro.overlay b/tests/drivers/spi/spi_loopback/boards/samd21_xpro.overlay
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/atsamd21_xpro.overlay
rename to tests/drivers/spi/spi_loopback/boards/samd21_xpro.overlay
diff --git a/tests/drivers/spi/spi_loopback/boards/atsame54_xpro.overlay b/tests/drivers/spi/spi_loopback/boards/same54_xpro.overlay
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/atsame54_xpro.overlay
rename to tests/drivers/spi/spi_loopback/boards/same54_xpro.overlay
diff --git a/tests/drivers/spi/spi_loopback/boards/atsamr21_xpro.conf b/tests/drivers/spi/spi_loopback/boards/samr21_xpro.conf
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/atsamr21_xpro.conf
rename to tests/drivers/spi/spi_loopback/boards/samr21_xpro.conf
diff --git a/tests/drivers/spi/spi_loopback/boards/atsamr21_xpro.overlay b/tests/drivers/spi/spi_loopback/boards/samr21_xpro.overlay
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/atsamr21_xpro.overlay
rename to tests/drivers/spi/spi_loopback/boards/samr21_xpro.overlay
diff --git a/tests/drivers/uart/uart_async_api/boards/atsamc21n_xpro.overlay b/tests/drivers/uart/uart_async_api/boards/samc21n_xpro.overlay
similarity index 100%
rename from tests/drivers/uart/uart_async_api/boards/atsamc21n_xpro.overlay
rename to tests/drivers/uart/uart_async_api/boards/samc21n_xpro.overlay
diff --git a/tests/drivers/uart/uart_async_api/boards/atsamd21_xpro.overlay b/tests/drivers/uart/uart_async_api/boards/samd21_xpro.overlay
similarity index 100%
rename from tests/drivers/uart/uart_async_api/boards/atsamd21_xpro.overlay
rename to tests/drivers/uart/uart_async_api/boards/samd21_xpro.overlay
diff --git a/tests/drivers/uart/uart_async_api/boards/atsame54_xpro.overlay b/tests/drivers/uart/uart_async_api/boards/same54_xpro.overlay
similarity index 100%
rename from tests/drivers/uart/uart_async_api/boards/atsame54_xpro.overlay
rename to tests/drivers/uart/uart_async_api/boards/same54_xpro.overlay
diff --git a/tests/drivers/uart/uart_async_api/boards/atsaml21_xpro.overlay b/tests/drivers/uart/uart_async_api/boards/saml21_xpro.overlay
similarity index 100%
rename from tests/drivers/uart/uart_async_api/boards/atsaml21_xpro.overlay
rename to tests/drivers/uart/uart_async_api/boards/saml21_xpro.overlay
diff --git a/tests/drivers/uart/uart_async_api/boards/atsamr21_xpro.overlay b/tests/drivers/uart/uart_async_api/boards/samr21_xpro.overlay
similarity index 100%
rename from tests/drivers/uart/uart_async_api/boards/atsamr21_xpro.overlay
rename to tests/drivers/uart/uart_async_api/boards/samr21_xpro.overlay
diff --git a/tests/drivers/uart/uart_async_api/boards/atsamr34_xpro.overlay b/tests/drivers/uart/uart_async_api/boards/samr34_xpro.overlay
similarity index 100%
rename from tests/drivers/uart/uart_async_api/boards/atsamr34_xpro.overlay
rename to tests/drivers/uart/uart_async_api/boards/samr34_xpro.overlay
diff --git a/tests/drivers/uart/uart_async_api/testcase.yaml b/tests/drivers/uart/uart_async_api/testcase.yaml
index 2f1bffa4da8..4a4225dc22a 100644
--- a/tests/drivers/uart/uart_async_api/testcase.yaml
+++ b/tests/drivers/uart/uart_async_api/testcase.yaml
@@ -65,12 +65,12 @@ tests:
   drivers.uart.async_api.sam0:
     filter: CONFIG_SERIAL_SUPPORT_ASYNC and CONFIG_SOC_FAMILY_SAM0
     platform_allow:
-      - atsamc21n_xpro
-      - atsamd21_xpro
-      - atsaml21_xpro
-      - atsamr21_xpro
-      - atsamr34_xpro
-      - atsame54_xpro
+      - samc21n_xpro
+      - samd21_xpro
+      - saml21_xpro
+      - samr21_xpro
+      - samr34_xpro
+      - same54_xpro
     extra_configs:
       - CONFIG_UART_SAM0_ASYNC=y
       - CONFIG_DMA=y
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/src/main.c b/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
index aaf97ea8488..2f38354d21e 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
+++ b/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
@@ -19,11 +19,11 @@
 
 #if DT_NODE_EXISTS(DT_NODELABEL(dut))
 #define UART_NODE DT_NODELABEL(dut)
-#elif defined(CONFIG_BOARD_ATSAMD21_XPRO)
+#elif defined(CONFIG_BOARD_SAMD21_XPRO)
 #define UART_NODE DT_NODELABEL(sercom1)
-#elif defined(CONFIG_BOARD_ATSAMR21_XPRO)
+#elif defined(CONFIG_BOARD_SAMR21_XPRO)
 #define UART_NODE DT_NODELABEL(sercom3)
-#elif defined(CONFIG_BOARD_ATSAME54_XPRO)
+#elif defined(CONFIG_BOARD_SAME54_XPRO)
 #define UART_NODE DT_NODELABEL(sercom1)
 #else
 #define UART_NODE DT_CHOSEN(zephyr_console)