diff --git a/samples/boards/esp32/deep_sleep/README.rst b/samples/boards/esp32/deep_sleep/README.rst
index a5de4def742326..ac73969915b3c3 100644
--- a/samples/boards/esp32/deep_sleep/README.rst
+++ b/samples/boards/esp32/deep_sleep/README.rst
@@ -51,7 +51,7 @@ Building, Flashing and Running
 
 .. zephyr-app-commands::
    :zephyr-app: samples/boards/esp32/deep_sleep
-   :board: esp32_devkitc_wroom
+   :board: esp32_devkitc_wroom/esp32/procpu
    :goals: build flash
    :compact:
 
diff --git a/samples/boards/esp32/ethernet/sample.yaml b/samples/boards/esp32/ethernet/sample.yaml
index 2280fec7c7c498..35f9b4a44afded 100644
--- a/samples/boards/esp32/ethernet/sample.yaml
+++ b/samples/boards/esp32/ethernet/sample.yaml
@@ -3,5 +3,5 @@ sample:
   name: ESP32 Ethernet
 tests:
   sample.board.esp32.ethernet:
-    platform_allow: esp32_ethernet_kit
+    platform_allow: esp32_ethernet_kit/esp32/procpu
     tags: esp32
diff --git a/samples/boards/esp32/flash_encryption/sample.yaml b/samples/boards/esp32/flash_encryption/sample.yaml
index 84749b9910884e..26e7f309f096f0 100644
--- a/samples/boards/esp32/flash_encryption/sample.yaml
+++ b/samples/boards/esp32/flash_encryption/sample.yaml
@@ -4,7 +4,7 @@ sample:
 tests:
   sample.board.esp32:
     platform_allow:
-      - esp32_devkitc_wroom
-      - esp32_devkitc_wrover
-      - yd_esp32
+      - esp32_devkitc_wroom/esp32/procpu
+      - esp32_devkitc_wrover/esp32/procpu
+      - yd_esp32/esp32/procpu
     tags: esp32
diff --git a/samples/boards/esp32/flash_memory_mapped/sample.yaml b/samples/boards/esp32/flash_memory_mapped/sample.yaml
index c8601961d94c33..83ccc9f4101af3 100644
--- a/samples/boards/esp32/flash_memory_mapped/sample.yaml
+++ b/samples/boards/esp32/flash_memory_mapped/sample.yaml
@@ -4,7 +4,7 @@ sample:
 tests:
   sample.board.esp32.flash_memory_mapped:
     platform_allow:
-      - esp32_devkitc_wroom
+      - esp32_devkitc_wroom/esp32/procpu
       - esp32c3_devkitm
-      - esp32s3_devkitm
+      - esp32s3_devkitm/esp32s3/procpu
     tags: esp32
diff --git a/samples/boards/esp32/light_sleep/README.rst b/samples/boards/esp32/light_sleep/README.rst
index 581e9a352b950a..72f58c2b418051 100644
--- a/samples/boards/esp32/light_sleep/README.rst
+++ b/samples/boards/esp32/light_sleep/README.rst
@@ -31,7 +31,7 @@ Building, Flashing and Running
 
 .. zephyr-app-commands::
    :zephyr-app: samples/boards/esp32/light_sleep
-   :board: esp32_devkitc_wroom
+   :board: esp32_devkitc_wroom/esp32/procpu
    :goals: build flash
    :compact:
 
diff --git a/samples/boards/esp32/spiram_test/sample.yaml b/samples/boards/esp32/spiram_test/sample.yaml
index d8cbfaa62d7868..20c01a3028ac2b 100644
--- a/samples/boards/esp32/spiram_test/sample.yaml
+++ b/samples/boards/esp32/spiram_test/sample.yaml
@@ -3,5 +3,5 @@ sample:
   name: spiram_test
 tests:
   sample.board.esp32.spiram:
-    platform_allow: esp32_devkitc_wrover
+    platform_allow: esp32_devkitc_wrover/esp32/procpu
     tags: esp32
diff --git a/samples/drivers/adc/sample.yaml b/samples/drivers/adc/sample.yaml
index cda91c23287c78..7b523ea062cc0f 100644
--- a/samples/drivers/adc/sample.yaml
+++ b/samples/drivers/adc/sample.yaml
@@ -20,8 +20,8 @@ tests:
       - gd32f450i_eval
       - gd32vf103v_eval
       - gd32f403z_eval
