diff --git a/tests/topotests/bgp_vpnv6_per_nexthop_label/r1/bgp_ipv6_routes_vrf1.json b/tests/topotests/bgp_vpnv6_per_nexthop_label/r1/bgp_ipv6_routes_vrf1.json
index 159879a853..39ba7dd622 100644
--- a/tests/topotests/bgp_vpnv6_per_nexthop_label/r1/bgp_ipv6_routes_vrf1.json
+++ b/tests/topotests/bgp_vpnv6_per_nexthop_label/r1/bgp_ipv6_routes_vrf1.json
@@ -48,11 +48,11 @@
                          {
                              "ip":"192:2::12",
                              "afi":"ipv6",
-                             "scope":"global"
+                             "scope":"global",
+                             "used":true
                          },
                          {
-                             "scope": "link-local",
-                             "used":true
+                             "scope": "link-local"
                          }
                      ]
                  }
@@ -69,7 +69,8 @@
                          {
                              "ip":"192:168::255:13",
                              "afi":"ipv6",
-                             "scope": "global"
+                             "scope": "global",
+                             "used":true
                          },
                          {
                              "scope": "link-local"
@@ -123,7 +124,8 @@
                          {
                              "ip":"192:2::11",
                              "afi":"ipv6",
-                             "scope":"global"
+                             "scope":"global",
+                             "used":true
                          }
                      ]
                  }
@@ -140,7 +142,8 @@
                          {
                              "ip":"192:2::11",
                              "afi":"ipv6",
-                             "scope":"global"
+                             "scope":"global",
+                             "used":true
                          }
                      ]
                  }
diff --git a/tests/topotests/bgp_vpnv6_per_nexthop_label/r1/bgpd.conf b/tests/topotests/bgp_vpnv6_per_nexthop_label/r1/bgpd.conf
index 74e3e6fb5b..6bb0a88f09 100644
--- a/tests/topotests/bgp_vpnv6_per_nexthop_label/r1/bgpd.conf
+++ b/tests/topotests/bgp_vpnv6_per_nexthop_label/r1/bgpd.conf
@@ -24,7 +24,7 @@ router bgp 65500 vrf vrf1
   neighbor 192:168::255:13 activate
   neighbor 192:168::255:13 route-map rmap in
   redistribute connected
-  redistribute static
+  redistribute static route-map rmap
   label vpn export allocation-mode per-nexthop
   label vpn export auto
   rd vpn export 444:1
@@ -39,7 +39,6 @@ interface r1-eth0
 bgp community-list 1 seq 5 permit 10:10
 !
 route-map rmap permit 1
- match community 1
  set ipv6 next-hop prefer-global
 !
 route-map rmap permit 2
diff --git a/tests/topotests/bgp_vpnv6_per_nexthop_label/r11/bgpd.conf b/tests/topotests/bgp_vpnv6_per_nexthop_label/r11/bgpd.conf
index d0d4e3dc43..cb653d61b5 100644
--- a/tests/topotests/bgp_vpnv6_per_nexthop_label/r11/bgpd.conf
+++ b/tests/topotests/bgp_vpnv6_per_nexthop_label/r11/bgpd.conf
@@ -7,12 +7,9 @@ router bgp 65500
  !
  address-family ipv6 unicast
   neighbor 192:2::100 activate
-  neighbor 192:2::100 route-map rmap out
   network 172:31::11/128
   network 172:31::111/128
   network 172:31::20/128
  exit-address-family
 !
-route-map rmap permit 1
- set community 10:10
-!
+
diff --git a/tests/topotests/bgp_vpnv6_per_nexthop_label/r13/bgpd.conf b/tests/topotests/bgp_vpnv6_per_nexthop_label/r13/bgpd.conf
index 201b905b3e..04378825ae 100644
--- a/tests/topotests/bgp_vpnv6_per_nexthop_label/r13/bgpd.conf
+++ b/tests/topotests/bgp_vpnv6_per_nexthop_label/r13/bgpd.conf
@@ -7,10 +7,6 @@ router bgp 65500
  exit-address-family
  address-family ipv6 unicast
   neighbor 192:168::255:1 activate
-  neighbor 192:168::255:1 route-map rmap out
   network 172:31::0:13/128
  exit-address-family
 !
-route-map rmap permit 1
- set community 10:10
-!
diff --git a/tests/topotests/bgp_vpnv6_per_nexthop_label/test_bgp_vpnv6_per_nexthop_label.py b/tests/topotests/bgp_vpnv6_per_nexthop_label/test_bgp_vpnv6_per_nexthop_label.py
index bb71895cba..719ba801c1 100644
--- a/tests/topotests/bgp_vpnv6_per_nexthop_label/test_bgp_vpnv6_per_nexthop_label.py
+++ b/tests/topotests/bgp_vpnv6_per_nexthop_label/test_bgp_vpnv6_per_nexthop_label.py
@@ -52,9 +52,7 @@ from lib.topolog import logger
 pytestmark = [pytest.mark.bgpd]
 
 PREFIXES_R11 = ["172:31::11/128", "172:31::20/128", "172:31::111/128"]
-PREFIXES_R12 = ["172:31::12/128"]
-PREFIXES_REDIST_R12 = ["172:31::15/128"]
-PREFIXES_R13 = ["172:31::13/128"]
+PREFIXES_R12 = ["172:31::12/128", "172:31::15/128"]
 PREFIXES_REDIST_R14 = ["172:31::14/128"]
 PREFIXES_CONNECTED = ["192:168::255/112", "192:2::/64"]
 
@@ -214,8 +212,6 @@ def bgp_vpnv6_table_check_all(router, label_list=None, same=False):
             router,
             group=PREFIXES_R11
             + PREFIXES_R12
-            + PREFIXES_REDIST_R12
-            + PREFIXES_R13
             + PREFIXES_REDIST_R14
             + PREFIXES_CONNECTED,
             label_list=label_list,
@@ -224,8 +220,6 @@ def bgp_vpnv6_table_check_all(router, label_list=None, same=False):
         for group in (
             PREFIXES_R11,
             PREFIXES_R12,
-            PREFIXES_REDIST_R12,
-            PREFIXES_R13,
             PREFIXES_REDIST_R14,
             PREFIXES_CONNECTED,
         ):