diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c
index c29ac5ff4f..13af96f98a 100644
--- a/src/mainboard/asus/kgpe-d16/romstage.c
+++ b/src/mainboard/asus/kgpe-d16/romstage.c
@@ -541,6 +541,10 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	raminit_amdmct(sysinfo);
 	timestamp_add_now(TS_AFTER_INITRAM);
 
+#ifdef TEST_MEMORY
+	execute_memory_test();
+#endif
+
 #if !IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
 	if (s3resume)
 		cbmem_initialize();
@@ -565,10 +569,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
 	timestamp_add_now(TS_END_ROMSTAGE);
 
-#ifdef TEST_MEMORY
-	execute_memory_test();
-#endif
-
 	post_cache_as_ram();	// BSP switch stack to ram, copy then execute LB.
 	post_code(0x43);	// Should never see this post code.
 }