diff --git a/group/tf-l2-boot-tests-misc/fvp-mpam,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_4.mpam b/group/tf-l2-boot-tests-misc/fvp-mpam,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_4.mpam
new file mode 100644
index 0000000..5e79683
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-mpam,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_4.mpam
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2024, 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 5923f24..ff0596f 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2024, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -63,6 +63,9 @@
 reset_var nvcounter_version
 reset_var nvcounter_diag
 
+# Enable FEAT_MPAM
+reset_var has_mpam
+
 # Enable SMMUv3 functionality
 reset_var has_smmuv3_params
 
@@ -329,6 +332,13 @@
 EOF
 fi
 
+if [ "$has_mpam" = "1" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster0.has_mpam=2
+-C cluster1.has_mpam=2
+EOF
+fi
+
 # FEAT_RME is enabled
 if [ "$has_rme" = "1" ]; then
         cat <<EOF >>"$model_param_file"
diff --git a/run_config/fvp-aemv8a.8_4.mpam b/run_config/fvp-aemv8a.8_4.mpam
new file mode 100644
index 0000000..c404278
--- /dev/null
+++ b/run_config/fvp-aemv8a.8_4.mpam
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+generate_lava_job() {
+	local model="base-aemv8a"
+
+	model="$model" arch_version="8.4" has_mpam="1" gen_model_params
+	model="$model" gen_fvp_yaml
+}