diff --git a/tools/unit-test-app/configs/default b/tools/unit-test-app/configs/default
index f7f508a43..572b6cd8b 100644
--- a/tools/unit-test-app/configs/default
+++ b/tools/unit-test-app/configs/default
@@ -1 +1 @@
-TEST_EXCLUDE_COMPONENTS=libsodium bt app_update
\ No newline at end of file
+TEST_COMPONENTS=freertos esp32 driver heap pthread soc spi_flash vfs
\ No newline at end of file
diff --git a/tools/unit-test-app/configs/default_2 b/tools/unit-test-app/configs/default_2
new file mode 100644
index 000000000..c02ec4789
--- /dev/null
+++ b/tools/unit-test-app/configs/default_2
@@ -0,0 +1 @@
+TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 driver heap pthread soc spi_flash vfs
\ No newline at end of file
diff --git a/tools/unit-test-app/configs/release b/tools/unit-test-app/configs/release
index d58d94997..75da1aa80 100644
--- a/tools/unit-test-app/configs/release
+++ b/tools/unit-test-app/configs/release
@@ -1,3 +1,3 @@
-TEST_EXCLUDE_COMPONENTS=bt app_update
+TEST_COMPONENTS=freertos esp32 driver heap pthread soc spi_flash vfs
 CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
diff --git a/tools/unit-test-app/configs/release_2 b/tools/unit-test-app/configs/release_2
new file mode 100644
index 000000000..c3e104675
--- /dev/null
+++ b/tools/unit-test-app/configs/release_2
@@ -0,0 +1,3 @@
+TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 driver heap pthread soc spi_flash vfs
+CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
diff --git a/tools/unit-test-app/configs/single_core b/tools/unit-test-app/configs/single_core
index 9c85abae6..40f7e98f2 100644
--- a/tools/unit-test-app/configs/single_core
+++ b/tools/unit-test-app/configs/single_core
@@ -1,4 +1,4 @@
-TEST_EXCLUDE_COMPONENTS=libsodium bt app_update
+TEST_COMPONENTS=freertos esp32 driver heap pthread soc spi_flash vfs
 CONFIG_MEMMAP_SMP=n
 CONFIG_FREERTOS_UNICORE=y
 CONFIG_ESP32_RTCDATA_IN_FAST_MEM=y
diff --git a/tools/unit-test-app/configs/single_core_2 b/tools/unit-test-app/configs/single_core_2
new file mode 100644
index 000000000..17910a066
--- /dev/null
+++ b/tools/unit-test-app/configs/single_core_2
@@ -0,0 +1,4 @@
+TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 driver heap pthread soc spi_flash vfs
+CONFIG_MEMMAP_SMP=n
+CONFIG_FREERTOS_UNICORE=y
+CONFIG_ESP32_RTCDATA_IN_FAST_MEM=y