diff --git a/src/arch/x86/bootblock_crt0.S b/src/arch/x86/bootblock_crt0.S
index 9f45413e70..3f41464f87 100644
--- a/src/arch/x86/bootblock_crt0.S
+++ b/src/arch/x86/bootblock_crt0.S
@@ -20,12 +20,6 @@
 #include <cpu/x86/16bit/reset16.inc>
 #include <cpu/x86/32bit/entry32.inc>
 
-	/* BIST result in eax */
-	mov	%eax, %ebx
-	/* entry64.inc preserves ebx. */
-#include <cpu/x86/64bit/entry64.inc>
-	mov	%ebx, %eax
-
 #if CONFIG(BOOTBLOCK_DEBUG_SPINLOOP)
 
 	/* Wait for a JTAG debugger to break in and set EBX non-zero */
diff --git a/src/cpu/qemu-x86/cache_as_ram_bootblock.S b/src/cpu/qemu-x86/cache_as_ram_bootblock.S
index 415ed247df..148948ba31 100644
--- a/src/cpu/qemu-x86/cache_as_ram_bootblock.S
+++ b/src/cpu/qemu-x86/cache_as_ram_bootblock.S
@@ -27,6 +27,9 @@ cache_as_ram:
 	/* Align the stack and keep aligned for call to bootblock_c_entry() */
 	and	$0xfffffff0, %esp
 
+        /* entry64.inc preserves ebx. */
+#include <cpu/x86/64bit/entry64.inc>
+
 	/* Restore the BIST result and timestamps. */
 #if defined(__x86_64__)
 	movd	%mm2, %rdi