diff --git a/tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core_procpu.overlay b/tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core_procpu.overlay
deleted file mode 100644
index 64e50d19693..00000000000
--- a/tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core_procpu.overlay
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/pwm/pwm.h>
-
-/ {
-	pwm_loopback_0 {
-		compatible = "test-pwm-loopback";
-		/* first index must be a 32-Bit timer */
-		pwms = <&mcpwm0 0 0 PWM_POLARITY_NORMAL>,
-		       <&mcpwm0 6 0 PWM_POLARITY_NORMAL>;
-	};
-};
-
-&pinctrl {
-	mcpwm0_default: mcpwm0_default {
-		group1 {
-			pinmux = <MCPWM0_OUT0A_GPIO2>;
-			output-enable;
-		};
-		group2 {
-			pinmux = <MCPWM0_CAP0_GPIO4>;
-		};
-	};
-};
-
-&mcpwm0 {
-	pinctrl-0 = <&mcpwm0_default>;
-	pinctrl-names = "default";
-	prescale = <255>;
-	prescale-timer0 = <103>;
-	status = "okay";
-};
diff --git a/tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core_procpu_usb.overlay b/tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core_procpu_usb.overlay
deleted file mode 100644
index 64e50d19693..00000000000
--- a/tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core_procpu_usb.overlay
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/pwm/pwm.h>
-
-/ {
-	pwm_loopback_0 {
-		compatible = "test-pwm-loopback";
-		/* first index must be a 32-Bit timer */
-		pwms = <&mcpwm0 0 0 PWM_POLARITY_NORMAL>,
-		       <&mcpwm0 6 0 PWM_POLARITY_NORMAL>;
-	};
-};
-
-&pinctrl {
-	mcpwm0_default: mcpwm0_default {
-		group1 {
-			pinmux = <MCPWM0_OUT0A_GPIO2>;
-			output-enable;
-		};
-		group2 {
-			pinmux = <MCPWM0_CAP0_GPIO4>;
-		};
-	};
-};
-
-&mcpwm0 {
-	pinctrl-0 = <&mcpwm0_default>;
-	pinctrl-names = "default";
-	prescale = <255>;
-	prescale-timer0 = <103>;
-	status = "okay";
-};
diff --git a/tests/drivers/pwm/pwm_loopback/boards/esp32_devkitc_wrover_procpu.overlay b/tests/drivers/pwm/pwm_loopback/socs/esp32_procpu.overlay
similarity index 100%
rename from tests/drivers/pwm/pwm_loopback/boards/esp32_devkitc_wrover_procpu.overlay
rename to tests/drivers/pwm/pwm_loopback/socs/esp32_procpu.overlay
diff --git a/tests/drivers/pwm/pwm_loopback/boards/esp32s3_devkitm_procpu.overlay b/tests/drivers/pwm/pwm_loopback/socs/esp32s3_procpu.overlay
similarity index 100%
rename from tests/drivers/pwm/pwm_loopback/boards/esp32s3_devkitm_procpu.overlay
rename to tests/drivers/pwm/pwm_loopback/socs/esp32s3_procpu.overlay