diff --git a/test/test_runner.c b/test/test_runner.c
index d91ad02d12..3f1352e5a1 100644
--- a/test/test_runner.c
+++ b/test/test_runner.c
@@ -2,6 +2,7 @@
 #include "global.h"
 #include "characters.h"
 #include "gpu_regs.h"
+#include "load_save.h"
 #include "main.h"
 #include "malloc.h"
 #include "random.h"
@@ -114,6 +115,10 @@ void CB2_TestRunner(void)
             return;
         }
 
+        MoveSaveBlocks_ResetHeap();
+        ClearSav1();
+        ClearSav2();
+
         gIntrTable[7] = Intr_Timer2;
 
         // The current test restarted the ROM (e.g. by jumping to NULL).