diff --git a/include/runtime_services/ffa_helpers.h b/include/runtime_services/ffa_helpers.h
index 982a4ec..12120e7 100644
--- a/include/runtime_services/ffa_helpers.h
+++ b/include/runtime_services/ffa_helpers.h
@@ -789,6 +789,7 @@
 struct ffa_value ffa_features_with_input_property(uint32_t feature,
                                                   uint32_t param);
 struct ffa_value ffa_partition_info_get(const struct ffa_uuid uuid);
+struct ffa_value ffa_rx_release_with_id(ffa_id_t vm_id);
 struct ffa_value ffa_rx_release(void);
 struct ffa_value ffa_rxtx_map(uintptr_t send, uintptr_t recv, uint32_t pages);
 struct ffa_value ffa_rxtx_unmap_with_id(uint32_t id);
diff --git a/tftf/tests/runtime_services/secure_service/ffa_helpers.c b/tftf/tests/runtime_services/secure_service/ffa_helpers.c
index 6db193c..a8e732f 100644
--- a/tftf/tests/runtime_services/secure_service/ffa_helpers.c
+++ b/tftf/tests/runtime_services/secure_service/ffa_helpers.c
@@ -465,16 +465,23 @@
 	return ffa_service_call(&args);
 }
 
-/* Query SPMD that the rx buffer of the partition can be released */
-struct ffa_value ffa_rx_release(void)
+/* Querying the SPMC to release the rx buffers of the VM ID. */
+struct ffa_value ffa_rx_release_with_id(ffa_id_t vm_id)
 {
 	struct ffa_value args = {
-		.fid = FFA_RX_RELEASE
+		.fid = FFA_RX_RELEASE,
+		.arg1 = (uint64_t)vm_id,
 	};
 
 	return ffa_service_call(&args);
 }
 
+/* Query SPMC that the rx buffer of the partition can be released */
+struct ffa_value ffa_rx_release(void)
+{
+	return ffa_rx_release_with_id(0);
+}
+
 /* Map the RXTX buffer */
 struct ffa_value ffa_rxtx_map(uintptr_t send, uintptr_t recv, uint32_t pages)
 {