diff --git a/tftf_config/fvp-invalid-access b/tftf_config/fvp-memory-access
similarity index 66%
rename from tftf_config/fvp-invalid-access
rename to tftf_config/fvp-memory-access
index ebb0144..6d2516c 100644
--- a/tftf_config/fvp-invalid-access
+++ b/tftf_config/fvp-memory-access
@@ -1,3 +1,3 @@
 CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp
-TESTS=invalid-access
+TESTS=memory-access
diff --git a/tftf_config/fvp-invalid-access-rme b/tftf_config/fvp-memory-access-rme
similarity index 76%
rename from tftf_config/fvp-invalid-access-rme
rename to tftf_config/fvp-memory-access-rme
index db1dcb7..c5650b0 100644
--- a/tftf_config/fvp-invalid-access-rme
+++ b/tftf_config/fvp-memory-access-rme
@@ -1,4 +1,4 @@
 CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp
-TESTS=invalid-access
+TESTS=memory-access
 ENABLE_REALM_PAYLOAD_TESTS=1