diff --git a/expect/crash_roxlattables_unhandled_exception_at_el3.exp b/expect/crash_roxlattables_unhandled_exception_at_el3.exp
index 4c41eac..918b3f3 100644
--- a/expect/crash_roxlattables_unhandled_exception_at_el3.exp
+++ b/expect/crash_roxlattables_unhandled_exception_at_el3.exp
@@ -10,5 +10,6 @@
 
 expect_string "Translation tables are now read-only at EL3."
 expect_string "Unhandled Exception in EL3."
+expect_string "x30"
 
 source [file join [file dirname [info script]] exception_regs.inc]
diff --git a/expect/crash_test.exp b/expect/crash_test.exp
index 1efd5a4..d6fbaf2 100644
--- a/expect/crash_test.exp
+++ b/expect/crash_test.exp
@@ -12,3 +12,4 @@
 expect_string "Unhandled Exception from EL2"
 
 source [file join [file dirname [info script]] exception_regs.inc]
+expect_string "x30"
diff --git a/expect/exception_regs.inc b/expect/exception_regs.inc
index c22ed99..b5c6b28 100644
--- a/expect/exception_regs.inc
+++ b/expect/exception_regs.inc
@@ -36,7 +36,6 @@
 expect_string "x27"
 expect_string "x28"
 expect_string "x29"
-expect_string "x30"
 expect_string "scr_el3"
 expect_string "sctlr_el3"
 expect_string "cptr_el3"
diff --git a/expect/panic_in_el3.exp b/expect/panic_in_el3.exp
index c712e2e..11bcc42 100644
--- a/expect/panic_in_el3.exp
+++ b/expect/panic_in_el3.exp
@@ -9,5 +9,6 @@
 source [file join [file dirname [info script]] handle-arguments.inc]
 
 expect_string "PANIC in EL3."
+expect_string "x30"
 
 source [file join [file dirname [info script]] exception_regs.inc]