diff --git a/components/freertos/Kconfig b/components/freertos/Kconfig
index 22b1904475..198722331b 100644
--- a/components/freertos/Kconfig
+++ b/components/freertos/Kconfig
@@ -439,4 +439,5 @@ menu "FreeRTOS"
         bool
         help
             Hidden option, gets selected by CONFIG_ESPxx_DEBUG_OCDAWARE
+
 endmenu
diff --git a/components/freertos/test/CMakeLists.txt b/components/freertos/test/CMakeLists.txt
index 8f40b2df02..896bb5795c 100644
--- a/components/freertos/test/CMakeLists.txt
+++ b/components/freertos/test/CMakeLists.txt
@@ -5,7 +5,7 @@ if(IDF_TARGET STREQUAL "esp32")
 endif()
 
 
-idf_component_register(SRC_DIRS ${src_dirs}
+idf_component_register(SRC_DIRS ${srcdirs}
                        INCLUDE_DIRS .
                        REQUIRES unity test_utils
                       )
\ No newline at end of file
diff --git a/components/freertos/test/test_isr_latency.c b/components/freertos/test/test_isr_latency.c
index a4b344f11d..46749173d8 100644
--- a/components/freertos/test/test_isr_latency.c
+++ b/components/freertos/test/test_isr_latency.c
@@ -17,10 +17,10 @@
 
 static SemaphoreHandle_t sync;
 static SemaphoreHandle_t end_sema;
-uint32_t cycle_before_trigger;
-uint32_t cycle_before_exit;
-uint32_t delta_enter_cycles = 0;
-uint32_t delta_exit_cycles = 0;
+static uint32_t cycle_before_trigger;
+static uint32_t cycle_before_exit;
+static uint32_t delta_enter_cycles = 0;
+static uint32_t delta_exit_cycles = 0;
 
 static void software_isr(void *arg) {
     (void)arg;
diff --git a/components/unity/include/unity_config.h b/components/unity/include/unity_config.h
index a0786f6eaa..686fb2507c 100644
--- a/components/unity/include/unity_config.h
+++ b/components/unity/include/unity_config.h
@@ -29,11 +29,9 @@
 
 /**
  * @note For some reason setjmp does not work with 
- * unity in local tests for, at least now, unknown 
- * reasons since the interrupt handling was modified
- * so if you want to perform tests locally, 
- * uncomment this line. Remote tests on CI
- * still working as expected 
+ * unity, since it is only used on test entry and
+ * exit it should not impact the rest of test
+ * framework. So we disable it here.  
  */ 
 #define UNITY_EXCLUDE_SETJMP_H