diff --git a/fixtures/physical_router_fixture.py b/fixtures/physical_router_fixture.py
index 28cc124e7..c8d47e66a 100644
--- a/fixtures/physical_router_fixture.py
+++ b/fixtures/physical_router_fixture.py
@@ -58,7 +58,7 @@ def __init__(self, *args, **kwargs):
     def create_bgp_router(self):
         bgp_router = vnc_api_test.BgpRouter(self.name, parent_obj=self._get_ip_fabric_ri_obj())
         params = vnc_api_test.BgpRouterParams()
-        params.address = self.tunnel_ip
+        params.address = self.tunnel_ip or self.mgmt_ip
         params.address_families = vnc_api_test.AddressFamilies(['route-target',
             'inet-vpn', 'e-vpn', 'inet6-vpn'])
         params.autonomous_system = int(self.asn)
diff --git a/serial_scripts/firewall/test_fw.py b/serial_scripts/firewall/test_fw.py
index 3a6f8329e..1d7889f33 100644
--- a/serial_scripts/firewall/test_fw.py
+++ b/serial_scripts/firewall/test_fw.py
@@ -128,7 +128,7 @@ def _create_objects(self, SCOPE1='local', SCOPE2='global'):
 
         assert self.check_vms_booted(self.vms.itervalues(), do_assert=False)
 
-    @test.attr(type=['sanity'])
+    @test.attr(type=['sanity', 'vcenter'])
     @preposttest_wrapper
     def test_global_scope(self):
         '''