diff --git a/cpu/esp32/Makefile.include b/cpu/esp32/Makefile.include
index fbc32aaf87..91c3b44ad1 100644
--- a/cpu/esp32/Makefile.include
+++ b/cpu/esp32/Makefile.include
@@ -63,11 +63,11 @@ ifneq (,$(filter esp_eth,$(USEMODULE)))
 endif
 
 ifneq (,$(filter spiffs,$(USEMODULE)))
-  export RIOT_TEST_TIMEOUT = 300
+  export RIOT_TEST_TIMEOUT = 120
 endif
 
 ifneq (,$(filter littlefs,$(USEMODULE)))
-  export RIOT_TEST_TIMEOUT = 300
+  export RIOT_TEST_TIMEOUT = 120
 endif
 
 ifneq (,$(filter 4 5,$(LOG_LEVEL)))
diff --git a/cpu/esp32/ld/esp32.common.ld b/cpu/esp32/ld/esp32.common.ld
index f4ef2da23c..9fafb736ef 100644
--- a/cpu/esp32/ld/esp32.common.ld
+++ b/cpu/esp32/ld/esp32.common.ld
@@ -101,8 +101,9 @@ SECTIONS
     *esp_idf_spi_flash.a:*(.literal .text .literal.* .text.*)
     /* parts of RIOT that should to run in IRAM */
     *core.a:*(.literal .text .literal.* .text.*)
-    /* *spiffs_fs.a:*(.literal .text .literal.* .text.*) */
-    /* *spiffs.a:*(.literal .text .literal.* .text.*) */
+    *spiffs_fs.a:*(.literal .text .literal.* .text.*)
+    *spiffs.a:*(.literal .text .literal.* .text.*)
+    *vfs.a:*(.literal .text .literal.* .text.*)
 
     /* part of RIOT ports that should run in IRAM */
     *cpu.a:*(.literal .text .literal.* .text.*)
diff --git a/cpu/esp8266/Makefile.include b/cpu/esp8266/Makefile.include
index a69c47c3b9..b4a134cc0c 100644
--- a/cpu/esp8266/Makefile.include
+++ b/cpu/esp8266/Makefile.include
@@ -47,11 +47,11 @@ ifneq (, $(filter esp_gdbstub, $(USEMODULE)))
 endif
 
 ifneq (, $(filter spiffs, $(USEMODULE)))
-    export RIOT_TEST_TIMEOUT = 300
+    export RIOT_TEST_TIMEOUT = 200
 endif
 
 ifneq (, $(filter littlefs, $(USEMODULE)))
-    export RIOT_TEST_TIMEOUT = 300
+    export RIOT_TEST_TIMEOUT = 200
 endif
 
 # regular Makefile