-      - esp32_devkitc_wroom
-      - esp32_devkitc_wrover
+      - esp32_devkitc_wroom/esp32/procpu
+      - esp32_devkitc_wrover/esp32/procpu
       - esp32s2_saola
       - esp32c3_devkitm
       - gd32l233r_eval
diff --git a/samples/drivers/dac/sample.yaml b/samples/drivers/dac/sample.yaml
index ebecc66ea7d3da..5e7f42e907db55 100644
--- a/samples/drivers/dac/sample.yaml
+++ b/samples/drivers/dac/sample.yaml
@@ -11,8 +11,8 @@ tests:
       - bl654_dvk
       - bl5340_dvk/nrf5340/cpuapp
       - disco_l475_iot1
-      - esp32_devkitc_wroom
-      - esp32_devkitc_wrover
+      - esp32_devkitc_wroom/esp32/procpu
+      - esp32_devkitc_wrover/esp32/procpu
       - esp32s2_saola
       - frdm_k22f
       - frdm_k64f
diff --git a/tests/boards/espressif_esp32/cache_coex/testcase.yaml b/tests/boards/espressif_esp32/cache_coex/testcase.yaml
index 063d4e9fb3b0e4..a7205b75cd20a7 100644
--- a/tests/boards/espressif_esp32/cache_coex/testcase.yaml
+++ b/tests/boards/espressif_esp32/cache_coex/testcase.yaml
@@ -1,9 +1,9 @@
 tests:
   boards.esp32.cache_coex:
     platform_allow:
-      - esp32_devkitc_wrover
+      - esp32_devkitc_wrover/esp32/procpu
       - esp32s2_saola
-      - esp32s3_devkitm
+      - esp32s3_devkitm/esp32s3/procpu
     tags:
       - spiram
       - spiflash
diff --git a/tests/drivers/build_all/gpio/testcase.yaml b/tests/drivers/build_all/gpio/testcase.yaml
index ba9ec1a4987b13..b3f761413962d0 100644
--- a/tests/drivers/build_all/gpio/testcase.yaml
+++ b/tests/drivers/build_all/gpio/testcase.yaml
@@ -26,7 +26,7 @@ tests:
 
   drivers.gpio.build.adc_ads1145s0x_gpio:
     min_ram: 32
-    platform_allow: m5stack_core2 nrf52840dk/nrf52840
+    platform_allow: m5stack_core2/esp32/procpu nrf52840dk/nrf52840
     depends_on:
       - gpio
       - adc
diff --git a/tests/drivers/can/api/testcase.yaml b/tests/drivers/can/api/testcase.yaml
index 9ee9777fcef177..75bb509f827efb 100644
--- a/tests/drivers/can/api/testcase.yaml
+++ b/tests/drivers/can/api/testcase.yaml
@@ -16,12 +16,12 @@ tests:
     extra_args: DTC_OVERLAY_FILE=twai-enable.overlay
     filter: dt_compat_enabled("espressif,esp32-twai")
     platform_allow:
-      - esp32_devkitc_wroom
-      - esp32_devkitc_wrover
+      - esp32_devkitc_wroom/esp32/procpu
+      - esp32_devkitc_wrover/esp32/procpu
       - esp32c3_devkitm
       - esp32s2_saola
-      - esp32s3_devkitm
-      - xiao_esp32s3
+      - esp32s3_devkitm/esp32s3/procpu
+      - xiao_esp32s3/esp32s3/procpu
   drivers.can.api.nxp_s32_canxl.non_rx_fifo:
     extra_configs:
       - CONFIG_CAN_NXP_S32_RX_FIFO=n
diff --git a/tests/subsys/debug/coredump_backends/testcase.yaml b/tests/subsys/debug/coredump_backends/testcase.yaml
index d7b5f722f3783a..ff4109f9d50c37 100644
--- a/tests/subsys/debug/coredump_backends/testcase.yaml
+++ b/tests/subsys/debug/coredump_backends/testcase.yaml
@@ -19,10 +19,10 @@ tests:
       - CONFIG_TEST_STORED_COREDUMP=y
     platform_allow:
       - qemu_x86
-      - esp32_devkitc_wroom
-      - esp32_devkitc_wrover
+      - esp32_devkitc_wroom/esp32/procpu
+      - esp32_devkitc_wrover/esp32/procpu
       - esp32s2_saola
-      - esp32s3_devkitm
+      - esp32s3_devkitm/esp32s3/procpu
       - esp32c3_devkitm
   debug.coredump.backends.other:
     filter: CONFIG_ARCH_SUPPORTS_COREDUMP