diff --git a/ansible/roles/test/tasks/fdb.yml b/ansible/roles/test/tasks/fdb.yml
index 6d12a223319..0e76537e85e 100644
--- a/ansible/roles/test/tasks/fdb.yml
+++ b/ansible/roles/test/tasks/fdb.yml
@@ -127,10 +127,12 @@
     command: "pgrep -f '/usr/bin/python /usr/bin/ptf'"
     register: ptf_script_pid
     delegate_to: "{{ ptf_host }}"
+    ignore_errors: yes
 
   - name: Wait until the PTF script completed execution
     shell: "tail --pid={{ ptf_script_pid.stdout }} -f /dev/null"
     delegate_to: "{{ ptf_host }}"
+    when: ptf_script_pid.rc == 0
 
   - name: Wait some extra time to ensure that all FDB entries are in DB
     pause: seconds=10