diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index edf2d4572..17ba8c9f6 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -458,13 +458,6 @@ UT_034:
     - ESP32_IDF
     - UT_T1_ESP_FLASH
 
-UT_035:
-  extends: .unit_test_template
-  parallel: 24
-  tags:
-    - ESP32S2BETA_IDF
-    - UT_T1_1
-
 UT_036:
   extends: .unit_test_template
   tags:
@@ -472,12 +465,6 @@ UT_036:
     - UT_T1_PSRAMV0
     - psram
 
-UT_037:
-  extends: .unit_test_template
-  tags:
-    - ESP32S2BETA_IDF
-    - UT_T1_LEDC
-
 UT_041:
   extends: .unit_test_template
   tags:
diff --git a/tools/unit-test-app/configs/aes_no_hw_s2 b/tools/unit-test-app/configs/aes_no_hw_s2
deleted file mode 100644
index 3a1d6d71c..000000000
--- a/tools/unit-test-app/configs/aes_no_hw_s2
+++ /dev/null
@@ -1,4 +0,0 @@
-TEST_EXCLUDE_COMPONENTS=libsodium bt app_update test_utils
-TEST_COMPONENTS=mbedtls
-CONFIG_MBEDTLS_HARDWARE_AES=n
-CONFIG_IDF_TARGET="esp32s2beta"
diff --git a/tools/unit-test-app/configs/default_2_s2 b/tools/unit-test-app/configs/default_2_s2
deleted file mode 100644
index c07c0833c..000000000
--- a/tools/unit-test-app/configs/default_2_s2
+++ /dev/null
@@ -1,2 +0,0 @@
-TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2beta driver heap pthread soc spi_flash vfs
-CONFIG_IDF_TARGET="esp32s2beta"
\ No newline at end of file
diff --git a/tools/unit-test-app/configs/default_s2 b/tools/unit-test-app/configs/default_s2
deleted file mode 100644
index e55c68be0..000000000
--- a/tools/unit-test-app/configs/default_s2
+++ /dev/null
@@ -1,2 +0,0 @@
-TEST_COMPONENTS=freertos esp32s2beta driver heap pthread soc spi_flash vfs
-CONFIG_IDF_TARGET="esp32s2beta"
\ No newline at end of file
diff --git a/tools/unit-test-app/configs/freertos_compliance_s2 b/tools/unit-test-app/configs/freertos_compliance_s2
deleted file mode 100644
index e94fa8863..000000000
--- a/tools/unit-test-app/configs/freertos_compliance_s2
+++ /dev/null
@@ -1,3 +0,0 @@
-TEST_COMPONENTS=driver esp32s2beta spi_flash
-CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=y
-CONFIG_IDF_TARGET="esp32s2beta"
diff --git a/tools/unit-test-app/configs/libsodium_s2 b/tools/unit-test-app/configs/libsodium_s2
deleted file mode 100644
index 9485da494..000000000
--- a/tools/unit-test-app/configs/libsodium_s2
+++ /dev/null
@@ -1,4 +0,0 @@
-TEST_COMPONENTS=libsodium
-TEST_EXCLUDE_COMPONENTS=bt app_update
-CONFIG_UNITY_FREERTOS_STACK_SIZE=12288
-CONFIG_IDF_TARGET="esp32s2beta"
\ No newline at end of file
diff --git a/tools/unit-test-app/configs/release_2_s2 b/tools/unit-test-app/configs/release_2_s2
deleted file mode 100644
index e385a715f..000000000
--- a/tools/unit-test-app/configs/release_2_s2
+++ /dev/null
@@ -1,5 +0,0 @@
-TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2beta driver heap pthread soc spi_flash vfs test_utils
-CONFIG_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
-CONFIG_IDF_TARGET="esp32s2beta"
diff --git a/tools/unit-test-app/configs/release_s2 b/tools/unit-test-app/configs/release_s2
deleted file mode 100644
index f9268fe93..000000000
--- a/tools/unit-test-app/configs/release_s2
+++ /dev/null
@@ -1,5 +0,0 @@
-TEST_COMPONENTS=freertos esp32s2beta driver heap pthread soc spi_flash vfs
-CONFIG_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
-CONFIG_IDF_TARGET="esp32s2beta"
diff --git a/tools/unit-test-app/configs/single_core_2_s2 b/tools/unit-test-app/configs/single_core_2_s2
deleted file mode 100644
index b9bbf882d..000000000
--- a/tools/unit-test-app/configs/single_core_2_s2
+++ /dev/null
@@ -1,5 +0,0 @@
-TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2beta driver heap pthread soc spi_flash vfs
-CONFIG_MEMMAP_SMP=n
-CONFIG_FREERTOS_UNICORE=y
-CONFIG_ESP32_RTCDATA_IN_FAST_MEM=y
-CONFIG_IDF_TARGET="esp32s2beta"
diff --git a/tools/unit-test-app/configs/single_core_s2 b/tools/unit-test-app/configs/single_core_s2
deleted file mode 100644
index 9a7da0e13..000000000
--- a/tools/unit-test-app/configs/single_core_s2
+++ /dev/null
@@ -1,5 +0,0 @@
-TEST_COMPONENTS=freertos esp32s2beta driver heap pthread soc spi_flash vfs test_utils
-CONFIG_MEMMAP_SMP=n
-CONFIG_FREERTOS_UNICORE=y
-CONFIG_ESP32_RTCDATA_IN_FAST_MEM=y
-CONFIG_IDF_TARGET="esp32s2beta"
diff --git a/tools/unit-test-app/configs/spi_flash_legacy_s2 b/tools/unit-test-app/configs/spi_flash_legacy_s2
deleted file mode 100644
index 7da54e6ba..000000000
--- a/tools/unit-test-app/configs/spi_flash_legacy_s2
+++ /dev/null
@@ -1,4 +0,0 @@
-TEST_COMPONENTS=spi_flash
-CONFIG_ESP32_SPIRAM_SUPPORT=y
-CONFIG_SPI_FLASH_USE_LEGACY_IMPL=y
-CONFIG_IDF_TARGET="esp32s2beta"
diff --git a/tools/unit-test-app/configs/test_utils_s2 b/tools/unit-test-app/configs/test_utils_s2
deleted file mode 100644
index 1a16c517b..000000000
--- a/tools/unit-test-app/configs/test_utils_s2
+++ /dev/null
@@ -1,5 +0,0 @@
-# The test is isolated as it requires particular memory layout
-TEST_COMPONENTS=test_utils
-CONFIG_ESP_IPC_TASK_STACK_SIZE=2048
-CONFIG_IDF_TARGET="esp32s2beta"
-