diff --git a/tests/topotests/bgp_vpnv4_route_leak_basic/test_bgp_vpnv4_route_leak_basic.py b/tests/topotests/bgp_vpnv4_route_leak_basic/test_bgp_vpnv4_route_leak_basic.py
index a44f07b5600e..b7f72ccea166 100644
--- a/tests/topotests/bgp_vpnv4_route_leak_basic/test_bgp_vpnv4_route_leak_basic.py
+++ b/tests/topotests/bgp_vpnv4_route_leak_basic/test_bgp_vpnv4_route_leak_basic.py
@@ -119,20 +119,7 @@ def test_vrf_route_leak_donna():
                 ],
             },
         ],
-        "172.16.101.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": None,
-                "nexthops": [
-                    {
-                        "fib": None,
-                        "interfaceName": "unknown",
-                        "vrf": "Unknown",
-                        "active": None,
-                    },
-                ],
-            },
-        ],
+        "172.16.101.0/24": None,
     }
 
     test_func = partial(
@@ -191,20 +178,7 @@ def test_vrf_route_leak_eva():
                 "protocol": "connected",
             }
         ],
-        "172.16.101.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": None,
-                "nexthops": [
-                    {
-                        "fib": None,
-                        "interfaceName": "unknown",
-                        "vrf": "Unknown",
-                        "active": None,
-                    },
-                ],
-            },
-        ],
+        "172.16.101.0/24": None,
     }
 
     test_func = partial(
@@ -298,34 +272,8 @@ def test_vrf_route_leak_donna_after_eva_down():
 
     # Test DONNA VRF.
     expect = {
-        "10.0.1.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": None,
-                "nexthops": [
-                    {
-                        "fib": None,
-                        "interfaceName": "EVA",
-                        "vrf": "EVA",
-                        "active": None,
-                    },
-                ],
-            },
-        ],
-        "10.0.3.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": None,
-                "nexthops": [
-                    {
-                        "fib": None,
-                        "interfaceName": "EVA",
-                        "vrf": "EVA",
-                        "active": None,
-                    },
-                ],
-            },
-        ],
+        "10.0.1.0/24": None,
+        "10.0.3.0/24": None,
     }
 
     test_func = partial(
@@ -417,20 +365,7 @@ def test_vrf_route_leak_donna_add_vrf_zita():
 
     # Test DONNA VRF.
     expect = {
-        "172.16.101.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": None,
-                "nexthops": [
-                    {
-                        "fib": None,
-                        "interfaceName": "ZITA",
-                        "vrf": "ZITA",
-                        "active": None,
-                    },
-                ],
-            },
-        ],
+        "172.16.101.0/24": None,
     }
 
     test_func = partial(
diff --git a/tests/topotests/bgp_vrf_route_leak_basic/test_bgp-vrf-route-leak-basic.py b/tests/topotests/bgp_vrf_route_leak_basic/test_bgp-vrf-route-leak-basic.py
index 6d4b436bccf9..3bc36862bf76 100644
--- a/tests/topotests/bgp_vrf_route_leak_basic/test_bgp-vrf-route-leak-basic.py
+++ b/tests/topotests/bgp_vrf_route_leak_basic/test_bgp-vrf-route-leak-basic.py
@@ -123,20 +123,7 @@ def test_vrf_route_leak_donna():
                 ],
             },
         ],
-        "172.16.101.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": None,
-                "nexthops": [
-                    {
-                        "fib": None,
-                        "interfaceName": "unknown",
-                        "vrf": "Unknown",
-                        "active": None,
-                    },
-                ],
-            },
-        ],
+        "172.16.101.0/24": None,
     }
 
     test_func = partial(
@@ -195,20 +182,7 @@ def test_vrf_route_leak_eva():
                 "protocol": "connected",
             }
         ],
-        "172.16.101.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": None,
-                "nexthops": [
-                    {
-                        "fib": None,
-                        "interfaceName": "unknown",
-                        "vrf": "Unknown",
-                        "active": None,
-                    },
-                ],
-            },
-        ],
+        "172.16.101.0/24": None,
     }
 
     test_func = partial(
@@ -302,34 +276,8 @@ def test_vrf_route_leak_donna_after_eva_down():
 
     # Test DONNA VRF.
     expect = {
-        "10.0.1.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": None,
-                "nexthops": [
-                    {
-                        "fib": None,
-                        "interfaceName": "EVA",
-                        "vrf": "EVA",
-                        "active": None,
-                    },
-                ],
-            },
-        ],
-        "10.0.3.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": None,
-                "nexthops": [
-                    {
-                        "fib": None,
-                        "interfaceName": "EVA",
-                        "vrf": "EVA",
-                        "active": None,
-                    },
-                ],
-            },
-        ],
+        "10.0.1.0/24": None,
+        "10.0.3.0/24": None,
     }
 
     test_func = partial(
@@ -421,20 +369,7 @@ def test_vrf_route_leak_donna_add_vrf_zita():
 
     # Test DONNA VRF.
     expect = {
-        "172.16.101.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": None,
-                "nexthops": [
-                    {
-                        "fib": None,
-                        "interfaceName": "ZITA",
-                        "vrf": "ZITA",
-                        "active": None,
-                    },
-                ],
-            },
-        ],
+        "172.16.101.0/24": None,
     }
 
     test_func = partial(