diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5/CMakeLists.txt b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/CMakeLists.txt
similarity index 100%
rename from tests/drivers/clock_control/stm32_clock_configuration/stm32u5/CMakeLists.txt
rename to tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/CMakeLists.txt
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/clear_clocks.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/clear_clocks.overlay
similarity index 100%
rename from tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/clear_clocks.overlay
rename to tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/clear_clocks.overlay
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/msis_24.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/msis_24.overlay
similarity index 100%
rename from tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/msis_24.overlay
rename to tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/msis_24.overlay
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/msis_48.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/msis_48.overlay
similarity index 100%
rename from tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/msis_48.overlay
rename to tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/msis_48.overlay
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/pll_hse_160.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/pll_hse_160.overlay
similarity index 100%
rename from tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/pll_hse_160.overlay
rename to tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/pll_hse_160.overlay
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/pll_hsi_160.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/pll_hsi_160.overlay
similarity index 100%
rename from tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/pll_hsi_160.overlay
rename to tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/pll_hsi_160.overlay
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/pll_hsi_40.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/pll_hsi_40.overlay
similarity index 100%
rename from tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/pll_hsi_40.overlay
rename to tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/pll_hsi_40.overlay
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/pll_msis_160.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/pll_msis_160.overlay
similarity index 100%
rename from tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/pll_msis_160.overlay
rename to tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/pll_msis_160.overlay
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/pll_msis_80.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/pll_msis_80.overlay
similarity index 100%
rename from tests/drivers/clock_control/stm32_clock_configuration/stm32u5/boards/pll_msis_80.overlay
rename to tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/boards/pll_msis_80.overlay
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5/prj.conf b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/prj.conf
similarity index 100%
rename from tests/drivers/clock_control/stm32_clock_configuration/stm32u5/prj.conf
rename to tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/prj.conf
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5/src/test_stm32_clock_configuration.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/src/test_stm32_clock_configuration.c
similarity index 100%
rename from tests/drivers/clock_control/stm32_clock_configuration/stm32u5/src/test_stm32_clock_configuration.c
rename to tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/src/test_stm32_clock_configuration.c
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32u5/testcase.yaml b/tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/testcase.yaml
similarity index 100%
rename from tests/drivers/clock_control/stm32_clock_configuration/stm32u5/testcase.yaml
rename to tests/drivers/clock_control/stm32_clock_configuration/stm32u5_core/testcase.yaml