diff --git a/tests/common/devices/sonic.py b/tests/common/devices/sonic.py
index 3d01fc0362..6c24891762 100644
--- a/tests/common/devices/sonic.py
+++ b/tests/common/devices/sonic.py
@@ -1655,7 +1655,7 @@ def get_asic_name(self):
         if ("Broadcom Limited Device b960" in output or
                 "Broadcom Limited Broadcom BCM56960" in output):
             asic = "th"
-        elif "Broadcom Limited Device b971" in output:
+        elif "Device b971" in output:
             asic = "th2"
         elif ("Broadcom Limited Device b850" in output or
                 "Broadcom Limited Broadcom BCM56850" in output):
diff --git a/tests/qos/test_tunnel_qos_remap.py b/tests/qos/test_tunnel_qos_remap.py
index 4eefddec78..ff6191396f 100644
--- a/tests/qos/test_tunnel_qos_remap.py
+++ b/tests/qos/test_tunnel_qos_remap.py
@@ -500,6 +500,7 @@ def test_tunnel_decap_dscp_to_pg_mapping(rand_selected_dut, ptfhost, dut_config,
     """
     toggle_mux_to_host(rand_selected_dut)
     asic = rand_selected_dut.get_asic_name()
+    pytest_assert(asic != 'unknown', 'Get unknown asic name')
     # TODO: Get the cell size for other ASIC
     if asic == 'th2':
         cell_size = 208