diff --git a/tests/common/plugins/fib.py b/tests/common/plugins/fib.py
index e2831c16c9d..d98cecca715 100644
--- a/tests/common/plugins/fib.py
+++ b/tests/common/plugins/fib.py
@@ -150,7 +150,8 @@ def fib_t0(ptfhost, testbed):
                                     spine_asn, leaf_asn_start, tor_asn_start,
                                     local_ip, local_ipv6)
 
-        announce_routes(ptfip, port, routes_v4 + routes_v6)
+        announce_routes(ptfip, port, routes_v4)
+        announce_routes(ptfip, port6, routes_v6)
 
 
 def fib_t1_lag(ptfhost, testbed):
@@ -211,7 +212,8 @@ def fib_t1_lag(ptfhost, testbed):
             routes_v6 = generate_routes("v6", podset_number, tor_number, tor_subnet_number,
                                         None, leaf_asn_start, tor_asn_start,
                                         local_ip, local_ipv6, router_type="spine")
-            announce_routes(ptfip, port, routes_v4 + routes_v6)
+            announce_routes(ptfip, port, routes_v4)
+            announce_routes(ptfip, port6, routes_v6)
 
         elif 'tor' in v['properties']:
             routes_v4 = generate_routes("v4", podset_number, tor_number, tor_subnet_number,