diff --git a/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h
index 00a4b59b83d..377c6e2779c 100644
--- a/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h
+++ b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h
@@ -554,14 +554,14 @@ static inline void __attribute__((always_inline)) uxPortCompareSetExtram(volatil
 
 // --------------------- Interrupts ------------------------
 
-static inline UBaseType_t xPortSetInterruptMaskFromISR(void)
+static inline UBaseType_t __attribute__((always_inline)) xPortSetInterruptMaskFromISR(void)
 {
     UBaseType_t prev_int_level = XTOS_SET_INTLEVEL(XCHAL_EXCM_LEVEL);
     portbenchmarkINTERRUPT_DISABLE();
     return prev_int_level;
 }
 
-static inline void vPortClearInterruptMaskFromISR(UBaseType_t prev_level)
+static inline void __attribute__((always_inline)) vPortClearInterruptMaskFromISR(UBaseType_t prev_level)
 {
     portbenchmarkINTERRUPT_RESTORE(prev_level);
     XTOS_RESTORE_JUST_INTLEVEL((int) prev_level);
diff --git a/tools/unit-test-app/configs/no_optimization_c3 b/tools/unit-test-app/configs/no_optimization_c3
new file mode 100644
index 00000000000..00719f87123
--- /dev/null
+++ b/tools/unit-test-app/configs/no_optimization_c3
@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32c3"
+TEST_COMPONENTS=esp_ipc spi_flash
+CONFIG_COMPILER_OPTIMIZATION_NONE=y
diff --git a/tools/unit-test-app/configs/no_optimization_esp32 b/tools/unit-test-app/configs/no_optimization_esp32
new file mode 100644
index 00000000000..64114b12156
--- /dev/null
+++ b/tools/unit-test-app/configs/no_optimization_esp32
@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32"
+TEST_COMPONENTS=esp_ipc spi_flash
+CONFIG_COMPILER_OPTIMIZATION_NONE=y