diff --git a/components/esp32/include/esp_attr.h b/components/esp32/include/esp_attr.h
index c985e6b9fd..18a611489b 100644
--- a/components/esp32/include/esp_attr.h
+++ b/components/esp32/include/esp_attr.h
@@ -20,16 +20,10 @@
 //and all variables in shared RAM. This can be redirected to IRAM if
 //needed using these macros.
 
-//Forces data and flash into IRAM instead of flash / shared RAM
+// Forces code into IRAM instead of flash
 #define IRAM_ATTR __attribute__((section(".iram1")))
+
+// Forces data into DRAM instead of flash
 #define DRAM_ATTR __attribute__((section(".dram1")))
 
-//Forces data and flash into the IRAM section of a specific core.
-//Normally, you shouldn't have to use this: the linker will take care of
-//only linking in the functions for that specific core.
-#define IRAM_C0_ATTR __attribute__((section(".iram1pro")))
-#define DRAM_C0_ATTR __attribute__((section(".iram1pro")))
-#define IRAM_C1_ATTR __attribute__((section(".dram1app")))
-#define DRAM_C1_ATTR __attribute__((section(".dram1app")))
-
 #endif /* __ESP_ATTR_H__ */
diff --git a/components/esp32/ld/eagle.fpga32.v7.ld b/components/esp32/ld/eagle.fpga32.v7.ld
index 6824486a86..ca79c52de7 100644
--- a/components/esp32/ld/eagle.fpga32.v7.ld
+++ b/components/esp32/ld/eagle.fpga32.v7.ld
@@ -106,6 +106,7 @@ SECTIONS
     KEEP(*(.sdata2.*))
     KEEP(*(.gnu.linkonce.s2.*))
     KEEP(*(.jcr))
+    *(.dram1 .dram1.*)
     _data_end = ABSOLUTE(.);
     . = ALIGN(4);
     _heap_start = ABSOLUTE(.);
diff --git a/make/build_system_tests.sh b/make/build_system_tests.sh
index 6006f05a90..5824cf2b8e 100755
--- a/make/build_system_tests.sh
+++ b/make/build_system_tests.sh
@@ -30,6 +30,9 @@ function run_tests()
 	git clone ${ESP_IDF_TEMPLATE_GIT} template
 	cd template
 
+	print_status "Updating template config..."
+	make defconfig || exit $?
+
 	BOOTLOADER_BINS="bootloader/bootloader.elf bootloader/bootloader.bin"
 	APP_BINS="app-template.elf app-template.bin"