diff --git a/tests/topotests/bgp_bmp/r1/bgpd.conf b/tests/topotests/bgp_bmp/r1/frr.conf
similarity index 93%
rename from tests/topotests/bgp_bmp/r1/bgpd.conf
rename to tests/topotests/bgp_bmp/r1/frr.conf
index 485c2170967c..0705e967cb3c 100644
--- a/tests/topotests/bgp_bmp/r1/bgpd.conf
+++ b/tests/topotests/bgp_bmp/r1/frr.conf
@@ -1,3 +1,10 @@
+interface r1-eth0
+ ip address 192.0.2.1/24
+!
+interface r1-eth1
+ ip address 192.168.0.1/24
+ ipv6 address 192:168::1/64
+!
 router bgp 65501
  bgp router-id 192.168.0.1
  bgp log-neighbor-changes
diff --git a/tests/topotests/bgp_bmp/r1/zebra.conf b/tests/topotests/bgp_bmp/r1/zebra.conf
deleted file mode 100644
index 0b523c9e18d8..000000000000
--- a/tests/topotests/bgp_bmp/r1/zebra.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-interface r1-eth0
- ip address 192.0.2.1/24
-!
-interface r1-eth1
- ip address 192.168.0.1/24
- ipv6 address 192:168::1/64
-!
diff --git a/tests/topotests/bgp_bmp/r1vrf/bgpd.conf b/tests/topotests/bgp_bmp/r1vrf/frr.conf
similarity index 86%
rename from tests/topotests/bgp_bmp/r1vrf/bgpd.conf
rename to tests/topotests/bgp_bmp/r1vrf/frr.conf
index 961e20498b2e..cb8a7d2b14e4 100644
--- a/tests/topotests/bgp_bmp/r1vrf/bgpd.conf
+++ b/tests/topotests/bgp_bmp/r1vrf/frr.conf
@@ -1,3 +1,10 @@
+interface r1vrf-eth0
+ ip address 192.0.2.1/24
+!
+interface r1vrf-eth1
+ ip address 192.168.0.1/24
+ ipv6 address 192:168::1/64
+!
 router bgp 65501 vrf vrf1
  bgp router-id 192.168.0.1
  bgp log-neighbor-changes
@@ -15,7 +22,6 @@ router bgp 65501 vrf vrf1
    bmp monitor ipv6 unicast loc-rib
  exit
 !
-
  address-family ipv4 unicast
   neighbor 192.168.0.2 activate
   neighbor 192.168.0.2 soft-reconfiguration inbound
diff --git a/tests/topotests/bgp_bmp/r1vrf/zebra.conf b/tests/topotests/bgp_bmp/r1vrf/zebra.conf
deleted file mode 100644
index a242eadce8a7..000000000000
--- a/tests/topotests/bgp_bmp/r1vrf/zebra.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-interface r1vrf-eth0
- ip address 192.0.2.1/24
-!
-interface r1vrf-eth1
- ip address 192.168.0.1/24
- ipv6 address 192:168::1/64
-!
diff --git a/tests/topotests/bgp_bmp/r2/bgpd.conf b/tests/topotests/bgp_bmp/r2/frr.conf
similarity index 87%
rename from tests/topotests/bgp_bmp/r2/bgpd.conf
rename to tests/topotests/bgp_bmp/r2/frr.conf
index 40e2cd5bbcb9..250071f48477 100644
--- a/tests/topotests/bgp_bmp/r2/bgpd.conf
+++ b/tests/topotests/bgp_bmp/r2/frr.conf
@@ -1,3 +1,11 @@
+interface r2-eth0
+ ip address 192.168.0.2/24
+ ipv6 address 192:168::2/64
+!
+interface r2-eth1
+ ip address 172.31.0.2/24
+ ipv6 address 172:31::2/64
+!
 router bgp 65502
  bgp router-id 192.168.0.2
  bgp log-neighbor-changes
