diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-cot-in-dtb,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-romlib-cot-in-dtb,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
similarity index 100%
rename from group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-cot-in-dtb,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
rename to group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-romlib-cot-in-dtb,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
diff --git a/tf_config/fvp-tbb-mbedtls-cot-in-dtb b/tf_config/fvp-tbb-mbedtls-romlib-cot-in-dtb
similarity index 93%
rename from tf_config/fvp-tbb-mbedtls-cot-in-dtb
rename to tf_config/fvp-tbb-mbedtls-romlib-cot-in-dtb
index b538ece..8b3f28c 100644
--- a/tf_config/fvp-tbb-mbedtls-cot-in-dtb
+++ b/tf_config/fvp-tbb-mbedtls-romlib-cot-in-dtb
@@ -1,7 +1,8 @@
 ARM_ROTPK_LOCATION=devel_rsa
+COT_DESC_IN_DTB=1
 CROSS_COMPILE=aarch64-none-elf-
 GENERATE_COT=1
 PLAT=fvp
 ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
 TRUSTED_BOARD_BOOT=1
-COT_DESC_IN_DTB=1
+USE_ROMLIB=1