diff --git a/expect/crash_test.exp b/expect/crash_test.exp
index d6fbaf2..b5ea5a4 100644
--- a/expect/crash_test.exp
+++ b/expect/crash_test.exp
@@ -11,5 +11,6 @@
 expect_string "Unhandled External Abort received"
 expect_string "Unhandled Exception from EL2"
 
-source [file join [file dirname [info script]] exception_regs.inc]
+source [file join [file dirname [info script]] exception_gp_regs.inc]
 expect_string "x30"
+source [file join [file dirname [info script]] exception_sys_regs.inc]
diff --git a/expect/exception_gp_regs.inc b/expect/exception_gp_regs.inc
new file mode 100644
index 0000000..167ce6f
--- /dev/null
+++ b/expect/exception_gp_regs.inc
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Expect script for Trusted Firmware Test Framework
+#
+
+expect_string "x0"
+expect_string "x1"
+expect_string "x2"
+expect_string "x3"
+expect_string "x4"
+expect_string "x5"
+expect_string "x6"
+expect_string "x7"
+expect_string "x8"
+expect_string "x9"
+expect_string "x10"
+expect_string "x11"
+expect_string "x12"
+expect_string "x13"
+expect_string "x14"
+expect_string "x15"
+expect_string "x16"
+expect_string "x17"
+expect_string "x18"
+expect_string "x19"
+expect_string "x20"
+expect_string "x21"
+expect_string "x22"
+expect_string "x23"
+expect_string "x24"
+expect_string "x25"
+expect_string "x26"
+expect_string "x27"
+expect_string "x28"
+expect_string "x29"
diff --git a/expect/exception_regs.inc b/expect/exception_sys_regs.inc
similarity index 69%
rename from expect/exception_regs.inc
rename to expect/exception_sys_regs.inc
index b5c6b28..3379b21 100644
--- a/expect/exception_regs.inc
+++ b/expect/exception_sys_regs.inc
@@ -6,36 +6,6 @@
 # Expect script for Trusted Firmware Test Framework
 #
 
-expect_string "x0"
-expect_string "x1"
-expect_string "x2"
-expect_string "x3"
-expect_string "x4"
-expect_string "x5"
-expect_string "x6"
-expect_string "x7"
-expect_string "x8"
-expect_string "x9"
-expect_string "x10"
-expect_string "x11"
-expect_string "x12"
-expect_string "x13"
-expect_string "x14"
-expect_string "x15"
-expect_string "x16"
-expect_string "x17"
-expect_string "x18"
-expect_string "x19"
-expect_string "x20"
-expect_string "x21"
-expect_string "x22"
-expect_string "x23"
-expect_string "x24"
-expect_string "x25"
-expect_string "x26"
-expect_string "x27"
-expect_string "x28"
-expect_string "x29"
 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 11bcc42..80756d8 100644
--- a/expect/panic_in_el3.exp
+++ b/expect/panic_in_el3.exp
@@ -11,4 +11,5 @@
 expect_string "PANIC in EL3."
 expect_string "x30"
 
-source [file join [file dirname [info script]] exception_regs.inc]
+source [file join [file dirname [info script]] exception_gp_regs.inc]
+source [file join [file dirname [info script]] exception_sys_regs.inc]