diff --git a/tests/topotests/bgp_bmp/r2/zebra.conf b/tests/topotests/bgp_bmp/r2/zebra.conf
deleted file mode 100644
index 9d82bfe2df5c..000000000000
--- a/tests/topotests/bgp_bmp/r2/zebra.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-interface r2-eth0
- ip address 192.168.0.2/24
- ipv6 address 192:168::2/64
-!
-interface r2-eth1
- ip address 172.31.0.2/24
- ipv6 address 172:31::2/64
-!
diff --git a/tests/topotests/bgp_bmp/r2vrf/bgpd.conf b/tests/topotests/bgp_bmp/r2vrf/frr.conf
similarity index 74%
rename from tests/topotests/bgp_bmp/r2vrf/bgpd.conf
rename to tests/topotests/bgp_bmp/r2vrf/frr.conf
index 7c8255a17563..5268190dec21 100644
--- a/tests/topotests/bgp_bmp/r2vrf/bgpd.conf
+++ b/tests/topotests/bgp_bmp/r2vrf/frr.conf
@@ -1,3 +1,11 @@
+interface r2vrf-eth0
+ ip address 192.168.0.2/24
+ ipv6 address 192:168::2/64
+!
+interface r2vrf-eth1
+ ip address 172.31.0.2/24
+ ipv6 address 172:31::2/64
+!
 router bgp 65502
  bgp router-id 192.168.0.2
  bgp log-neighbor-changes
diff --git a/tests/topotests/bgp_bmp/r2vrf/zebra.conf b/tests/topotests/bgp_bmp/r2vrf/zebra.conf
deleted file mode 100644
index 9a8da2d95fbd..000000000000
--- a/tests/topotests/bgp_bmp/r2vrf/zebra.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-interface r2vrf-eth0
- ip address 192.168.0.2/24
- ipv6 address 192:168::2/64
-!
-interface r2vrf-eth1
- ip address 172.31.0.2/24
- ipv6 address 172:31::2/64
-!
diff --git a/tests/topotests/bgp_bmp/test_bgp_bmp_1.py b/tests/topotests/bgp_bmp/test_bgp_bmp_1.py
index cc7bc31041d9..395396a08fd8 100644
--- a/tests/topotests/bgp_bmp/test_bgp_bmp_1.py
+++ b/tests/topotests/bgp_bmp/test_bgp_bmp_1.py
@@ -79,14 +79,9 @@ def setup_module(mod):
         )
 
     for rname, router in tgen.routers().items():
-        router.load_config(
-            TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname))
-        )
-        router.load_config(
-            TopoRouter.RD_BGP,
-            os.path.join(CWD, "{}/bgpd.conf".format(rname)),
-            "-M bmp",
-        )
+        logger.info("Loading router %s" % rname)
+        router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname)),
+                               [(TopoRouter.RD_ZEBRA, None), (TopoRouter.RD_BGP, '-M bmp')])
 
     tgen.start_router()
 
diff --git a/tests/topotests/bgp_bmp/test_bgp_bmp_2.py b/tests/topotests/bgp_bmp/test_bgp_bmp_2.py
index 97cc98962bb6..4116572f1b5a 100644
--- a/tests/topotests/bgp_bmp/test_bgp_bmp_2.py
+++ b/tests/topotests/bgp_bmp/test_bgp_bmp_2.py
@@ -91,14 +91,9 @@ def setup_module(mod):
         )
 
     for rname, router in tgen.routers().items():
-        router.load_config(
-            TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname))
-        )
-        router.load_config(
-            TopoRouter.RD_BGP,
-            os.path.join(CWD, "{}/bgpd.conf".format(rname)),
-            "-M bmp",
-        )
+        logger.info("Loading router %s" % rname)
+        router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname)),
+                               [(TopoRouter.RD_ZEBRA, None), (TopoRouter.RD_BGP, '-M bmp')])
 
     tgen.start_router()