diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-default:fvp-trp.tftf.mbedtls2-tftf.rme b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-default:fvp-trp.tftf.mbedtls2-tftf.rme
new file mode 100644
index 0000000..5515958
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-default:fvp-trp.tftf.mbedtls2-tftf.rme
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2023 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-dualroot,fvp-fwu:fvp-tftf.fwu.mbedtls2-aemv8a b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-dualroot,fvp-fwu:fvp-tftf.fwu.mbedtls2-aemv8a
new file mode 100644
index 0000000..8c2d647
--- /dev/null
+++ b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-dualroot,fvp-fwu:fvp-tftf.fwu.mbedtls2-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/run_config/fvp-tftf.fwu.mbedtls2 b/run_config/fvp-tftf.fwu.mbedtls2
new file mode 100644
index 0000000..7632cb2
--- /dev/null
+++ b/run_config/fvp-tftf.fwu.mbedtls2
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Override default mbedtls to use mbedtls-2.28
+source "$ci_root/run_config/mbedtls2.pre_tf_build"
+
+source "$ci_root/run_config/fvp-tftf.fwu"
diff --git a/run_config/fvp-trp.tftf.mbedtls2 b/run_config/fvp-trp.tftf.mbedtls2
new file mode 100644
index 0000000..d52d9cc
--- /dev/null
+++ b/run_config/fvp-trp.tftf.mbedtls2
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Override default mbedtls to use mbedtls-2.28
+source "$ci_root/run_config/mbedtls2.pre_tf_build"
+
+source "$ci_root/run_config/fvp-trp.tftf"
+
diff --git a/run_config/mbedtls2.pre_tf_build b/run_config/mbedtls2.pre_tf_build
new file mode 100644
index 0000000..743e013
--- /dev/null
+++ b/run_config/mbedtls2.pre_tf_build
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Override default mbedtls to use mbedtls-2.28
+pre_tf_build() {
+	set_hook_var "mbedtls_archive" "https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v2.28.1.tar.gz"
+}