diff --git a/components/cxx/test_apps/exception/main/test_exception.cpp b/components/cxx/test_apps/exception/main/test_exception.cpp
index d0ef7166c7..6e353ce673 100644
--- a/components/cxx/test_apps/exception/main/test_exception.cpp
+++ b/components/cxx/test_apps/exception/main/test_exception.cpp
@@ -13,7 +13,7 @@
    - 88 bytes are allocated by pthread_setspecific() to init internal lock
    - some more memory...
    */
-#if CONFIG_IDF_TARGET_ESP32
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32P4
 #define LEAKS (300)
 #elif CONFIG_IDF_TARGET_ESP32S2
 #define LEAKS (800)
diff --git a/components/cxx/test_apps/general/main/test_cxx_general.cpp b/components/cxx/test_apps/general/main/test_cxx_general.cpp
index 9d099e6f25..8828157436 100644
--- a/components/cxx/test_apps/general/main/test_cxx_general.cpp
+++ b/components/cxx/test_apps/general/main/test_cxx_general.cpp
@@ -108,18 +108,16 @@ TEST_CASE("static initialization guards work as expected", "[misc]")
     TEST_ASSERT_NOT_NULL(s_slow_init_sem);
     int task_count = 0;
     // four tasks competing for static initialization of one object
-    task_count += start_slow_init_task<1>(0, PRO_CPU_NUM);
-#if CONFIG_FREERTOS_NUMBER_OF_CORES == 2
-    task_count += start_slow_init_task<1>(1, APP_CPU_NUM);
-#endif
+    for (int i = 0; i < CONFIG_FREERTOS_NUMBER_OF_CORES; i++) {
+        task_count += start_slow_init_task<1>(i, i);
+    }
     task_count += start_slow_init_task<1>(2, PRO_CPU_NUM);
     task_count += start_slow_init_task<1>(3, tskNO_AFFINITY);
 
     // four tasks competing for static initialization of another object
-    task_count += start_slow_init_task<2>(0, PRO_CPU_NUM);
-#if CONFIG_FREERTOS_NUMBER_OF_CORES == 2
-    task_count += start_slow_init_task<2>(1, APP_CPU_NUM);
-#endif
+    for (int i = 0; i < CONFIG_FREERTOS_NUMBER_OF_CORES; i++) {
+        task_count += start_slow_init_task<2>(i, i);
+    }
     task_count += start_slow_init_task<2>(2, PRO_CPU_NUM);
     task_count += start_slow_init_task<2>(3, tskNO_AFFINITY);
 
diff --git a/components/cxx/test_apps/rtti/main/test_rtti.cpp b/components/cxx/test_apps/rtti/main/test_rtti.cpp
index 71d0c3b949..322d9d9628 100644
--- a/components/cxx/test_apps/rtti/main/test_rtti.cpp
+++ b/components/cxx/test_apps/rtti/main/test_rtti.cpp
@@ -14,7 +14,7 @@
    - 88 bytes are allocated by pthread_setspecific() to init internal lock
    - some more memory...
    */
-#if CONFIG_IDF_TARGET_ESP32
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32P4
 #define LEAKS (300)
 #elif CONFIG_IDF_TARGET_ESP32S2
 #define LEAKS (800)