diff --git a/tftf/tests/runtime_services/host_realm_managment/host_rmi_da_flow.c b/tftf/tests/runtime_services/host_realm_managment/host_rmi_da_flow.c
index ce85080..f110e10 100644
--- a/tftf/tests/runtime_services/host_realm_managment/host_rmi_da_flow.c
+++ b/tftf/tests/runtime_services/host_realm_managment/host_rmi_da_flow.c
@@ -107,8 +107,6 @@
 						 &public_key_algo);
 	if (rc != 0) {
 		ERROR("Get public key failed\n");
-		/* TF-RMM has support till here. Change error code temporarily */
-		result = TEST_RESULT_SUCCESS;
 		goto err_pdev_reclaim;
 	}
 
@@ -143,6 +141,8 @@
 	rc = host_assign_vdev_to_realm(&realm, h_pdev, h_vdev);
 	if (rc != 0) {
 		INFO("VDEV assign to realm failed\n");
+		/* TF-RMM has support till here. Change error code temporarily */
+		result = TEST_RESULT_SUCCESS;
 		goto err_pdev_reclaim;
 	}