diff --git a/group/tftf-l2-fvp/fvp-sme2,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sme2-debug b/group/tftf-l2-fvp/fvp-sme2,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sme2-debug
new file mode 100644
index 0000000..8c2d647
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-sme2,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sme2-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2023, 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 7812f01..5923f24 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2023, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -54,6 +54,8 @@
 
 reset_var has_sme
 
+reset_var has_sme2
+
 reset_var bmcov_plugin
 
 reset_var retain_flash
@@ -113,6 +115,7 @@
 ${sve_plugin+-C SVE.ScalableVectorExtension.enable_at_reset=0}
 ${sve_plugin+-C SVE.ScalableVectorExtension.veclen=$((128 / 8))}
 ${has_sme+-C SVE.ScalableVectorExtension.has_sme=1}
+${has_sme2+-C SVE.ScalableVectorExtension.has_sme2=1}
 
 ${bmcov_plugin+--plugin=$bmcov_plugin_path}
 
diff --git a/run_config/fvp-aemv8a.sme2 b/run_config/fvp-aemv8a.sme2
new file mode 100644
index 0000000..62f0fa9
--- /dev/null
+++ b/run_config/fvp-aemv8a.sme2
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+generate_lava_job() {
+	local model="base-aemv8a"
+
+	model="$model" \
+		sve_plugin="1" has_sme="1" has_sme2="1" arch_version="9.2" \
+		gen_model_params
+	model="$model" gen_fvp_yaml
+}
diff --git a/tf_config/fvp-sme2 b/tf_config/fvp-sme2
new file mode 100644
index 0000000..795c323
--- /dev/null
+++ b/tf_config/fvp-sme2
@@ -0,0 +1,9 @@
+ARM_ARCH_MAJOR=8
+ARM_ARCH_MINOR=6
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+ENABLE_FEAT_HCX=1
+ENABLE_SME_FOR_NS=1
+ENABLE_SME2_FOR_NS=1
+ENABLE_SVE_FOR_NS=1
+PLAT=fvp