diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index dd78674d9b2..e369c1afa24 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -3946,7 +3946,7 @@ Espressif Platforms:
     - dts/riscv/espressif/
     - dts/bindings/*/*esp32*
     - samples/boards/espressif/
-    - tests/boards/espressif_esp32/
+    - tests/boards/espressif/
     - drivers/*/*esp32*/
   labels:
     - "platform: ESP32"
diff --git a/tests/boards/espressif_esp32/cache_coex/CMakeLists.txt b/tests/boards/espressif/cache_coex/CMakeLists.txt
similarity index 100%
rename from tests/boards/espressif_esp32/cache_coex/CMakeLists.txt
rename to tests/boards/espressif/cache_coex/CMakeLists.txt
diff --git a/tests/boards/espressif_esp32/cache_coex/README.rst b/tests/boards/espressif/cache_coex/README.rst
similarity index 96%
rename from tests/boards/espressif_esp32/cache_coex/README.rst
rename to tests/boards/espressif/cache_coex/README.rst
index 12bd79143ff..7686f879233 100644
--- a/tests/boards/espressif_esp32/cache_coex/README.rst
+++ b/tests/boards/espressif/cache_coex/README.rst
@@ -25,7 +25,7 @@ Make sure you have the target connected over USB port.
 
 .. code-block:: console
 
-   west build -b <board> tests/boards/espressif_esp32/cache_coex
+   west build -b <board> tests/boards/espressif/cache_coex
    west flash && west espressif monitor
 
 Sample Output
diff --git a/tests/boards/espressif_esp32/cache_coex/prj.conf b/tests/boards/espressif/cache_coex/prj.conf
similarity index 100%
rename from tests/boards/espressif_esp32/cache_coex/prj.conf
rename to tests/boards/espressif/cache_coex/prj.conf
diff --git a/tests/boards/espressif_esp32/cache_coex/src/cache_coex.c b/tests/boards/espressif/cache_coex/src/cache_coex.c
similarity index 100%
rename from tests/boards/espressif_esp32/cache_coex/src/cache_coex.c
rename to tests/boards/espressif/cache_coex/src/cache_coex.c
diff --git a/tests/boards/espressif_esp32/cache_coex/testcase.yaml b/tests/boards/espressif/cache_coex/testcase.yaml
similarity index 100%
rename from tests/boards/espressif_esp32/cache_coex/testcase.yaml
rename to tests/boards/espressif/cache_coex/testcase.yaml
diff --git a/tests/boards/espressif_esp32/rtc_clk/CMakeLists.txt b/tests/boards/espressif/rtc_clk/CMakeLists.txt
similarity index 100%
rename from tests/boards/espressif_esp32/rtc_clk/CMakeLists.txt
rename to tests/boards/espressif/rtc_clk/CMakeLists.txt
diff --git a/tests/boards/espressif_esp32/rtc_clk/Kconfig b/tests/boards/espressif/rtc_clk/Kconfig
similarity index 100%
rename from tests/boards/espressif_esp32/rtc_clk/Kconfig
rename to tests/boards/espressif/rtc_clk/Kconfig
diff --git a/tests/boards/espressif_esp32/rtc_clk/README.rst b/tests/boards/espressif/rtc_clk/README.rst
similarity index 92%
rename from tests/boards/espressif_esp32/rtc_clk/README.rst
rename to tests/boards/espressif/rtc_clk/README.rst
index 5e48922de0e..8cd4853517e 100644
--- a/tests/boards/espressif_esp32/rtc_clk/README.rst
+++ b/tests/boards/espressif/rtc_clk/README.rst
@@ -25,20 +25,20 @@ Make sure you have the target connected over USB port.
 
 .. code-block:: console
 
-   west build -b <board> tests/boards/espressif_esp32/rtc_clk
+   west build -b <board> tests/boards/espressif/rtc_clk
    west flash && west espressif monitor
 
 To run the test with twister, use the following command:
 
 .. code-block:: console
 
-   west twister -p <board> --device-testing --device-serial=/dev/ttyUSB0 -vv --flash-before -T tests/boards/espressif_esp32/rtc_clk
+   west twister -p <board> --device-testing --device-serial=/dev/ttyUSB0 -vv --flash-before -T tests/boards/espressif/rtc_clk
 
 If the external 32K crystal is connect to pins 32K_XP and 32K_XN, the test can be run with ``external_xtal`` fixture enabled:
 
 .. code-block:: console
 
-	west twister -p esp32c3_devkitm --device-testing --device-serial=/dev/ttyUSB0 -vv --flash-before -T tests/boards/espressif_esp32/rtc_clk -X external_xtal
+	west twister -p esp32c3_devkitm --device-testing --device-serial=/dev/ttyUSB0 -vv --flash-before -T tests/boards/espressif/rtc_clk -X external_xtal
 
 Sample Output
 =============
diff --git a/tests/boards/espressif_esp32/rtc_clk/prj.conf b/tests/boards/espressif/rtc_clk/prj.conf
similarity index 100%
rename from tests/boards/espressif_esp32/rtc_clk/prj.conf
rename to tests/boards/espressif/rtc_clk/prj.conf
diff --git a/tests/boards/espressif_esp32/rtc_clk/src/rtc_clk_test.c b/tests/boards/espressif/rtc_clk/src/rtc_clk_test.c
similarity index 100%
rename from tests/boards/espressif_esp32/rtc_clk/src/rtc_clk_test.c
rename to tests/boards/espressif/rtc_clk/src/rtc_clk_test.c
diff --git a/tests/boards/espressif_esp32/rtc_clk/testcase.yaml b/tests/boards/espressif/rtc_clk/testcase.yaml
similarity index 100%
rename from tests/boards/espressif_esp32/rtc_clk/testcase.yaml
rename to tests/boards/espressif/rtc_clk/testcase.yaml