diff --git a/components/esp32/test/test_stack_check_cxx.cpp b/components/cxx/test/test_stack_check_cxx.cpp
similarity index 100%
rename from components/esp32/test/test_stack_check_cxx.cpp
rename to components/cxx/test/test_stack_check_cxx.cpp
diff --git a/components/esp32c3/test/test_stack_check.c b/components/esp32c3/test/test_stack_check.c
deleted file mode 100644
index abc36047b9..0000000000
--- a/components/esp32c3/test/test_stack_check.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "unity.h"
-
-#if CONFIG_COMPILER_STACK_CHECK
-
-static void recur_and_smash(void)
-{
-    static int cnt;
-    volatile uint8_t buf[50];
-    volatile int num = sizeof(buf)+10;
-
-    if (cnt++ < 1) {
-        recur_and_smash();
-    }
-    for (int i = 0; i < num; i++) {
-        buf[i] = 0;
-    }
-}
-
-
-TEST_CASE("stack smashing protection", "[stack_check] [ignore]")
-{
-    recur_and_smash();
-}
-
-#endif
diff --git a/components/esp32c3/test/test_stack_check_cxx.cpp b/components/esp32c3/test/test_stack_check_cxx.cpp
deleted file mode 100644
index 83ca007d05..0000000000
--- a/components/esp32c3/test/test_stack_check_cxx.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "unity.h"
-
-#if CONFIG_COMPILER_STACK_CHECK
-
-static void recur_and_smash_cxx(void)
-{
-    static int cnt;
-    volatile uint8_t buf[50];
-    volatile int num = sizeof(buf)+10;
-
-    if (cnt++ < 1) {
-        recur_and_smash_cxx();
-    }
-    for (int i = 0; i < num; i++) {
-        buf[i] = 0;
-    }
-}
-
-
-TEST_CASE("stack smashing protection CXX", "[stack_check] [ignore]")
-{
-    recur_and_smash_cxx();
-}
-
-#endif
diff --git a/components/esp32s2/test/test_stack_check.c b/components/esp32s2/test/test_stack_check.c
deleted file mode 100644
index abc36047b9..0000000000
--- a/components/esp32s2/test/test_stack_check.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "unity.h"
-
-#if CONFIG_COMPILER_STACK_CHECK
-
-static void recur_and_smash(void)
-{
-    static int cnt;
-    volatile uint8_t buf[50];
-    volatile int num = sizeof(buf)+10;
-
-    if (cnt++ < 1) {
-        recur_and_smash();
-    }
-    for (int i = 0; i < num; i++) {
-        buf[i] = 0;
-    }
-}
-
-
-TEST_CASE("stack smashing protection", "[stack_check] [ignore]")
-{
-    recur_and_smash();
-}
-
-#endif
diff --git a/components/esp32s2/test/test_stack_check_cxx.cpp b/components/esp32s2/test/test_stack_check_cxx.cpp
deleted file mode 100644
index 83ca007d05..0000000000
--- a/components/esp32s2/test/test_stack_check_cxx.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "unity.h"
-
-#if CONFIG_COMPILER_STACK_CHECK
-
-static void recur_and_smash_cxx(void)
-{
-    static int cnt;
-    volatile uint8_t buf[50];
-    volatile int num = sizeof(buf)+10;
-
-    if (cnt++ < 1) {
-        recur_and_smash_cxx();
-    }
-    for (int i = 0; i < num; i++) {
-        buf[i] = 0;
-    }
-}
-
-
-TEST_CASE("stack smashing protection CXX", "[stack_check] [ignore]")
-{
-    recur_and_smash_cxx();
-}
-
-#endif
diff --git a/components/esp32/test/test_stack_check.c b/components/esp_system/test/test_stack_check.c
similarity index 100%
rename from components/esp32/test/test_stack_check.c
rename to components/esp_system/test/test_stack_check.c