diff --git a/tools/unit-test-app/configs/default_s2 b/tools/unit-test-app/configs/default_s2_1
similarity index 62%
rename from tools/unit-test-app/configs/default_s2
rename to tools/unit-test-app/configs/default_s2_1
index 424ab33ff6..41177c52bd 100644
--- a/tools/unit-test-app/configs/default_s2
+++ b/tools/unit-test-app/configs/default_s2_1
@@ -1,3 +1,3 @@
 # This config is split between targets since different component needs to be included (esp32, esp32s2)
 CONFIG_IDF_TARGET="esp32s2"
-TEST_COMPONENTS=freertos esp32s2 esp_timer driver heap pthread soc spi_flash vfs
\ No newline at end of file
+TEST_COMPONENTS=freertos esp32s2 esp_timer driver heap
\ No newline at end of file
diff --git a/tools/unit-test-app/configs/default_s2_2 b/tools/unit-test-app/configs/default_s2_2
new file mode 100644
index 0000000000..a86cee8ca0
--- /dev/null
+++ b/tools/unit-test-app/configs/default_s2_2
@@ -0,0 +1,3 @@
+# This config is split between targets since different component needs to be included (esp32, esp32s2)
+CONFIG_IDF_TARGET="esp32s2"
+TEST_COMPONENTS=pthread soc spi_flash vfs
\ No newline at end of file
diff --git a/tools/unit-test-app/configs/single_core_s2 b/tools/unit-test-app/configs/single_core_s2
index 8607b815b1..5b47520d6c 100644
--- a/tools/unit-test-app/configs/single_core_s2
+++ b/tools/unit-test-app/configs/single_core_s2
@@ -1,6 +1,4 @@
 # This config is split between targets since different component needs to be included (esp32, esp32s2)
 CONFIG_IDF_TARGET="esp32s2"
-TEST_COMPONENTS=freertos esp32s2 esp_timer driver heap pthread soc spi_flash vfs test_utils
-CONFIG_MEMMAP_SMP=n
-CONFIG_FREERTOS_UNICORE=y
+TEST_COMPONENTS=esp32s2 esp_timer driver heap soc spi_flash test_utils
 CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y