diff --git a/tests/pfcwd/cisco/set_pfc_time.py b/tests/pfcwd/cisco/set_pfc_time.py
index 6810b3a5526..f5b0e05cf10 100644
--- a/tests/pfcwd/cisco/set_pfc_time.py
+++ b/tests/pfcwd/cisco/set_pfc_time.py
@@ -1,7 +1,8 @@
-# Verified on Q200 @ 100G port speed. e.g. 687 is bit time to pause for 50ms (clock at 900Mhz).
-
 import math
 
+# Replace INTERFACE with appropriate port when used
+arg_interface = "INTERFACE"
+
 
 def get_ifg_reg_list(slice_idx):
     ''' Gr2 does not have an ifg list, listify '''
@@ -67,4 +68,4 @@ def set_pfc512_bit_sec(interface, time_sec):
 # Increase PFC pause time
 num_ms = 50
 print("Setting PFC frame time to {}ms".format(num_ms))
-set_pfc512_bit_sec("INTERFACE", num_ms / 1000)
+set_pfc512_bit_sec(arg_interface, num_ms / 1000)
diff --git a/tests/pfcwd/conftest.py b/tests/pfcwd/conftest.py
index 735fcc132e6..96605f710e7 100644
--- a/tests/pfcwd/conftest.py
+++ b/tests/pfcwd/conftest.py
@@ -267,8 +267,7 @@ def set_pfc_time_cisco_8000(
     test_ports = setup_pfc_test['test_ports']
 
     # Lets limit this to cisco and T2 only.
-    if not (duthost.facts['asic_type'] == "cisco-8000"
-            and duthost.get_facts().get("modular_chassis")):
+    if duthost.facts['asic_type'] != "cisco-8000":
         yield
         return