diff --git a/tests/qos/qos_sai_base.py b/tests/qos/qos_sai_base.py
index 06ffb49a04c..b6098a903ca 100644
--- a/tests/qos/qos_sai_base.py
+++ b/tests/qos/qos_sai_base.py
@@ -209,6 +209,13 @@ def __getBufferProfile(self, request, dut_asic, os_version, table, port, priorit
                 bufferProfile (dict): Map of buffer profile attributes
         """
 
+        if table == "BUFFER_QUEUE_TABLE" and dut_asic.sonichost.facts['switch_type'] == 'voq':
+            # For VoQ chassis, the buffer queues config is based on system port
+            if dut_asic.sonichost.is_multi_asic:
+                port = "{}:{}:{}".format(dut_asic.sonichost.hostname, dut_asic.namespace, port)
+            else:
+                port = "{}:Asic0:{}".format(dut_asic.sonichost.hostname, port)
+
         if self.isBufferInApplDb(dut_asic):
             db = "0"
             keystr = "{0}:{1}:{2}".format(table, port, priorityGroup)