diff --git a/tests/arch/arm/arm_thread_swap_tz/boards/nucleo_l552ze_q_ns.overlay b/tests/arch/arm/arm_thread_swap_tz/boards/nucleo_l552ze_q_ns.overlay
index 31eb8025aae..ec5ed99b671 100644
--- a/tests/arch/arm/arm_thread_swap_tz/boards/nucleo_l552ze_q_ns.overlay
+++ b/tests/arch/arm/arm_thread_swap_tz/boards/nucleo_l552ze_q_ns.overlay
@@ -6,14 +6,10 @@
 
 
  /* This partition table should be used along with TFM configuration:
-  * - TFM_PSA_API=ON (IPC)
-  * - ISOLATION_LEVEL 2
-  * - TEST_S=ON (REGRESSION)
-  * - TEST_NS=ON (REGRESSION)
+  * - TEST_S=OFF (NO REGRESSION)
   *
-  * In this configuration, TFM binary includes tests. As a consequence,
-  * its size is bloated and it is not possible to set secondary partitions
-  * for secured or non secured images.
+  * In this configuration, TFM binary does not include tests.
+  * The partition sizes are compatible with TF-M platform flash_layout.h.
   */
 
 / {
@@ -37,12 +33,12 @@
 		/* Secure image primary slot */
 		slot0_partition: partition@00013000 {
 			label = "image-0";
-			reg = <0x00013000 0x00038000>;
+			reg = <0x00013000 0x0002A000>;
 		};
 		/* Non-secure image primary slot */
-		slot1_partition: partition@0004B000 {
+		slot1_partition: partition@40000 {
 			label = "image-1";
-			reg = <0x0004B000 0x0002A000>;
+			reg = <0x00040000 0x00009000>;
 		};
 		/*
 		 * The flash starting at 0x7F000 and ending at
diff --git a/tests/arch/arm/arm_thread_swap_tz/boards/stm32l562e_dk_ns.overlay b/tests/arch/arm/arm_thread_swap_tz/boards/stm32l562e_dk_ns.overlay
index 49444e19db9..de175a78ebd 100644
--- a/tests/arch/arm/arm_thread_swap_tz/boards/stm32l562e_dk_ns.overlay
+++ b/tests/arch/arm/arm_thread_swap_tz/boards/stm32l562e_dk_ns.overlay
@@ -5,14 +5,10 @@
  */
 
  /* This partition table should be used along with TFM configuration:
-  * - TFM_PSA_API=ON (IPC)
-  * - ISOLATION_LEVEL 2
-  * - TEST_S=ON (REGRESSION)
-  * - TEST_NS=OFF (By default)
+  * - TEST_S=OFF (NO REGRESSION)
   *
-  * In this configuration, TFM binary includes tests. As a consequence,
-  * its size is bloated and it is not possible to set secondary partitions
-  * for secured or non secured images.
+  * In this configuration, TFM binary does not include tests.
+  * The partition sizes are compatible with TF-M platform flash_layout.h.
   */
 
 / {