diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-rme:fvp-trp.tftf.mbedtls2-tftf.rme b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-rme:fvp-trp.tftf.mbedtls2-tftf.rme
deleted file mode 100644
index 5515958..0000000
--- a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-rme:fvp-trp.tftf.mbedtls2-tftf.rme
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# 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
deleted file mode 100644
index 8c2d647..0000000
--- a/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-dualroot,fvp-fwu:fvp-tftf.fwu.mbedtls2-aemv8a
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# 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
deleted file mode 100644
index 7632cb2..0000000
--- a/run_config/fvp-tftf.fwu.mbedtls2
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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
deleted file mode 100644
index d52d9cc..0000000
--- a/run_config/fvp-trp.tftf.mbedtls2
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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
deleted file mode 100644
index 05587d1..0000000
--- a/run_config/mbedtls2.pre_tf_build
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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/mbedtls-2.28.1.tar.gz"
-}