diff --git a/fvp_utils.sh b/fvp_utils.sh
index aa637de..25bf8b3 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -84,6 +84,7 @@
 [neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1x1"
 [neoverse_n2]=";;;"
 [neoverse-v1x4]=";;;"
+[matterhornx4]=";;;"
 [css-rdv1]=";;;"
 [css-rde1edge]=";;;"
 [css-rdn1edge]=";;;"
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-matterhornx4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-matterhornx4-debug
new file mode 100644
index 0000000..1bbc737
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-matterhornx4-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2021 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-matterhornx4-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-matterhornx4-debug
new file mode 100644
index 0000000..45065d8
--- /dev/null
+++ b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-matterhornx4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2021 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/model/matterhornx4.sh b/model/matterhornx4.sh
new file mode 100644
index 0000000..4a5b68b
--- /dev/null
+++ b/model/matterhornx4.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2021 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Matterhornx4"
+
+source "$ci_root/model/fvp_common.sh"
diff --git a/run_config/fvp-matterhornx4 b/run_config/fvp-matterhornx4
new file mode 100644
index 0000000..1e58454
--- /dev/null
+++ b/run_config/fvp-matterhornx4
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2021 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+post_fetch_tf_resource() {
+        local model="matterhornx4"
+
+	model="$model" \
+	cache_state_modelled="0" \
+	gen_model_params
+	uart="0" set_expect_variable "num_cpus" "4"
+	model="$model" gen_fvp_yaml
+}