diff --git a/tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core.conf b/tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core.conf
deleted file mode 100644
index 3438f794f66ae82..000000000000000
--- a/tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_SPI_ESP32_INTERRUPT=y
-CONFIG_HEAP_MEM_POOL_SIZE=32768
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core.overlay b/tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core.overlay
deleted file mode 100644
index 8e5037e76911b4a..000000000000000
--- a/tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core.overlay
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2022 Kumar Gala <galak@kernel.org>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	spim2_loopback: spim2_loopback {
-		group1 {
-			pinmux = <SPIM2_MISO_GPIO2>;
-			output-enable; /* Enable internal loopback */
-		};
-		group2 {
-			pinmux = <SPIM2_MOSI_GPIO2>;
-			input-enable; /* Enable internal loopback */
-		};
-		group3 {
-			pinmux = <SPIM2_SCLK_GPIO6>,
-				<SPIM2_CSEL_GPIO10>;
-		};
-	};
-};
-
-&spi2 {
-	slow@0 {
-		compatible = "test-spi-loopback-slow";
-		reg = <0>;
-		spi-max-frequency = <500000>;
-	};
-	fast@0 {
-		compatible = "test-spi-loopback-fast";
-		reg = <0>;
-		spi-max-frequency = <16000000>;
-	};
-};
-
-&spi2 {
-	dma-enabled;
-	pinctrl-0 = <&spim2_loopback>;
-};
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core_esp32c3_usb.conf b/tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core_esp32c3_usb.conf
deleted file mode 100644
index 3438f794f66ae82..000000000000000
--- a/tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core_esp32c3_usb.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_SPI_ESP32_INTERRUPT=y
-CONFIG_HEAP_MEM_POOL_SIZE=32768
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core_esp32c3_usb.overlay
deleted file mode 100644
index 8e5037e76911b4a..000000000000000
--- a/tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core_esp32c3_usb.overlay
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2022 Kumar Gala <galak@kernel.org>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	spim2_loopback: spim2_loopback {
-		group1 {
-			pinmux = <SPIM2_MISO_GPIO2>;
-			output-enable; /* Enable internal loopback */
-		};
-		group2 {
-			pinmux = <SPIM2_MOSI_GPIO2>;
-			input-enable; /* Enable internal loopback */
-		};
-		group3 {
-			pinmux = <SPIM2_SCLK_GPIO6>,
-				<SPIM2_CSEL_GPIO10>;
-		};
-	};
-};
-
-&spi2 {
-	slow@0 {
-		compatible = "test-spi-loopback-slow";
-		reg = <0>;
-		spi-max-frequency = <500000>;
-	};
-	fast@0 {
-		compatible = "test-spi-loopback-fast";
-		reg = <0>;
-		spi-max-frequency = <16000000>;
-	};
-};
-
-&spi2 {
-	dma-enabled;
-	pinctrl-0 = <&spim2_loopback>;
-};
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm_procpu.overlay b/tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm_procpu.overlay
deleted file mode 100644
index ce9c8e7891b5624..000000000000000
--- a/tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm_procpu.overlay
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2022 Kumar Gala <galak@kernel.org>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	spim3_loopback: spim3_loopback {
-		group1 {
-			pinmux = <SPIM3_MISO_GPIO37>;
-			output-enable; /* Enable internal loopback */
-		};
-		group2 {
-			pinmux = <SPIM3_MOSI_GPIO37>;
-			input-enable; /* Enable internal loopback */
-		};
-		group3 {
-			pinmux = <SPIM3_SCLK_GPIO36>,
-				<SPIM3_CSEL_GPIO38>;
-		};
-	};
-};
-
-&spi3 {
-	slow@0 {
-		compatible = "test-spi-loopback-slow";
-		reg = <0>;
-		spi-max-frequency = <100000>;
-	};
-	fast@0 {
-		compatible = "test-spi-loopback-fast";
-		reg = <0>;
-		spi-max-frequency = <16000000>;
-	};
-};
-
-&spi3 {
-	dma-enabled;
-	pinctrl-0 = <&spim3_loopback>;
-};
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu.conf b/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu.conf
deleted file mode 100644
index fb0909611c8922a..000000000000000
--- a/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_ESP32_INTERRUPT=y
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu.overlay b/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu.overlay
deleted file mode 100644
index ce9c8e7891b5624..000000000000000
--- a/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu.overlay
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2022 Kumar Gala <galak@kernel.org>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	spim3_loopback: spim3_loopback {
-		group1 {
-			pinmux = <SPIM3_MISO_GPIO37>;
-			output-enable; /* Enable internal loopback */
-		};
-		group2 {
-			pinmux = <SPIM3_MOSI_GPIO37>;
-			input-enable; /* Enable internal loopback */
-		};
-		group3 {
-			pinmux = <SPIM3_SCLK_GPIO36>,
-				<SPIM3_CSEL_GPIO38>;
-		};
-	};
-};
-
-&spi3 {
-	slow@0 {
-		compatible = "test-spi-loopback-slow";
-		reg = <0>;
-		spi-max-frequency = <100000>;
-	};
-	fast@0 {
-		compatible = "test-spi-loopback-fast";
-		reg = <0>;
-		spi-max-frequency = <16000000>;
-	};
-};
-
-&spi3 {
-	dma-enabled;
-	pinctrl-0 = <&spim3_loopback>;
-};
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu_usb.conf b/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu_usb.conf
deleted file mode 100644
index fb0909611c8922a..000000000000000
--- a/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu_usb.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_ESP32_INTERRUPT=y
diff --git a/tests/drivers/spi/spi_loopback/boards/yd_esp32_procpu.conf b/tests/drivers/spi/spi_loopback/boards/yd_esp32_procpu.conf
deleted file mode 100644
index fb0909611c8922a..000000000000000
--- a/tests/drivers/spi/spi_loopback/boards/yd_esp32_procpu.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_ESP32_INTERRUPT=y
diff --git a/tests/drivers/spi/spi_loopback/boards/yd_esp32_procpu.overlay b/tests/drivers/spi/spi_loopback/boards/yd_esp32_procpu.overlay
deleted file mode 100644
index b2af8bbf3cb2241..000000000000000
--- a/tests/drivers/spi/spi_loopback/boards/yd_esp32_procpu.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2022 Kumar Gala <galak@kernel.org>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	spim3_loopback: spim3_loopback {
-		group1 {
-			pinmux = <SPIM3_MISO_GPIO19>;
-			output-enable; /* Enable internal loopback */
-		};
-		group2 {
-			pinmux = <SPIM3_MOSI_GPIO19>;
-			input-enable; /* Enable internal loopback */
-		};
-		group3 {
-			pinmux = <SPIM3_SCLK_GPIO18>,
-				<SPIM3_CSEL_GPIO5>;
-		};
-	};
-};
-
-&spi3 {
-	slow@0 {
-		compatible = "test-spi-loopback-slow";
-		reg = <0>;
-		spi-max-frequency = <500000>;
-	};
-	fast@0 {
-		compatible = "test-spi-loopback-fast";
-		reg = <0>;
-		spi-max-frequency = <16000000>;
-	};
-};
-
-&spi3 {
-	dma-enabled;
-	pinctrl-0 = <&spim3_default>;
-
-};
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom_procpu.conf b/tests/drivers/spi/spi_loopback/socs/esp32_procpu.conf
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom_procpu.conf
rename to tests/drivers/spi/spi_loopback/socs/esp32_procpu.conf
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom_procpu.overlay b/tests/drivers/spi/spi_loopback/socs/esp32_procpu.overlay
similarity index 88%
rename from tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom_procpu.overlay
rename to tests/drivers/spi/spi_loopback/socs/esp32_procpu.overlay
index f2dcccfb7bf1357..a4ae3f9e08edd86 100644
--- a/tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom_procpu.overlay
+++ b/tests/drivers/spi/spi_loopback/socs/esp32_procpu.overlay
@@ -35,7 +35,10 @@
 };
 
 &spi3 {
+	#address-cells = <1>;
+	#size-cells = <0>;
 	dma-enabled;
 	pinctrl-0 = <&spim3_loopback>;
-
+	pinctrl-names = "loopback";
+	status = "okay";
 };
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32c3_devkitm.conf b/tests/drivers/spi/spi_loopback/socs/esp32c3.conf
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/esp32c3_devkitm.conf
rename to tests/drivers/spi/spi_loopback/socs/esp32c3.conf
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32c3_devkitm.overlay b/tests/drivers/spi/spi_loopback/socs/esp32c3.overlay
similarity index 88%
rename from tests/drivers/spi/spi_loopback/boards/esp32c3_devkitm.overlay
rename to tests/drivers/spi/spi_loopback/socs/esp32c3.overlay
index 8e5037e76911b4a..07882f6c44d17fc 100644
--- a/tests/drivers/spi/spi_loopback/boards/esp32c3_devkitm.overlay
+++ b/tests/drivers/spi/spi_loopback/socs/esp32c3.overlay
@@ -35,6 +35,10 @@
 };
 
 &spi2 {
+	#address-cells = <1>;
+	#size-cells = <0>;
 	dma-enabled;
 	pinctrl-0 = <&spim2_loopback>;
+	pinctrl-names = "loopback";
+	status = "okay";
 };
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s2_saola.conf b/tests/drivers/spi/spi_loopback/socs/esp32s2.conf
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/esp32s2_saola.conf
rename to tests/drivers/spi/spi_loopback/socs/esp32s2.conf
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s2_saola.overlay b/tests/drivers/spi/spi_loopback/socs/esp32s2.overlay
similarity index 88%
rename from tests/drivers/spi/spi_loopback/boards/esp32s2_saola.overlay
rename to tests/drivers/spi/spi_loopback/socs/esp32s2.overlay
index f50a945e55895cf..25c78bb9fcb3aec 100644
--- a/tests/drivers/spi/spi_loopback/boards/esp32s2_saola.overlay
+++ b/tests/drivers/spi/spi_loopback/socs/esp32s2.overlay
@@ -35,6 +35,10 @@
 };
 
 &spi3 {
+	#address-cells = <1>;
+	#size-cells = <0>;
 	dma-enabled;
 	pinctrl-0 = <&spim3_loopback>;
+	pinctrl-names = "loopback";
+	status = "okay";
 };
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm_procpu.conf b/tests/drivers/spi/spi_loopback/socs/esp32s3_procpu.conf
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm_procpu.conf
rename to tests/drivers/spi/spi_loopback/socs/esp32s3_procpu.conf
diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu_usb.overlay b/tests/drivers/spi/spi_loopback/socs/esp32s3_procpu.overlay
similarity index 88%
rename from tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu_usb.overlay
rename to tests/drivers/spi/spi_loopback/socs/esp32s3_procpu.overlay
index ce9c8e7891b5624..582221ee4d069c4 100644
--- a/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu_usb.overlay
+++ b/tests/drivers/spi/spi_loopback/socs/esp32s3_procpu.overlay
@@ -35,6 +35,10 @@
 };
 
 &spi3 {
+	#address-cells = <1>;
+	#size-cells = <0>;
 	dma-enabled;
 	pinctrl-0 = <&spim3_loopback>;
+	pinctrl-names = "loopback";
+	status = "okay";
 };