diff --git a/tests/common/devices/multi_asic.py b/tests/common/devices/multi_asic.py
index 86af44da91b..4d66b520ab3 100644
--- a/tests/common/devices/multi_asic.py
+++ b/tests/common/devices/multi_asic.py
@@ -482,6 +482,8 @@ def get_bgp_neighbors(self):
         """
         bgp_neigh = {}
         for asic in self.asics:
+            if asic.get_docker_name("bgp") not in self.critical_services:
+                continue
             bgp_info = asic.bgp_facts()
             bgp_neigh.update(bgp_info["ansible_facts"]["bgp_neighbors"])
 
@@ -499,6 +501,8 @@ def get_bgp_neighbors_per_asic(self, state="established"):
         bgp_neigh = {}
         for asic in self.asics:
             bgp_neigh[asic.namespace] = {}
+            if asic.get_docker_name("bgp") not in self.critical_services:
+                continue
             bgp_info = asic.bgp_facts()["ansible_facts"]["bgp_neighbors"]
             for k, v in bgp_info.items():
                 if v["state"] != state:
@@ -518,6 +522,8 @@ def check_bgp_session_state(self, neigh_ips, state="established"):
         neigh_ok = []
 
         for asic in self.asics:
+            if asic.get_docker_name("bgp") not in self.critical_services:
+                continue
             bgp_facts = asic.bgp_facts()['ansible_facts']
             for k, v in bgp_facts['bgp_neighbors'].items():
                 if v['state'] == state:
@@ -538,6 +544,8 @@ def check_bgp_session_state_all_asics(self, bgp_neighbors, state="established"):
         @param state: target state
         """
         for asic in self.asics:
+            if asic.get_docker_name("bgp") not in self.critical_services:
+                continue
             if asic.namespace in bgp_neighbors:
                 neigh_ips = [k.lower() for k, v in bgp_neighbors[asic.namespace].items() if v["state"] == state]
                 if not asic.check_bgp_session_state(neigh_ips, state):