diff --git a/expect/crash_rng_trap_unhandled_exception_at_el3.exp b/expect/crash_rng_trap_unhandled_exception_at_el3.exp
index 9efd7b5..eff27f8 100644
--- a/expect/crash_rng_trap_unhandled_exception_at_el3.exp
+++ b/expect/crash_rng_trap_unhandled_exception_at_el3.exp
@@ -84,8 +84,6 @@
 expect_string "cntkctl_el1"
 expect_string "sp_el0"
 expect_string "isr_el1"
-expect_string "dacr32_el2"
-expect_string "ifsr32_el2"
 expect_string "icc_hppir0_el1"
 expect_string "icc_hppir1_el1"
 expect_string "icc_ctlr_el3"
diff --git a/expect/crash_roxlattables_unhandled_exception_at_el3.exp b/expect/crash_roxlattables_unhandled_exception_at_el3.exp
index 7c87b21..5c7c61f 100644
--- a/expect/crash_roxlattables_unhandled_exception_at_el3.exp
+++ b/expect/crash_roxlattables_unhandled_exception_at_el3.exp
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -85,8 +85,6 @@
 expect_string "cntkctl_el1"
 expect_string "sp_el0"
 expect_string "isr_el1"
-expect_string "dacr32_el2"
-expect_string "ifsr32_el2"
 expect_string "icc_hppir0_el1"
 expect_string "icc_hppir1_el1"
 expect_string "icc_ctlr_el3"
diff --git a/expect/crash_test.exp b/expect/crash_test.exp
index 1152abc..a8c31be 100644
--- a/expect/crash_test.exp
+++ b/expect/crash_test.exp
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -9,10 +9,7 @@
 source [file join [file dirname [info script]] handle-arguments.inc]
 
 expect_string "Unhandled External Abort received"
-expect_string "BACKTRACE: START: plat_ea_handler"
-expect_string "BACKTRACE: END: plat_ea_handler"
-expect_string "PANIC in EL3"
-expect_string "x30"
+expect_string "Unhandled Exception from EL2"
 expect_string "x0"
 expect_string "x1"
 expect_string "x2"
@@ -43,6 +40,7 @@
 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/unhandled_exception_at_el3.exp b/expect/unhandled_exception_at_el3.exp
index cef8fca..9cad002 100644
--- a/expect/unhandled_exception_at_el3.exp
+++ b/expect/unhandled_exception_at_el3.exp
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -84,8 +84,6 @@
 expect_string "cntkctl_el1"
 expect_string "sp_el0"
 expect_string "isr_el1"
-expect_string "dacr32_el2"
-expect_string "ifsr32_el2"
 expect_string "icc_hppir0_el1"
 expect_string "icc_hppir1_el1"
 expect_string "icc_ctlr_el3"