diff --git a/ansible/roles/test/tasks/pfc_wd/choose_test_port.yml b/ansible/roles/test/tasks/pfc_wd/choose_test_port.yml
index d33b4800799..d02c5c3d967 100644
--- a/ansible/roles/test/tasks/pfc_wd/choose_test_port.yml
+++ b/ansible/roles/test/tasks/pfc_wd/choose_test_port.yml
@@ -1,5 +1,5 @@
 - set_fact:
-    pfc_wd_available_port_ids: "{{range(16) | list | shuffle}}"
+    pfc_wd_available_port_ids: "{{range(16,32) | list | shuffle}}"
   when: testbed_type == "t1-lag"
 
 - set_fact:
diff --git a/ansible/roles/test/tasks/pfc_wd/config_test/config_test.yml b/ansible/roles/test/tasks/pfc_wd/config_test/config_test.yml
index 29fc6670cdc..3af6086af0f 100644
--- a/ansible/roles/test/tasks/pfc_wd/config_test/config_test.yml
+++ b/ansible/roles/test/tasks/pfc_wd/config_test/config_test.yml
@@ -118,6 +118,7 @@
     - name: Config tests - Check forward action configuration.
       vars:
         command_to_run: "sonic-cfggen -j {{ run_dir }}/pfc_wd_fwd_action.json --write-to-db"
+        test_ignore_file: config_test_ignore_messages
         errors_expected: false
       include: roles/test/tasks/run_command_with_log_analyzer.yml
 
@@ -174,6 +175,7 @@
     - name: Clean up config
       vars:
         command_to_run: "pfcwd stop"
+        test_ignore_file: config_test_ignore_messages
         errors_expected: false
       include: roles/test/tasks/run_command_with_log_analyzer.yml
 
diff --git a/ansible/roles/test/tasks/pfc_wd/config_test/config_test_ignore_messages b/ansible/roles/test/tasks/pfc_wd/config_test/config_test_ignore_messages
new file mode 100644
index 00000000000..2f649b28be0
--- /dev/null
+++ b/ansible/roles/test/tasks/pfc_wd/config_test/config_test_ignore_messages
@@ -0,0 +1,4 @@
+r, ".* Port counter .* not implemented"
+r, ".* Port counter .* not supported"
+r, ".* Invalid port counter .*"
+r, ".* Trying to remove nonexisting queue from flex counter .*"
diff --git a/ansible/roles/test/tasks/pfc_wd/functional_test/functional_test.yml b/ansible/roles/test/tasks/pfc_wd/functional_test/functional_test.yml
index 13bd43a2ad1..ee13e9dc73c 100644
--- a/ansible/roles/test/tasks/pfc_wd/functional_test/functional_test.yml
+++ b/ansible/roles/test/tasks/pfc_wd/functional_test/functional_test.yml
@@ -33,7 +33,7 @@
   set_fact:
       pfc_wd_detect_time: 200
       pfc_wd_restore_time: 200
-      pfc_wd_restore_time_large: 30000
+      pfc_wd_restore_time_large: 50000
       pfc_wd_poll_time: 100
 
 - set_fact:
@@ -258,6 +258,7 @@
     - name: Apply drop config to {{ pfc_wd_test_port }}.
       vars:
         command_to_run: "pfcwd start --action drop --restoration-time {{ pfc_wd_restore_time_large }} {{ ports }} {{ pfc_wd_detect_time }}"
+        test_ignore_file: ignore_pfc_wd_messages
         errors_expected: false
       include: roles/test/tasks/run_command_with_log_analyzer.yml
 
@@ -433,6 +434,7 @@
     - name: Clean up config
       vars:
         command_to_run: "pfcwd stop"
+        test_ignore_file: ignore_pfc_wd_messages
         errors_expected: false
       include: roles/test/tasks/run_command_with_log_analyzer.yml
 
@@ -602,6 +604,7 @@
     - name: Apply config with proper timers to {{ pfc_wd_test_port }}.
       vars:
         command_to_run: "pfcwd start --action drop --restoration-time {{ pfc_wd_restore_time }} {{ ports }} {{ pfc_wd_detect_time }}"
+        test_ignore_file: ignore_pfc_wd_messages
         errors_expected: false
       include: roles/test/tasks/run_command_with_log_analyzer.yml
 
diff --git a/ansible/roles/test/tasks/pfc_wd/functional_test/ignore_pfc_wd_messages b/ansible/roles/test/tasks/pfc_wd/functional_test/ignore_pfc_wd_messages
new file mode 100644
index 00000000000..2f649b28be0
--- /dev/null
+++ b/ansible/roles/test/tasks/pfc_wd/functional_test/ignore_pfc_wd_messages
@@ -0,0 +1,4 @@
+r, ".* Port counter .* not implemented"
+r, ".* Port counter .* not supported"
+r, ".* Invalid port counter .*"
+r, ".* Trying to remove nonexisting queue from flex counter .*"
diff --git a/ansible/roles/test/tasks/pfc_wd/functional_test/timer_test.yml b/ansible/roles/test/tasks/pfc_wd/functional_test/timer_test.yml
index 4e96dc59e4d..c4a668983c3 100644
--- a/ansible/roles/test/tasks/pfc_wd/functional_test/timer_test.yml
+++ b/ansible/roles/test/tasks/pfc_wd/functional_test/timer_test.yml
@@ -38,7 +38,7 @@
   register: storm_end_millis
 
 - name: Find PFC storm restore message
-  shell: grep "restored from PFC storm" /var/log/syslog
+  shell: grep "PFC Watchdog storm restored" /var/log/syslog
   register: storm_restore
 
 - name: Convert restore message time to milliseconds