diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 216be7f9ee..2a61af58d9 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -645,7 +645,7 @@ UT_001:
 
 UT_002:
   extends: .unit_test_esp32_template
-  parallel: 15
+  parallel: 21
   tags:
     - ESP32_IDF
     - UT_T1_1
diff --git a/tools/unit-test-app/configs/psram_all_ext_1 b/tools/unit-test-app/configs/psram_all_ext_1
new file mode 100644
index 0000000000..fed757531a
--- /dev/null
+++ b/tools/unit-test-app/configs/psram_all_ext_1
@@ -0,0 +1,8 @@
+CONFIG_IDF_TARGET="esp32"
+TEST_COMPONENTS=driver esp_hw_support esp_system esp_timer
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_ESP_INT_WDT_TIMEOUT_MS=800
+CONFIG_SPIRAM_OCCUPY_NO_HOST=y
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0
diff --git a/tools/unit-test-app/configs/psram_all_ext_2 b/tools/unit-test-app/configs/psram_all_ext_2
new file mode 100644
index 0000000000..b7ebb27f49
--- /dev/null
+++ b/tools/unit-test-app/configs/psram_all_ext_2
@@ -0,0 +1,8 @@
+CONFIG_IDF_TARGET="esp32"
+TEST_COMPONENTS=heap mbedtls soc spi_flash
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_ESP_INT_WDT_TIMEOUT_MS=800
+CONFIG_SPIRAM_OCCUPY_NO_HOST=y
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0