diff --git a/components/soc/soc/esp32/include/soc/timer_group_caps.h b/components/soc/soc/esp32/include/soc/timer_group_caps.h
index 67dbe54ff0..e1850107c6 100644
--- a/components/soc/soc/esp32/include/soc/timer_group_caps.h
+++ b/components/soc/soc/esp32/include/soc/timer_group_caps.h
@@ -14,7 +14,4 @@
 
 #pragma once
 
-#include "soc/soc.h"
-
-//APB Frequency
-#define WDT_SOURCE_CLK_FREQ_MHZ     (APB_CLK_FREQ / 1000000)
+#define WDT_SOURCE_CLK_FREQ_MHZ (80) // Watch Dog clock source comes from APB, which is 80MHz by default
diff --git a/components/soc/soc/esp32s2/include/soc/timer_group_caps.h b/components/soc/soc/esp32s2/include/soc/timer_group_caps.h
index 7c10dee292..aaf2294cd8 100644
--- a/components/soc/soc/esp32s2/include/soc/timer_group_caps.h
+++ b/components/soc/soc/esp32s2/include/soc/timer_group_caps.h
@@ -14,8 +14,6 @@
 
 #pragma once
 
-#include "soc/soc.h"
-
 #define TIMER_GROUP_SUPPORTS_XTAL_CLOCK
-//APB Frequency
-#define WDT_SOURCE_CLK_FREQ_MHZ     (APB_CLK_FREQ / 1000000)
+
+#define WDT_SOURCE_CLK_FREQ_MHZ (80) // Watch Dog clock source comes from APB, which is 80MHz by default
diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index 7cff836fd4..5fb9007168 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -495,7 +495,7 @@ UT_034:
 
 UT_035:
   extends: .unit_test_s2_template
-  parallel: 30
+  parallel: 31
   tags:
     - ESP32S2_IDF
     - UT_T1_1