diff --git a/group/tf-l2-boot-tests-misc/fvp-default-rng-trap,fvp-rng-trap:fvp-tftf-fip.tftf-aemv8a.rng_trap-debug b/group/tf-l2-boot-tests-misc/fvp-rng-trap,fvp-rng-trap:fvp-tftf-fip.tftf-aemv8a.rng_trap-debug
similarity index 100%
rename from group/tf-l2-boot-tests-misc/fvp-default-rng-trap,fvp-rng-trap:fvp-tftf-fip.tftf-aemv8a.rng_trap-debug
rename to group/tf-l2-boot-tests-misc/fvp-rng-trap,fvp-rng-trap:fvp-tftf-fip.tftf-aemv8a.rng_trap-debug
diff --git a/tf_config/fvp-default-rng-trap b/tf_config/fvp-rng-trap
similarity index 87%
rename from tf_config/fvp-default-rng-trap
rename to tf_config/fvp-rng-trap
index 0db59cf..129c8d2 100644
--- a/tf_config/fvp-default-rng-trap
+++ b/tf_config/fvp-rng-trap
@@ -1,5 +1,4 @@
 ARM_ARCH_FEATURE=rng
-ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 CROSS_COMPILE=aarch64-none-elf-
 ENABLE_FEAT_RNG=1
diff --git a/tftf_config/fvp-rng-trap b/tftf_config/fvp-rng-trap
index 34a97a7..5c9d958 100644
--- a/tftf_config/fvp-rng-trap
+++ b/tftf_config/fvp-rng-trap
@@ -1,5 +1,4 @@
 ARM_ARCH_FEATURE=rng
-ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp