diff --git a/.azure-pipelines/pr_test_scripts.yaml b/.azure-pipelines/pr_test_scripts.yaml
index cd939084390..79523041a40 100644
--- a/.azure-pipelines/pr_test_scripts.yaml
+++ b/.azure-pipelines/pr_test_scripts.yaml
@@ -487,6 +487,9 @@ onboarding_t0:
   - generic_config_updater/test_mgmt_interface.py
   - gnmi/test_gnmi_smartswitch.py
   - gnmi/test_gnoi_killprocess.py
+  - qos/test_pfc_counters.py
+  - qos/test_pfc_pause.py
+  - qos/test_qos_dscp_mapping.py
 
 
 onboarding_t1:
@@ -496,6 +499,8 @@ onboarding_t1:
   - generic_config_updater/test_mgmt_interface.py
   - gnmi/test_gnmi_smartswitch.py
   - gnmi/test_gnoi_killprocess.py
+  - qos/test_pfc_counters.py
+  - qos/test_qos_dscp_mapping.py
 
 specific_param:
   t0-sonic:
diff --git a/.azure-pipelines/pr_test_skip_scripts.yaml b/.azure-pipelines/pr_test_skip_scripts.yaml
index cb2969406d3..88b0572eb56 100644
--- a/.azure-pipelines/pr_test_skip_scripts.yaml
+++ b/.azure-pipelines/pr_test_skip_scripts.yaml
@@ -56,6 +56,10 @@ t0:
   - platform_tests/mellanox/test_hw_management_service.py
   - platform_tests/mellanox/test_psu_power_threshold.py
   - platform_tests/mellanox/test_reboot_cause.py
+  # Qos buffer traditional test is only supported 201911 branch
+  - qos/test_buffer_traditional.py
+  # This test only support on cisco device with cisco sdk-debug mode
+  - qos/test_ecn_config.py
   # read_mac test needs specific variables and image urls, currently do not support on KVM and regular nightly test
   - read_mac/test_read_mac_metadata.py
   # This script only supported on Mellanox
diff --git a/tests/common/system_utils/docker.py b/tests/common/system_utils/docker.py
index e61ea60208a..dc7fdf06a35 100644
--- a/tests/common/system_utils/docker.py
+++ b/tests/common/system_utils/docker.py
@@ -246,8 +246,6 @@ def _get_vendor_id(duthost):
         vendor_id = "cisco"
     elif is_marvell_teralynx_device(duthost):
         vendor_id = "invm"
-    elif duthost.facts["asic_type"] == "vs":
-        vendor_id = "vs"
     else:
         error_message = '"{}" does not currently support swap_syncd'.format(duthost.facts["asic_type"])
         logger.error(error_message)