diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/__init__.py b/tests/topotests/bgp_nexthop_mp_ipv4_6/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/h1/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/h1/zebra.conf
deleted file mode 100644
index 9b19b2cfbd36..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/h1/zebra.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ipv6 route ::/0 fd00:100::2
-ip route 0.0.0.0/0 192.168.1.2
-interface eth-r1
- ip address 192.168.1.1/24
- ipv6 address fd00:100::1/64
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/h2/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/h2/zebra.conf
deleted file mode 100644
index 2bf4a666808a..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/h2/zebra.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ipv6 route ::/0 fd00:700::2
-ip route 0.0.0.0/0 192.168.7.2
-interface eth-r7
- ip address 192.168.7.1/24
- ipv6 address fd00:700::1/64
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/h3/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/h3/zebra.conf
deleted file mode 100644
index e8b6ac6e268e..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/h3/zebra.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ipv6 route ::/0 fd00:800::2
-ip route 0.0.0.0/0 192.168.8.2
-interface eth-r8
- ip address 192.168.8.1/24
- ipv6 address fd00:800::1/64
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv4.json
deleted file mode 100755
index 12fecee39fdf..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv4.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "0.0.0.0",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65000 65700",
-        "nexthops": [
-          {
-            "ip": "172.16.1.3",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65700",
-        "nexthops": [
-          {
-            "ip": "172.16.0.2",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65000 65800",
-        "nexthops": [
-          {
-            "ip": "172.16.1.3",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65800",
-        "nexthops": [
-          {
-            "ip": "172.16.0.2",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step1.json
deleted file mode 100755
index f7c5c7c3b56a..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "::",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65000 65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:2::3",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::2",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65000 65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:2::3",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::2",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgpd.conf
deleted file mode 100644
index 23b986d1301a..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgpd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-router bgp 65100
- no bgp ebgp-requires-policy
- neighbor 172.16.0.2 remote-as external
- neighbor 172.16.1.3 remote-as external
- ! neighbor 172.16.0.2 capability extended-nexthop
- !
- address-family ipv4 unicast
-  redistribute connected route-map RMAP4
- !
- address-family ipv6 unicast
-  redistribute connected route-map RMAP6
-  neighbor 172.16.0.2 activate
-  neighbor 172.16.1.3 activate
- !
-
-ip prefix-list RANGE4 seq 10 permit 192.168.0.0/16 le 24
-ipv6 prefix-list RANGE6 seq 10 permit fd00:100::0/64
-
-route-map RMAP4 permit 10
- match ip address prefix-list RANGE4
-!
-route-map RMAP6 permit 10
- match ipv6 address prefix-list RANGE6
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/zebra.conf
deleted file mode 100644
index 79cbafb5b817..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/zebra.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-!
-interface eth-h1
- ip address 192.168.1.2/24
- ipv6 address fd00:100::2/64
-!
-interface eth-r2
- ip address 172.16.0.1/24
- ipv6 address fd00:0:1::1/64
-!
-interface eth-r3
- ip address 172.16.1.1/24
- ipv6 address fd00:0:2::1/64
-!
-interface lo
- ip address 192.0.2.1/32
- ipv6 address 2001:db8::1/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv4.json
deleted file mode 100755
index 64dadf680c0b..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.0.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step1.json
deleted file mode 100644
index 4f86a1a648a5..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::1",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgpd.conf
deleted file mode 100644
index badb11cbebe2..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgpd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-router bgp 65000
- no bgp ebgp-requires-policy
- neighbor 172.16.0.1 remote-as external
- ! neighbor 172.16.0.1 capability extended-nexthop
- neighbor 192.0.2.101 remote-as internal
- neighbor 192.0.2.101 update-source 192.0.2.2
- !
- address-family ipv6 unicast
-  neighbor 172.16.0.1 activate
-  neighbor 192.0.2.101 activate
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/isisd.conf
deleted file mode 100644
index 16963798f817..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/isisd.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-rr1
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r1
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-router isis 1
- net 49.0000.0000.0000.0002.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/zebra.conf
deleted file mode 100644
index 8997115d87cc..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-interface eth-r1
- ip address 172.16.0.2/24
- ipv6 address fd00:0:1::2/64
-!
-interface eth-rr1
- ip address 10.0.0.2/24
- ipv6 address fd00:0:3::2/64
-!
-interface lo
- ip address 192.0.2.2/32
- ipv6 address 2001:db8::2/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv4.json
deleted file mode 100644
index 0f18a43bf54a..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.1.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step1.json
deleted file mode 100644
index f44121c30ef8..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:2::1",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgpd.conf
deleted file mode 100644
index 4dec311f511d..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgpd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-router bgp 65000
- no bgp ebgp-requires-policy
- neighbor 172.16.1.1 remote-as external
- ! neighbor 172.16.1.1 capability extended-nexthop
- neighbor 192.0.2.101 remote-as internal
- neighbor 192.0.2.101 update-source 192.0.2.3
- !
- address-family ipv6 unicast
-  neighbor 172.16.1.1 activate
-  neighbor 192.0.2.101 activate
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/isisd.conf
deleted file mode 100644
index fe3e307b42ee..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/isisd.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-rr1
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r1
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-router isis 1
- net 49.0000.0000.0000.0003.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/zebra.conf
deleted file mode 100644
index 8074bbdcde43..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-interface eth-r1
- ip address 172.16.1.3/24
- ipv6 address fd00:0:2::3/64
-!
-interface eth-rr1
- ip address 10.0.1.3/24
- ipv6 address fd00:0:4::3/64
-!
-interface lo
- ip address 192.0.2.3/32
- ipv6 address 2001:db8::3/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv4.json
deleted file mode 100755
index 64dadf680c0b..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.0.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step1.json
deleted file mode 100755
index 756a78e3b141..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::1",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgpd.conf
deleted file mode 100644
index 2dbc4acddc11..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgpd.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-router bgp 65000
- neighbor 192.0.2.5 remote-as internal
- neighbor 192.0.2.6 remote-as internal
- neighbor 192.0.2.101 remote-as internal
- neighbor 192.0.2.5 update-source 192.0.2.4
- neighbor 192.0.2.6 update-source 192.0.2.4
- neighbor 192.0.2.101 update-source 192.0.2.4
- !
- address-family ipv6 unicast
-  neighbor 192.0.2.5 activate
-  neighbor 192.0.2.6 activate
-  neighbor 192.0.2.101 activate
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/isisd.conf
deleted file mode 100644
index 21eb80f58b44..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/isisd.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-rr1
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r6
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-router isis 1
- net 49.0000.0000.0000.0004.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/zebra.conf
deleted file mode 100644
index c598b345e506..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-interface eth-r6
- ip address 10.0.4.4/24
- ipv6 address fd00:0:7::4/64
-!
-interface eth-rr1
- ip address 10.0.2.4/24
- ipv6 address fd00:0:5::4/64
-!
-interface lo
- ip address 192.0.2.4/32
- ipv6 address 2001:db8::4/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv4.json
deleted file mode 100755
index 64dadf680c0b..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.0.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step1.json
deleted file mode 100755
index 756a78e3b141..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::1",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgpd.conf
deleted file mode 100644
index 101edbd71b21..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgpd.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-router bgp 65000
- neighbor 192.0.2.4 remote-as internal
- neighbor 192.0.2.6 remote-as internal
- neighbor 192.0.2.101 remote-as internal
- neighbor 192.0.2.4 update-source 192.0.2.5
- neighbor 192.0.2.6 update-source 192.0.2.5
- neighbor 192.0.2.101 update-source 192.0.2.5
- !
- address-family ipv6 unicast
-  neighbor 192.0.2.4 activate
-  neighbor 192.0.2.6 activate
-  neighbor 192.0.2.101 activate
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/isisd.conf
deleted file mode 100644
index f998e805b5d9..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/isisd.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-rr1
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r6
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-router isis 1
- net 49.0000.0000.0000.0005.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/zebra.conf
deleted file mode 100644
index 7b43db0958cd..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-interface eth-r6
- ip address 10.0.5.5/24
- ipv6 address fd00:0:8::5/64
-!
-interface eth-rr1
- ip address 10.0.3.5/24
- ipv6 address fd00:0:6::5/64
-!
-interface lo
- ip address 192.0.2.5/32
- ipv6 address 2001:db8::5/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv4.json
deleted file mode 100644
index 64dadf680c0b..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.0.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step1.json
deleted file mode 100644
index 1a01ead2cd14..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::1",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgpd.conf
deleted file mode 100644
index e036a779ae32..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgpd.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-router bgp 65000
- no bgp ebgp-requires-policy
- no bgp enforce-first-as
- neighbor 192.0.2.4 remote-as internal
- neighbor 192.0.2.5 remote-as internal
- neighbor 192.0.2.101 remote-as internal
- neighbor 172.17.0.201 remote-as external
- neighbor 192.0.2.4 update-source 192.0.2.6
- neighbor 192.0.2.5 update-source 192.0.2.6
- neighbor 192.0.2.101 update-source 192.0.2.6
- !
- address-family ipv6 unicast
-  neighbor 192.0.2.4 activate
-  neighbor 192.0.2.5 activate
-  neighbor 192.0.2.101 activate
-  neighbor 172.17.0.201 activate
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/isisd.conf
deleted file mode 100644
index b575290e9b0b..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/isisd.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-r4
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r5
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-sw1
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-router isis 1
- net 49.0000.0000.0000.0006.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/zebra.conf
deleted file mode 100644
index fce74c146c2d..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/zebra.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-!
-interface eth-r4
- ip address 10.0.4.6/24
- ipv6 address fd00:0:7::6/64
-!
-interface eth-r5
- ip address 10.0.5.6/24
- ipv6 address fd00:0:8::6/64
-!
-interface eth-sw1
- ip address 172.17.0.6/24
- ipv6 address fd00:0:9::6/64
-!
-interface lo
- ip address 192.0.2.6/32
- ipv6 address 2001:db8::6/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv4.json
deleted file mode 100644
index 72b0f03c5139..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65100",
-        "nexthops": [
-          {
-            "ip": "172.17.0.6",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "0.0.0.0",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step1.json
deleted file mode 100644
index 8fe5f7c1de48..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::6",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "::",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgpd.conf
deleted file mode 100644
index a707b23af0c2..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgpd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-router bgp 65700
- no bgp ebgp-requires-policy
- no bgp enforce-first-as
- neighbor 172.17.0.201 remote-as external
- !
- address-family ipv4 unicast
-  redistribute connected route-map RMAP4
- !
- address-family ipv6 unicast
-  redistribute connected route-map RMAP6
-  neighbor 172.17.0.201 activate
- !
-
-ip prefix-list RANGE4 seq 10 permit 192.168.0.0/16 le 24
-ipv6 prefix-list RANGE6 seq 10 permit fd00:700::0/64
-
-route-map RMAP4 permit 10
- match ip address prefix-list RANGE4
-!
-route-map RMAP6 permit 10
- match ipv6 address prefix-list RANGE6
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/zebra.conf
deleted file mode 100644
index 75448297eb78..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-interface eth-h2
- ip address 192.168.7.2/24
- ipv6 address fd00:700::2/64
-!
-interface eth-sw1
- ip address 172.17.0.7/24
- ipv6 address fd00:0:9::7/64
-!
-interface lo
- ip address 192.0.2.7/32
- ipv6 address 2001:db8::7/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv4.json
deleted file mode 100644
index 596ee4b40bcf..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65100",
-        "nexthops": [
-          {
-            "ip": "172.17.0.6",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "0.0.0.0",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step1.json
deleted file mode 100644
index 20f4940328f7..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::6",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "::",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgpd.conf
deleted file mode 100644
index d57712dcddbf..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgpd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-router bgp 65800
- no bgp ebgp-requires-policy
- no bgp enforce-first-as
- neighbor 172.17.0.201 remote-as external
- !
- address-family ipv4 unicast
-  redistribute connected route-map RMAP4
- !
- address-family ipv6 unicast
-  redistribute connected route-map RMAP6
-  neighbor 172.17.0.201 activate
- !
-
-ip prefix-list RANGE4 seq 10 permit 192.168.0.0/16 le 24
-ipv6 prefix-list RANGE6 seq 10 permit fd00:800::0/64
-
-route-map RMAP4 permit 10
- match ip address prefix-list RANGE4
-!
-route-map RMAP6 permit 10
- match ipv6 address prefix-list RANGE6
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/zebra.conf
deleted file mode 100644
index 7e2479b751d9..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-interface eth-h3
- ip address 192.168.8.2/24
- ipv6 address fd00:800::2/64
-!
-interface eth-sw1
- ip address 172.17.0.8/24
- ipv6 address fd00:0:9::8/64
-!
-interface lo
- ip address 192.0.2.8/32
- ipv6 address 2001:db8::8/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv4.json
deleted file mode 100644
index ac67fe069c8b..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv4.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.0.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.1.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step1.json
deleted file mode 100644
index 4e359fd97ff9..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::1",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:2::1",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgpd.conf
deleted file mode 100644
index 9bbac8b68e9e..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgpd.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-router bgp 65000
- neighbor 192.0.2.2 remote-as internal
- neighbor 192.0.2.3 remote-as internal
- neighbor 192.0.2.4 remote-as internal
- neighbor 192.0.2.5 remote-as internal
- neighbor 192.0.2.6 remote-as internal
- neighbor 192.0.2.2 update-source 192.0.2.101
- neighbor 192.0.2.3 update-source 192.0.2.101
- neighbor 192.0.2.4 update-source 192.0.2.101
- neighbor 192.0.2.5 update-source 192.0.2.101
- neighbor 192.0.2.6 update-source 192.0.2.101
- !
- address-family ipv4 unicast
-  neighbor 192.0.2.2 route-reflector-client
-  neighbor 192.0.2.3 route-reflector-client
-
- !
- address-family ipv6 unicast
-  neighbor 192.0.2.2 activate
-  neighbor 192.0.2.3 activate
-  neighbor 192.0.2.4 activate
-  neighbor 192.0.2.5 activate
-  neighbor 192.0.2.6 activate
-  neighbor 192.0.2.2 route-reflector-client
-  neighbor 192.0.2.3 route-reflector-client
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/isisd.conf
deleted file mode 100644
index fe5bcfb9f1bc..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/isisd.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-r2
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r3
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r4
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r5
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-router isis 1
- net 49.0000.0000.0000.0101.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/zebra.conf
deleted file mode 100644
index 7f5c8d1c61a1..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/zebra.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-!
-interface eth-r2
- ip address 10.0.0.101/24
- ipv6 address fd00:0:3::101/64
-!
-interface eth-r3
- ip address 10.0.1.101/24
- ipv6 address fd00:0:4::101/64
-!
-interface eth-r4
- ip address 10.0.2.101/24
- ipv6 address fd00:0:5::101/64
-!
-interface eth-r5
- ip address 10.0.3.101/24
- ipv6 address fd00:0:6::101/64
-!
-interface lo
- ip address 192.0.2.101/32
- ipv6 address 2001:db8::101/128
-
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/bgpd.conf
deleted file mode 100644
index 596cc3e25cb0..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/bgpd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-router bgp 65200 view RS
- bgp router-id 192.0.2.201
- no bgp ebgp-requires-policy
- neighbor 172.17.0.6 remote-as external
- neighbor 172.17.0.7 remote-as external
- neighbor 172.17.0.8 remote-as external
- !
- address-family ipv4 unicast
-  neighbor 172.17.0.6 route-server-client
-  neighbor 172.17.0.7 route-server-client
-  neighbor 172.17.0.8 route-server-client
-
- !
- address-family ipv6 unicast
-  neighbor 172.17.0.6 activate
-  neighbor 172.17.0.7 activate
-  neighbor 172.17.0.8 activate
-  neighbor 172.17.0.6 route-server-client
-  neighbor 172.17.0.7 route-server-client
-  neighbor 172.17.0.8 route-server-client
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/isisd.conf
deleted file mode 100644
index 892b4e7b74e8..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/isisd.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-r2
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
-!
-interface eth-r3
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
-!
-interface eth-r4
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
-!
-interface eth-r5
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
-!
-router isis 1
- net 49.0000.0000.0000.0101.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/zebra.conf
deleted file mode 100644
index 75ee08363ae4..000000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/zebra.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-interface eth-sw1
- ip address 172.17.0.201/24
- ipv6 address fd00:0:9::201/64
-!
-interface lo
- ip address 192.0.2.201/32
- ipv6 address 2001:db8::201/128
-