diff --git a/components/esp32s2beta/test/CMakeLists.txt b/components/esp32s2beta/test/CMakeLists.txt
index 1ced21ed8a..2a333b89f1 100644
--- a/components/esp32s2beta/test/CMakeLists.txt
+++ b/components/esp32s2beta/test/CMakeLists.txt
@@ -1,17 +1,19 @@
-set(COMPONENT_SRCDIRS ".")
-set(COMPONENT_ADD_INCLUDEDIRS ". ${CMAKE_CURRENT_BINARY_DIR}")
+if(IDF_TARGET STREQUAL "esp32s2beta")
+    idf_component_register(SRC_DIRS .
+                        INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR}
+                        REQUIRES unity test_utils nvs_flash ulp esp_common
+                        )
 
-set(COMPONENT_REQUIRES unity test_utils nvs_flash ulp esp_common)
+    add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h"
+                    COMMAND xxd -i "logo.jpg" "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h"
+                    WORKING_DIRECTORY ${COMPONENT_DIR}
+                    DEPENDS "${CMAKE_CURRENT_LIST_DIR}/logo.jpg")
 
-register_component()
+    add_custom_target(esp32s2beta_test_logo DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h")
 
-add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h"
-                COMMAND xxd -i "logo.jpg" "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h"
-                WORKING_DIRECTORY ${COMPONENT_DIR}
-                DEPENDS "${CMAKE_CURRENT_LIST_DIR}/logo.jpg")
+    add_dependencies(${COMPONENT_LIB} esp32s2beta_test_logo)
 
-add_custom_target(esp32_test_logo DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h")
+    idf_build_set_property(COMPILE_DEFINITIONS "-DESP_TIMER_DYNAMIC_OVERFLOW_VAL" APPEND)
+    target_link_libraries(${COMPONENT_LIB} INTERFACE "-u ld_include_test_dport_xt_highint5")
+endif()
 
-add_dependencies(${COMPONENT_LIB} esp32_test_logo)
-
-idf_build_set_property(COMPILE_DEFINITIONS "-DESP_TIMER_DYNAMIC_OVERFLOW_VAL" APPEND)
diff --git a/components/esp32s2beta/test/component.mk b/components/esp32s2beta/test/component.mk
index eefb592ac2..d4b5a9012f 100644
--- a/components/esp32s2beta/test/component.mk
+++ b/components/esp32s2beta/test/component.mk
@@ -4,7 +4,8 @@
 
 COMPONENT_EXTRA_CLEAN := test_tjpgd_logo.h
 
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
+COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive \
+                         -u ld_include_test_dport_xt_highint5 \
 
 COMPONENT_SRCDIRS := .
 
diff --git a/components/esp32s2beta/test/test_stack_check.c b/components/esp32s2beta/test/test_stack_check.c
index 0fa6c7bfed..abc36047b9 100644
--- a/components/esp32s2beta/test/test_stack_check.c
+++ b/components/esp32s2beta/test/test_stack_check.c
@@ -2,7 +2,7 @@
 
 #if CONFIG_COMPILER_STACK_CHECK
 
-static void recur_and_smash()
+static void recur_and_smash(void)
 {
     static int cnt;
     volatile uint8_t buf[50];
diff --git a/components/esp32s2beta/test/test_stack_check_cxx.cpp b/components/esp32s2beta/test/test_stack_check_cxx.cpp
index cb6e5a7701..83ca007d05 100644
--- a/components/esp32s2beta/test/test_stack_check_cxx.cpp
+++ b/components/esp32s2beta/test/test_stack_check_cxx.cpp
@@ -2,7 +2,7 @@
 
 #if CONFIG_COMPILER_STACK_CHECK
 
-static void recur_and_smash_cxx()
+static void recur_and_smash_cxx(void)
 {
     static int cnt;
     volatile uint8_t buf[50];
diff --git a/components/spi_flash/test/test_spi_flash.c b/components/spi_flash/test/test_spi_flash.c
index db1cc14210..f14c5d0346 100644
--- a/components/spi_flash/test/test_spi_flash.c
+++ b/components/spi_flash/test/test_spi_flash.c
@@ -19,7 +19,7 @@ struct flash_test_ctx {
 /* Base offset in flash for tests. */
 static size_t start;
 
-static void setup_tests()
+static void setup_tests(void)
 {
     if (start == 0) {
         const esp_partition_t *part = get_test_data_partition();
diff --git a/tools/unit-test-app/configs/default_2 b/tools/unit-test-app/configs/default_2
index c02ec4789c..689da576f0 100644
--- a/tools/unit-test-app/configs/default_2
+++ b/tools/unit-test-app/configs/default_2
@@ -1 +1 @@
-TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 driver heap pthread soc spi_flash vfs
\ No newline at end of file
+TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 esp32s2beta driver heap pthread soc spi_flash vfs
diff --git a/tools/unit-test-app/configs/default_2_s2 b/tools/unit-test-app/configs/default_2_s2
index c07c0833cf..74e8d8a15e 100644
--- a/tools/unit-test-app/configs/default_2_s2
+++ b/tools/unit-test-app/configs/default_2_s2
@@ -1,2 +1,2 @@
-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
+TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 esp32s2beta driver heap pthread soc spi_flash vfs
+CONFIG_IDF_TARGET="esp32s2beta"