diff --git a/tests/dns/test_dns_resolv_conf.py b/tests/dns/test_dns_resolv_conf.py
index 645bbd17bbc..c1022ed3599 100644
--- a/tests/dns/test_dns_resolv_conf.py
+++ b/tests/dns/test_dns_resolv_conf.py
@@ -41,7 +41,7 @@ def setup_env(duthost):
 
     # Restore default dns
     config_reload_minigraph_with_rendered_golden_config_override(
-        duthost, safe_reload=True, check_intf_up_ports=True
+        duthost, safe_reload=True, check_intf_up_ports=True, wait_for_bgp=True
     )
 
     yield
@@ -54,7 +54,7 @@ def setup_env(duthost):
         duthost.file(path=GOLDEN_CONFIG, state='absent')
 
     # Restore config
-    config_reload(duthost, safe_reload=True)
+    config_reload(duthost, safe_reload=True, check_intf_up_ports=True, wait_for_bgp=True)
 
 
 def test_dns_resolv_conf(duthost):