diff --git a/tests/helpers.py b/tests/helpers.py
index 3e99b19743d..64dc770bdd0 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -140,7 +140,9 @@ def create_pod(
         f"Failed to create resource {pod_name}"
     )
     if wait:
-        assert wait_for_resource_state(pod_obj, desired_status)
+        assert wait_for_resource_state(
+            resource=pod_obj, state=desired_status, timeout=120
+        )
 
     return pod_obj
 
diff --git a/tests/manage/test_dynamic_pvc_accessmodes_with_reclaim_policies.py b/tests/manage/test_dynamic_pvc_accessmodes_with_reclaim_policies.py
index d4386f61340..e3bcbb32a1e 100644
--- a/tests/manage/test_dynamic_pvc_accessmodes_with_reclaim_policies.py
+++ b/tests/manage/test_dynamic_pvc_accessmodes_with_reclaim_policies.py
@@ -79,9 +79,16 @@ def verify_expected_failure_event(self, ocs_obj, failure_str):
 
     def cleanup(self):
         """
-        Removes resources created in dynamic_pvc_base() and verifies
+        Removes resources created during test execution and verifies
         the reclaim policy is honored
         """
+
+        pod_objs = pod.get_all_pods(namespace=self.namespace)
+        if len(pod_objs) > 0:
+            for pod_obj in pod_objs:
+                pod_obj.delete()
+                pod_obj.ocp.wait_for_delete(resource_name=pod_obj.name)
+
         if hasattr(self, 'pvc_obj'):
             pv_obj = self.pvc_obj.backed_pv_obj
             self.pvc_obj.delete()
@@ -161,6 +168,9 @@ def finalizer():
         self.dynamic_pvc_base(interface_type, reclaim_policy)
 
     def test_rwo_dynamic_pvc(self, setup_base):
+        """
+        RWO Dynamic PVC creation tests with Reclaim policy set to Delete/Retain
+        """
         logger.info(f"Creating two pods using same PVC {self.pvc_obj.name}")
         logger.info(f"Creating first pod on node: {self.worker_nodes_list[0]}")
         pod_obj1 = helpers.create_pod(
@@ -231,7 +241,7 @@ def test_rwo_dynamic_pvc(self, setup_base):
         )
 
         pod_obj2.delete()
-        pod_obj1.ocp.wait_for_delete(resource_name=pod_obj2.name)
+        pod_obj2.ocp.wait_for_delete(resource_name=pod_obj2.name)
 
 
 @tier1