diff --git a/group/tf-l2-boot-tests-misc/fvp-no-brbe-regs-access,fvp-default:fvp-tftf-fip.tftf-aemva.feat_brbe.bl31_panic-debug b/group/tf-l2-boot-tests-misc/fvp-no-brbe-regs-access,fvp-default:fvp-tftf-fip.tftf-aemva.feat_brbe.bl31_panic-debug
new file mode 100644
index 0000000..e2078e3
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-no-brbe-regs-access,fvp-default:fvp-tftf-fip.tftf-aemva.feat_brbe.bl31_panic-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2022 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 2d02364..29251cc 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -191,6 +191,7 @@
 ${etm_present+-C cluster0.cpu3.etm-present=$etm_present}
 ${supports_trace_filter_regs+-C cluster0.has_self_hosted_trace_extension=$supports_trace_filter_regs}
 ${supports_trace_buffer_control_regs+-C cluster0.has_trbe=$supports_trace_buffer_control_regs}
+${supports_branch_record_buffer_control_regs+-C cluster0.has_brbe=$supports_branch_record_buffer_control_regs}
 
 EOF
 
diff --git a/run_config/fvp-aemva.feat_brbe.bl31_panic b/run_config/fvp-aemva.feat_brbe.bl31_panic
new file mode 100644
index 0000000..aa63658
--- /dev/null
+++ b/run_config/fvp-aemva.feat_brbe.bl31_panic
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2022 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+post_fetch_tf_resource() {
+	local model="base-aemva"
+	supports_branch_record_buffer_control_regs="1" \
+	model="$model" gen_model_params
+	model="$model" gen_fvp_yaml
+}
+
+fetch_tf_resource() {
+	uart="0"  timeout="60" file="timeout_test.exp" track_expect
+	uart="1"  timeout="60" file="unhandled_exception_at_el3.exp" track_expect
+}
diff --git a/tf_config/fvp-no-brbe-regs-access b/tf_config/fvp-no-brbe-regs-access
new file mode 100644
index 0000000..889e12e
--- /dev/null
+++ b/tf_config/fvp-no-brbe-regs-access
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_BRBE_FOR_NS=0
+PLAT=fvp
\ No newline at end of file