diff --git a/tests/topotests/evpn_type5_test_topo1/test_evpn_type5_topo1.py b/tests/topotests/evpn_type5_test_topo1/test_evpn_type5_topo1.py
index 3cdec760f7..8892d13eff 100755
--- a/tests/topotests/evpn_type5_test_topo1/test_evpn_type5_topo1.py
+++ b/tests/topotests/evpn_type5_test_topo1/test_evpn_type5_topo1.py
@@ -250,8 +250,8 @@ def prerequisite_config_for_test_suite(tgen):
         }
 
         result = configure_vxlan(tgen, vxlan_input)
-        assert result is True, "Testcase {} :Failed \n Error: {}".format(
-            tc_name, result
+        assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
+            tc_name, dut, result
         )
 
         step("Configure bridge interface")
@@ -268,8 +268,8 @@ def prerequisite_config_for_test_suite(tgen):
             }
         }
         result = configure_brctl(tgen, topo, brctl_input)
-        assert result is True, "Testcase {} :Failed \n Error: {}".format(
-            tc_name, result
+        assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
+            tc_name, dut, result
         )
 
     step("Configure default routes")
@@ -406,8 +406,8 @@ def test_RD_verification_manual_and_auto_p0(request):
         result = verify_attributes_for_evpn_routes(
             tgen, topo, dut, input_routes, rd="auto", rd_peer="e1"
         )
-        assert result is True, "Testcase {} :Failed \n Error: {}".format(
-            tc_name, result
+        assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
+            tc_name, dut, result
         )
 
     step(
@@ -437,8 +437,8 @@ def test_RD_verification_manual_and_auto_p0(request):
         result = verify_attributes_for_evpn_routes(
             tgen, topo, dut, input_routes, rd="50.50.50.50:50"
         )
-        assert result is True, "Testcase {} :Failed \n Error: {}".format(
-            tc_name, result
+        assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
+            tc_name, dut, result
         )
 
     step(
@@ -472,8 +472,8 @@ def test_RD_verification_manual_and_auto_p0(request):
         result = verify_attributes_for_evpn_routes(
             tgen, topo, dut, input_routes, rd="100.100.100.100:100"
         )
-        assert result is True, "Testcase {} :Failed \n Error: {}".format(
-            tc_name, result
+        assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
+            tc_name, dut, result
         )
 
     step(
@@ -672,8 +672,8 @@ def test_RT_verification_manual_p0(request):
         result = verify_attributes_for_evpn_routes(
             tgen, topo, dut, input_routes, rt="100:100"
         )
-        assert result is True, "Testcase {} :Failed \n Error: {}".format(
-            tc_name, result
+        assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
+            tc_name, dut, result
         )
 
     step(
@@ -711,8 +711,8 @@ def test_RT_verification_manual_p0(request):
         result = verify_attributes_for_evpn_routes(
             tgen, topo, dut, input_routes, rt=["100:100", "500:500"]
         )
-        assert result is True, "Testcase {} :Failed \n Error: {}".format(
-            tc_name, result
+        assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
+            tc_name, dut, result
         )
 
     step(
@@ -834,8 +834,8 @@ def test_RT_verification_manual_p0(request):
         result = verify_attributes_for_evpn_routes(
             tgen, topo, dut, input_routes, rt=["100:100", "500:500"]
         )
-        assert result is True, "Testcase {} :Failed \n Error: {}".format(
-            tc_name, result
+        assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
+            tc_name, dut, result
         )
 
     step("Delete RT export value 100:100 for vrf RED on Edge-1")
@@ -1277,14 +1277,14 @@ def test_evpn_routes_from_VNFs_p1(request):
     for dut in ["d1", "d2"]:
         input_routes = {key: topo["routers"][key] for key in ["r1"]}
         result = verify_evpn_routes(tgen, topo, dut, input_routes)
-        assert result is True, "Testcase {} :Failed \n Error: {}".format(
-            tc_name, result
+        assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
+            tc_name, dut, result
         )
 
         input_routes = {key: topo["routers"][key] for key in ["r2"]}
         result = verify_evpn_routes(tgen, topo, dut, input_routes)
-        assert result is True, "Testcase {} :Failed \n Error: {}".format(
-            tc_name, result
+        assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
+            tc_name, dut, result
         )
 
     step(
@@ -1861,7 +1861,7 @@ def test_bgp_attributes_for_evpn_address_family_p1(request, attribute):
                     temp[dut]["bgp"].append({"local_as": as_num, "delete": True})
 
         result = create_router_bgp(tgen, topo, input_dict_2)
-        assert result is True, "Testcase {} :Failed \n Error: {}".format(
+        assert result is True, "Testcase {} on d1 :Failed \n Error: {}".format(
             tc_name, result
         )
 
diff --git a/tests/topotests/lib/common_config.py b/tests/topotests/lib/common_config.py
index 156a5f7ea4..e4d72ea2d7 100644
--- a/tests/topotests/lib/common_config.py
+++ b/tests/topotests/lib/common_config.py
@@ -2281,7 +2281,7 @@ def configure_vxlan(tgen, input_dict):
                             cmd = "{} local {}".format(cmd, local_addr)
 
                         if learning == "no":
-                            cmd = "{} {} learning".format(cmd, learning)
+                            cmd = "{} nolearning".format(cmd)
 
                         elif learning == "yes":
                             cmd = "{} learning".format(cmd)
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index fc1eb6223d..fbe6ce70a0 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -2441,7 +2441,7 @@ DEFUN (no_vrf_vni_mapping,
 	int filter = 0;
 
 	ZEBRA_DECLVAR_CONTEXT(vrf, zvrf);
-	vni_t vni = strtoul(argv[1]->arg, NULL, 10);
+	vni_t vni = strtoul(argv[2]->arg, NULL, 10);
 
 	assert(vrf);
 	assert(zvrf);