diff --git a/ansible/roles/test/files/ptftests/fdb_test.py b/ansible/roles/test/files/ptftests/fdb_test.py
index 915aba7028e..8b9f9581758 100644
--- a/ansible/roles/test/files/ptftests/fdb_test.py
+++ b/ansible/roles/test/files/ptftests/fdb_test.py
@@ -106,7 +106,7 @@ def setUp(self):
     #--------------------------------------------------------------------------
 
     def runTest(self):
-        max_time = 200  # seconds
+        max_time = 300  # seconds
         i = 0
         start_time = time.time()
         while i < 0xffff - 128 and time.time() - start_time < max_time:
diff --git a/ansible/roles/test/tasks/fdb.yml b/ansible/roles/test/tasks/fdb.yml
index 8eaec5931d1..e49b718551e 100644
--- a/ansible/roles/test/tasks/fdb.yml
+++ b/ansible/roles/test/tasks/fdb.yml
@@ -120,8 +120,9 @@
     poll: 0
 
   - name: Reload config
-    command: config reload -y
-    become: yes
+    include: "roles/test/tasks/common_tasks/reload_config.yml"
+    vars:
+      config_source: "config_db"
 
   - name: Get PID of the PTF script
     command: "pgrep -f '/usr/bin/python /usr/bin/ptf'"
@@ -153,7 +154,14 @@
     command: sonic-clear fdb all
     when: sdk_fdb_count.stdout == show_mac_output.stdout
 
+  - fail: msg="No FDB is learned, something wrong with the switch"
+    when: sdk_fdb_count.stdout | int == 0 or show_mac_output.stdout | int == 0
+
   - fail: msg="In consistent number MAC entries between SDK and DB"
     when: sdk_fdb_count.stdout != show_mac_output.stdout
 
   when: sonic_asic_type == 'mellanox'
+
+  always:
+    - name: clear FDB table
+      command: sonic-clear fdb all