diff --git a/bgpd/bgp_clist.c b/bgpd/bgp_clist.c
index 6479126d0637..ca9c428b47b6 100644
--- a/bgpd/bgp_clist.c
+++ b/bgpd/bgp_clist.c
@@ -11,7 +11,6 @@
 #include "queue.h"
 #include "filter.h"
 #include "stream.h"
-#include "jhash.h"
 #include "frrstr.h"
 
 #include "bgpd/bgpd.h"
diff --git a/tests/topotests/bgp_lu_topo1/R3/bgpd.conf b/tests/topotests/bgp_lu_topo1/R3/bgpd.conf
index 31d26ea1ed37..9ba059aeeca9 100644
--- a/tests/topotests/bgp_lu_topo1/R3/bgpd.conf
+++ b/tests/topotests/bgp_lu_topo1/R3/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log
 !
 ! debug bgp updates
 !
diff --git a/tests/topotests/bgp_lu_topo1/R3/zebra.conf b/tests/topotests/bgp_lu_topo1/R3/zebra.conf
index ea4a1482dd42..fedcd6bc3a7e 100644
--- a/tests/topotests/bgp_lu_topo1/R3/zebra.conf
+++ b/tests/topotests/bgp_lu_topo1/R3/zebra.conf
@@ -1,4 +1,3 @@
-log file /tmp/zebra.log
 !
 ! debug zebra events
 ! debug zebra packet detail
diff --git a/tests/topotests/bgp_lu_topo2/R3/bgpd.conf b/tests/topotests/bgp_lu_topo2/R3/bgpd.conf
index 6443445b802b..a0dd0fe00902 100644
--- a/tests/topotests/bgp_lu_topo2/R3/bgpd.conf
+++ b/tests/topotests/bgp_lu_topo2/R3/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log
 no log unique-id
 !
 !
diff --git a/tests/topotests/bgp_lu_topo2/R3/staticd.conf b/tests/topotests/bgp_lu_topo2/R3/staticd.conf
index 867fc5a837f4..c0eee461eaab 100644
--- a/tests/topotests/bgp_lu_topo2/R3/staticd.conf
+++ b/tests/topotests/bgp_lu_topo2/R3/staticd.conf
@@ -1,4 +1,3 @@
-log file /tmp/staticd.log
 no log unique-id
 !
 !
diff --git a/tests/topotests/bgp_lu_topo2/R3/zebra.conf b/tests/topotests/bgp_lu_topo2/R3/zebra.conf
index dd24deb2141d..fd29ed54dcdf 100644
--- a/tests/topotests/bgp_lu_topo2/R3/zebra.conf
+++ b/tests/topotests/bgp_lu_topo2/R3/zebra.conf
@@ -1,4 +1,3 @@
-log file /tmp/zebra.log
 no log unique-id
 !
 !
diff --git a/tests/topotests/bgp_nexthop_ipv6/test_bgp_nexthop_ipv6_topo1.py b/tests/topotests/bgp_nexthop_ipv6/test_bgp_nexthop_ipv6_topo1.py
index e478139eb1e6..7875f2e0f6a6 100644
--- a/tests/topotests/bgp_nexthop_ipv6/test_bgp_nexthop_ipv6_topo1.py
+++ b/tests/topotests/bgp_nexthop_ipv6/test_bgp_nexthop_ipv6_topo1.py
@@ -222,7 +222,6 @@ def test_bgp_ipv6_table_step1():
     link_local_cache = {}
     router_list = tgen.routers().values()
     for router in router_list:
-        # router.cmd("vtysh -c 'sh bgp ipv6 json' >/tmp/show_bgp_ipv6_%s.json" % router.name)
         ref_file = "{}/{}/show_bgp_ipv6_step1.json".format(CWD, router.name)
         expected = json.loads(open(ref_file).read())
         replace_link_local(expected, link_local_cache)
@@ -275,7 +274,6 @@ def test_bgp_ipv6_table_step2():
 
     router_list = tgen.routers().values()
     for router in router_list:
-        # router.cmd("vtysh -c 'sh bgp ipv6 json' >/tmp/show_bgp_ipv6_%s.json" % router.name)
         ref_file = "{}/{}/show_bgp_ipv6_step2.json".format(CWD, router.name)
         expected = json.loads(open(ref_file).read())
         replace_link_local(expected, link_local_cache)
@@ -327,7 +325,6 @@ def test_bgp_ipv6_table_step3():
 
     router_list = tgen.routers().values()
     for router in router_list:
-        # router.cmd("vtysh -c 'sh bgp ipv6 json' >/tmp/show_bgp_ipv6_%s.json" % router.name)
         ref_file = "{}/{}/show_bgp_ipv6_step1.json".format(CWD, router.name)
         expected = json.loads(open(ref_file).read())
         replace_link_local(expected, link_local_cache)
diff --git a/tests/topotests/bgp_route_server_client/test_bgp_route_server_client.py b/tests/topotests/bgp_route_server_client/test_bgp_route_server_client.py
index a6334918dfcb..9dfeec6de0d6 100644
--- a/tests/topotests/bgp_route_server_client/test_bgp_route_server_client.py
+++ b/tests/topotests/bgp_route_server_client/test_bgp_route_server_client.py
@@ -180,7 +180,6 @@ def test_bgp_route_server_client_step1():
         else:
             cmd = "show bgp ipv6 unicast json"
 
-        # router.cmd("vtysh -c 'sh bgp ipv6 json' >/tmp/show_bgp_ipv6_%s.json" % router.name)
         ref_file = "{}/{}/show_bgp_ipv6_step1.json".format(CWD, router.name)
         expected = json.loads(open(ref_file).read())
         replace_link_local(expected, link_local_cache)
@@ -230,7 +229,6 @@ def test_bgp_route_server_client_step2():
         else:
             cmd = "show bgp ipv6 unicast json"
 
-        # router.cmd("vtysh -c 'sh bgp ipv6 json' >/tmp/show_bgp_ipv6_%s.json" % router.name)
         ref_file = "{}/{}/show_bgp_ipv6_step2.json".format(CWD, router.name)
         expected = json.loads(open(ref_file).read())
         replace_link_local(expected, link_local_cache)
@@ -286,7 +284,6 @@ def test_bgp_route_server_client_step3():
         else:
             cmd = "show bgp ipv6 unicast json"
 
-        # router.cmd("vtysh -c 'sh bgp ipv6 json' >/tmp/show_bgp_ipv6_%s.json" % router.name)
         ref_file = "{}/{}/show_bgp_ipv6_step1.json".format(CWD, router.name)
         expected = json.loads(open(ref_file).read())
         replace_link_local(expected, link_local_cache)
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce1/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/bgpd.conf
index b598666dfb02..75d8c9e553b9 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/ce1/bgpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 65001
  timers bgp 3 9
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf
index 4a8579845c89..8e6743c5fd93 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce2/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/bgpd.conf
index e388ccba8a75..37d40651c533 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/ce2/bgpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 65001
  bgp router-id 192.168.200.10
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf
index 5e0aa5d3f038..02afea1148b7 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce3/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/bgpd.conf
index e388ccba8a75..37d40651c533 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/ce3/bgpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 65001
  bgp router-id 192.168.200.10
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf
index fabc11e84d79..714f1ec356f0 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce4/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/bgpd.conf
index e388ccba8a75..37d40651c533 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/ce4/bgpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 65001
  bgp router-id 192.168.200.10
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf
index e369f41b39e9..d5efab4bf6f4 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r1/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r1/bgpd.conf
index 098e55d0ed34..b80a90ac7d1e 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/r1/bgpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r1/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 65000
  bgp router-id 10.1.1.1
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf
index 4fec8af3dbeb..87cffebd8437 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf
index e43399559377..162f5bbccc47 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r4/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r4/bgpd.conf
index 2a834c799ef2..1f44feb0da59 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/r4/bgpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r4/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 65000
  bgp router-id 10.4.4.4
diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf
index 14580e5b3a36..7b0719d266f1 100644
--- a/tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane
diff --git a/tests/topotests/ospf_metric_propagation/h1/frr.conf b/tests/topotests/ospf_metric_propagation/h1/frr.conf
index 1196a192dd50..b8d1834e24ca 100644
--- a/tests/topotests/ospf_metric_propagation/h1/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/h1/frr.conf
@@ -1,10 +1,8 @@
 !
 hostname h1
-password zebra
-log file /tmp/h1-frr.log
 !
 ip route 0.0.0.0/0 10.0.91.1
 !
 interface h1-eth0
  ip address 10.0.91.2/24
-!
\ No newline at end of file
+!
diff --git a/tests/topotests/ospf_metric_propagation/h2/frr.conf b/tests/topotests/ospf_metric_propagation/h2/frr.conf
index f951fe6ba1d6..4377256261b3 100644
--- a/tests/topotests/ospf_metric_propagation/h2/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/h2/frr.conf
@@ -1,10 +1,8 @@
 !
 hostname h2
-password zebra
-log file /tmp/h2-frr.log
 !
 ip route 0.0.0.0/0 10.0.94.4
 !
 interface h2-eth0
  ip address 10.0.94.2/24
-!
\ No newline at end of file
+!
diff --git a/tests/topotests/ospf_metric_propagation/r1/frr.conf b/tests/topotests/ospf_metric_propagation/r1/frr.conf
index 4966e6a9da1b..082f7df51936 100644
--- a/tests/topotests/ospf_metric_propagation/r1/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/r1/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r1-eth0
  ip address 10.0.1.1/24
@@ -93,4 +90,4 @@ route-map costplus permit 30
 route-map costplus permit 40
   set metric-type type-1
   set metric +1
-  exit
\ No newline at end of file
+  exit
diff --git a/tests/topotests/ospf_metric_propagation/r2/frr.conf b/tests/topotests/ospf_metric_propagation/r2/frr.conf
index 0ac5001b1b99..e6ced31d876e 100644
--- a/tests/topotests/ospf_metric_propagation/r2/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/r2/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r2-frr.log
-ip forwarding
 !
 interface r2-eth0
  ip address 10.0.1.2/24
diff --git a/tests/topotests/ospf_metric_propagation/r3/frr.conf b/tests/topotests/ospf_metric_propagation/r3/frr.conf
index 0859173f7971..f6989057f66a 100644
--- a/tests/topotests/ospf_metric_propagation/r3/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/r3/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-frr.log
-ip forwarding
 !
 interface r3-eth0
  ip address 10.0.3.3/24
diff --git a/tests/topotests/ospf_metric_propagation/r4/frr.conf b/tests/topotests/ospf_metric_propagation/r4/frr.conf
index 743da272727f..b02ae18fc147 100644
--- a/tests/topotests/ospf_metric_propagation/r4/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/r4/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r4
-password zebra
-log file /tmp/r4-frr.log
-ip forwarding
 !
 interface r4-eth0
  ip address 10.0.3.4/24
diff --git a/tests/topotests/ospf_metric_propagation/ra/frr.conf b/tests/topotests/ospf_metric_propagation/ra/frr.conf
index 2434faeabc97..5ad819da01bb 100644
--- a/tests/topotests/ospf_metric_propagation/ra/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/ra/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname ra
-password zebra
-log file /tmp/ra-frr.log
-ip forwarding
 !
 interface ra-eth0
  ip address 10.0.50.5/24
diff --git a/tests/topotests/ospf_metric_propagation/rb/frr.conf b/tests/topotests/ospf_metric_propagation/rb/frr.conf
index b83532a8405a..21abefed2604 100644
--- a/tests/topotests/ospf_metric_propagation/rb/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/rb/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname rb
-password zebra
-log file /tmp/rb-frr.log
-ip forwarding
 !
 interface rb-eth0
  ip address 10.0.50.6/24
diff --git a/tests/topotests/ospf_metric_propagation/rc/frr.conf b/tests/topotests/ospf_metric_propagation/rc/frr.conf
index dd8077c3949f..0e6edd92a830 100644
--- a/tests/topotests/ospf_metric_propagation/rc/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/rc/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname rc
-password zebra
-log file /tmp/rc-frr.log
-ip forwarding
 !
 interface rc-eth0
  ip address 10.0.70.7/24
diff --git a/tests/topotests/ospf_multi_instance/r1/frr.conf b/tests/topotests/ospf_multi_instance/r1/frr.conf
index c341a7176a09..b9752c63ad96 100644
--- a/tests/topotests/ospf_multi_instance/r1/frr.conf
+++ b/tests/topotests/ospf_multi_instance/r1/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface lo
  ip address 1.1.1.1/32
diff --git a/tests/topotests/ospf_multi_instance/r3/frr.conf b/tests/topotests/ospf_multi_instance/r3/frr.conf
index 97a3e19c9b10..e6f681a46206 100644
--- a/tests/topotests/ospf_multi_instance/r3/frr.conf
+++ b/tests/topotests/ospf_multi_instance/r3/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-frr.log
-ip forwarding
 !
 interface lo
  ip address 3.3.3.1/32
diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/frr.conf b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/frr.conf
index 995958132c93..bcbe2eded6c6 100644
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/frr.conf
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
 !
 interface r1-eth0
  ip address 10.0.1.1/24
diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/frr.conf b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/frr.conf
index 29909de6461d..0d3eb3c8c915 100644
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/frr.conf
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r2-frr.log
 !
 interface r2-eth0
  ip address 10.0.2.2/24
diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/frr.conf b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/frr.conf
index 35fe22e9f9bc..1cc2972f0133 100644
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/frr.conf
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-frr.log
 !
 interface r3-eth0
  ip address 10.0.3.3/24
diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/frr.conf b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/frr.conf
index 721c3d91c388..a82d5b033cf1 100644
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/frr.conf
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r4
-password zebra
-log file /tmp/r4-frr.log
 !
 interface r4-eth0
  ip address 10.0.4.4/24
diff --git a/tests/topotests/ospf_netns_vrf/r1/ospfd.conf b/tests/topotests/ospf_netns_vrf/r1/ospfd.conf
index ba131465612b..75f38d0058cb 100644
--- a/tests/topotests/ospf_netns_vrf/r1/ospfd.conf
+++ b/tests/topotests/ospf_netns_vrf/r1/ospfd.conf
@@ -1,7 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-ospfd.log
 !
 interface r1-eth0 vrf r1-ospf-cust1
   ip ospf hello-interval 1
diff --git a/tests/topotests/ospf_netns_vrf/r1/zebra.conf b/tests/topotests/ospf_netns_vrf/r1/zebra.conf
index 56d7a9764e01..1c08f1e26333 100644
--- a/tests/topotests/ospf_netns_vrf/r1/zebra.conf
+++ b/tests/topotests/ospf_netns_vrf/r1/zebra.conf
@@ -4,8 +4,6 @@
 ! debug zebra event
 !
 hostname r1
-password zebra
-log file /tmp/r1-zebra.log
 !
 interface r1-eth0 vrf r1-ospf-cust1
  ip address 10.0.1.1/24
diff --git a/tests/topotests/ospf_netns_vrf/r2/ospfd.conf b/tests/topotests/ospf_netns_vrf/r2/ospfd.conf
index 01b6b1526b1c..3cd69bb8ff15 100644
--- a/tests/topotests/ospf_netns_vrf/r2/ospfd.conf
+++ b/tests/topotests/ospf_netns_vrf/r2/ospfd.conf
@@ -1,7 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r2-ospfd.log
 !
 interface r2-eth0 vrf r2-ospf-cust1
   ip ospf hello-interval 1
diff --git a/tests/topotests/ospf_netns_vrf/r2/zebra.conf b/tests/topotests/ospf_netns_vrf/r2/zebra.conf
index 6ff72d1267f6..f997028c740c 100644
--- a/tests/topotests/ospf_netns_vrf/r2/zebra.conf
+++ b/tests/topotests/ospf_netns_vrf/r2/zebra.conf
@@ -1,7 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r2-zebra.log
 !
 interface r2-eth0 vrf r2-ospf-cust1
  ip address 10.0.2.1/24
diff --git a/tests/topotests/ospf_netns_vrf/r3/ospfd.conf b/tests/topotests/ospf_netns_vrf/r3/ospfd.conf
index abfaa5b9eff1..4581a609b486 100644
--- a/tests/topotests/ospf_netns_vrf/r3/ospfd.conf
+++ b/tests/topotests/ospf_netns_vrf/r3/ospfd.conf
@@ -1,7 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-ospfd.log
 !
 !
 interface r3-eth0 vrf r3-ospf-cust1
diff --git a/tests/topotests/ospf_netns_vrf/r3/zebra.conf b/tests/topotests/ospf_netns_vrf/r3/zebra.conf
index 15341500480a..4053d94a63e5 100644
--- a/tests/topotests/ospf_netns_vrf/r3/zebra.conf
+++ b/tests/topotests/ospf_netns_vrf/r3/zebra.conf
@@ -1,7 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-zebra.log
 !
 interface r3-eth0 vrf r3-ospf-cust1
  ip address 10.0.3.1/24
diff --git a/tests/topotests/ospf_p2mp/r1/frr-p2mp-non-broadcast.conf b/tests/topotests/ospf_p2mp/r1/frr-p2mp-non-broadcast.conf
index ca84349cdcf2..fdc75633b1a5 100644
--- a/tests/topotests/ospf_p2mp/r1/frr-p2mp-non-broadcast.conf
+++ b/tests/topotests/ospf_p2mp/r1/frr-p2mp-non-broadcast.conf
@@ -1,8 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r1-eth0
  ip address 10.1.0.1/24
diff --git a/tests/topotests/ospf_p2mp/r1/frr-p2mp.conf b/tests/topotests/ospf_p2mp/r1/frr-p2mp.conf
index 89f255bb44ea..350c0de7baf6 100644
--- a/tests/topotests/ospf_p2mp/r1/frr-p2mp.conf
+++ b/tests/topotests/ospf_p2mp/r1/frr-p2mp.conf
@@ -1,13 +1,10 @@
 !
-!log file ospfd.log debug
 ! debug ospf event
 ! debug ospf client
 ! debug ospf lsa
 ! debug ospf packet all
 
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
 ip forwarding
 !
 interface r1-eth0
diff --git a/tests/topotests/ospf_p2mp/r2/frr-p2mp-non-broadcast.conf b/tests/topotests/ospf_p2mp/r2/frr-p2mp-non-broadcast.conf
index 6e26897c494b..c44e936f9d99 100644
--- a/tests/topotests/ospf_p2mp/r2/frr-p2mp-non-broadcast.conf
+++ b/tests/topotests/ospf_p2mp/r2/frr-p2mp-non-broadcast.conf
@@ -1,8 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r2-eth0
  ip address 10.1.0.2/24
diff --git a/tests/topotests/ospf_p2mp/r2/frr-p2mp.conf b/tests/topotests/ospf_p2mp/r2/frr-p2mp.conf
index 429330987e06..806914d81421 100644
--- a/tests/topotests/ospf_p2mp/r2/frr-p2mp.conf
+++ b/tests/topotests/ospf_p2mp/r2/frr-p2mp.conf
@@ -1,14 +1,10 @@
 !
-!log file ospfd.log debug
 ! debug ospf event
 ! debug ospf client
 ! debug ospf lsa
 ! debug ospf packet all
 !
 hostname r2
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r2-eth0
  ip address 10.1.0.2/24
diff --git a/tests/topotests/ospf_p2mp/r3/frr-p2mp-non-broadcast.conf b/tests/topotests/ospf_p2mp/r3/frr-p2mp-non-broadcast.conf
index a69e0557bee7..d89269b3244f 100644
--- a/tests/topotests/ospf_p2mp/r3/frr-p2mp-non-broadcast.conf
+++ b/tests/topotests/ospf_p2mp/r3/frr-p2mp-non-broadcast.conf
@@ -1,8 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r3-eth0
  ip address 10.1.0.3/24
diff --git a/tests/topotests/ospf_p2mp/r3/frr-p2mp.conf b/tests/topotests/ospf_p2mp/r3/frr-p2mp.conf
index eada78450e81..343a9d008627 100644
--- a/tests/topotests/ospf_p2mp/r3/frr-p2mp.conf
+++ b/tests/topotests/ospf_p2mp/r3/frr-p2mp.conf
@@ -1,14 +1,10 @@
 !
-!log file ospfd.log debug
 ! debug ospf event
 ! debug ospf client
 ! debug ospf lsa
 ! debug ospf packet all
 !
 hostname r3
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r3-eth0
  ip address 10.1.0.3/24
diff --git a/tests/topotests/ospf_p2mp/r4/frr-p2mp-non-broadcast.conf b/tests/topotests/ospf_p2mp/r4/frr-p2mp-non-broadcast.conf
index 1b8388584b82..aa6c80d41e2b 100644
--- a/tests/topotests/ospf_p2mp/r4/frr-p2mp-non-broadcast.conf
+++ b/tests/topotests/ospf_p2mp/r4/frr-p2mp-non-broadcast.conf
@@ -1,8 +1,5 @@
 !
 hostname r4
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r4-eth0
  ip address 10.1.0.4/24
diff --git a/tests/topotests/ospf_p2mp/r4/frr-p2mp.conf b/tests/topotests/ospf_p2mp/r4/frr-p2mp.conf
index 3146ea095762..a1527f5aa989 100644
--- a/tests/topotests/ospf_p2mp/r4/frr-p2mp.conf
+++ b/tests/topotests/ospf_p2mp/r4/frr-p2mp.conf
@@ -1,14 +1,10 @@
 !
-!log file ospfd.log debug
 ! debug ospf event
 ! debug ospf client
 ! debug ospf lsa
 ! debug ospf packet all
 !
 hostname r4
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r4-eth0
  ip address 10.1.0.4/24
diff --git a/tests/topotests/ospf_prefix_suppression/r1/frr.conf b/tests/topotests/ospf_prefix_suppression/r1/frr.conf
index 437b4741533a..4b9df834bf89 100644
--- a/tests/topotests/ospf_prefix_suppression/r1/frr.conf
+++ b/tests/topotests/ospf_prefix_suppression/r1/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
 ip forwarding
 !
 interface r1-eth0
diff --git a/tests/topotests/ospf_prefix_suppression/r2/frr.conf b/tests/topotests/ospf_prefix_suppression/r2/frr.conf
index 68390f15f12b..cf4a25a09af5 100644
--- a/tests/topotests/ospf_prefix_suppression/r2/frr.conf
+++ b/tests/topotests/ospf_prefix_suppression/r2/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r1-frr.log
 ip forwarding
 !
 interface r2-eth0
diff --git a/tests/topotests/ospf_prefix_suppression/r3/frr.conf b/tests/topotests/ospf_prefix_suppression/r3/frr.conf
index 984a39d989c6..dbd1bc375f16 100644
--- a/tests/topotests/ospf_prefix_suppression/r3/frr.conf
+++ b/tests/topotests/ospf_prefix_suppression/r3/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r1-frr.log
 ip forwarding
 !
 interface r3-eth0
diff --git a/tests/topotests/pim_autorp/r1/frr.conf b/tests/topotests/pim_autorp/r1/frr.conf
index 92b9b3b41b22..fc4e634452ad 100644
--- a/tests/topotests/pim_autorp/r1/frr.conf
+++ b/tests/topotests/pim_autorp/r1/frr.conf
@@ -1,9 +1,7 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
 !
-debug pim autorp
+!debug pim autorp
 !
 interface r1-eth0
  ip address 10.0.0.1/24
@@ -23,4 +21,4 @@ ip route 10.0.3.0/24 10.0.0.2 50
 router pim
  autorp discovery
  rp 10.0.3.4 224.0.1.0/24
-!
\ No newline at end of file
+!
diff --git a/tests/topotests/pim_autorp/r2/frr.conf b/tests/topotests/pim_autorp/r2/frr.conf
index d67dade6f95f..ded462cad184 100644
--- a/tests/topotests/pim_autorp/r2/frr.conf
+++ b/tests/topotests/pim_autorp/r2/frr.conf
@@ -1,9 +1,7 @@
 !
 hostname r2
-password zebra
-log file /tmp/r2-frr.log
 !
-debug pim autorp
+!debug pim autorp
 !
 interface r2-eth0
  ip address 10.0.0.2/24
@@ -23,4 +21,4 @@ ip route 10.0.3.0/24 10.0.2.4 50
 router pim
  autorp discovery
  rp 10.0.3.4 224.0.1.0/24
-!
\ No newline at end of file
+!
diff --git a/tests/topotests/pim_autorp/r3/frr.conf b/tests/topotests/pim_autorp/r3/frr.conf
index 4e93d4ba211d..31726f2c015c 100644
--- a/tests/topotests/pim_autorp/r3/frr.conf
+++ b/tests/topotests/pim_autorp/r3/frr.conf
@@ -1,9 +1,7 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-frr.log
 !
-debug pim autorp
+!debug pim autorp
 !
 interface r3-eth0
  ip address 10.0.1.3/24
@@ -23,4 +21,4 @@ ip route 10.0.2.0/24 10.0.3.4 50
 router pim
  autorp discovery
  rp 10.0.3.4 224.0.1.0/24
-!
\ No newline at end of file
+!
diff --git a/tests/topotests/pim_autorp/r4/frr.conf b/tests/topotests/pim_autorp/r4/frr.conf
index 382999b11943..9d37da99aa7b 100644
--- a/tests/topotests/pim_autorp/r4/frr.conf
+++ b/tests/topotests/pim_autorp/r4/frr.conf
@@ -1,9 +1,7 @@
 !
 hostname r4
-password zebra
-log file /tmp/r4-frr.log
 !
-debug pim autorp
+!debug pim autorp
 !
 interface r4-eth0
  ip address 10.0.2.4/24
@@ -23,4 +21,4 @@ ip route 10.0.1.0/24 10.0.2.2 50
 router pim
  autorp discovery
  rp 10.0.3.4 224.0.1.0/24
-!
\ No newline at end of file
+!
diff --git a/tests/topotests/pim_basic/test_pim.py b/tests/topotests/pim_basic/test_pim.py
index ce1abe42bb09..74d5406970fe 100644
--- a/tests/topotests/pim_basic/test_pim.py
+++ b/tests/topotests/pim_basic/test_pim.py
@@ -132,14 +132,14 @@ def test_pim_send_mcast_stream():
     # Let's establish a S,G stream from r2 -> r1
     CWD = os.path.dirname(os.path.realpath(__file__))
     r2.run(
-        "{}/mcast-tx.py --ttl 5 --count 40 --interval 2 229.1.1.1 r2-eth0 > /tmp/bar".format(
-            CWD
+        "{}/mcast-tx.py --ttl 5 --count 40 --interval 2 229.1.1.1 r2-eth0 > {}/r2/mcast_tx_output".format(
+            CWD, tgen.logdir
         )
     )
     # And from r3 -> r1
     r3.run(
-        "{}/mcast-tx.py --ttl 5 --count 40 --interval 2 229.1.1.1 r3-eth0 > /tmp/bar".format(
-            CWD
+        "{}/mcast-tx.py --ttl 5 --count 40 --interval 2 229.1.1.1 r3-eth0 > {}/r3/mcast_tx_output".format(
+            CWD, tgen.logdir
         )
     )
 
diff --git a/tests/topotests/pim_cand_rp_bsr/r1/frr.conf b/tests/topotests/pim_cand_rp_bsr/r1/frr.conf
index 899e9c068413..badcb8307b99 100644
--- a/tests/topotests/pim_cand_rp_bsr/r1/frr.conf
+++ b/tests/topotests/pim_cand_rp_bsr/r1/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
 !
 !debug pim packet
 !debug pim bsm
diff --git a/tests/topotests/pim_cand_rp_bsr/r2/frr.conf b/tests/topotests/pim_cand_rp_bsr/r2/frr.conf
index 85af461d5eb9..65926688aa01 100644
--- a/tests/topotests/pim_cand_rp_bsr/r2/frr.conf
+++ b/tests/topotests/pim_cand_rp_bsr/r2/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r2-frr.log
 !
 !debug pim packet
 !debug pim bsm
diff --git a/tests/topotests/pim_cand_rp_bsr/r3/frr.conf b/tests/topotests/pim_cand_rp_bsr/r3/frr.conf
index 022c44ea58b7..eae90c987c33 100644
--- a/tests/topotests/pim_cand_rp_bsr/r3/frr.conf
+++ b/tests/topotests/pim_cand_rp_bsr/r3/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-frr.log
 !
 !debug pim packet
 !debug pim bsm
diff --git a/tests/topotests/pim_cand_rp_bsr/r4/frr.conf b/tests/topotests/pim_cand_rp_bsr/r4/frr.conf
index 2d0a035f9a9d..276e8792160c 100644
--- a/tests/topotests/pim_cand_rp_bsr/r4/frr.conf
+++ b/tests/topotests/pim_cand_rp_bsr/r4/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r4
-password zebra
-log file /tmp/r4-frr.log
 !
 !
 interface lo
diff --git a/tests/topotests/pim_cand_rp_bsr/r5/frr.conf b/tests/topotests/pim_cand_rp_bsr/r5/frr.conf
index 552e51f417f6..b86c62600014 100644
--- a/tests/topotests/pim_cand_rp_bsr/r5/frr.conf
+++ b/tests/topotests/pim_cand_rp_bsr/r5/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r5
-password zebra
-log file /tmp/r5-frr.log
 !
 !
 interface r5-eth0
diff --git a/tests/topotests/pim_cand_rp_bsr/r6/frr.conf b/tests/topotests/pim_cand_rp_bsr/r6/frr.conf
index 20955a12c709..1fd3582211cb 100644
--- a/tests/topotests/pim_cand_rp_bsr/r6/frr.conf
+++ b/tests/topotests/pim_cand_rp_bsr/r6/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r6
-password zebra
-log file /tmp/r6-frr.log
 !
 !
 interface r6-eth0
diff --git a/tests/topotests/simple_snmp_test/r1/bgpd.conf b/tests/topotests/simple_snmp_test/r1/bgpd.conf
index 00d1e1767085..bcdf1c4f7e7e 100644
--- a/tests/topotests/simple_snmp_test/r1/bgpd.conf
+++ b/tests/topotests/simple_snmp_test/r1/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 100
  bgp router-id 1.1.1.1
diff --git a/tests/topotests/zebra_rib/r1/frr-import.conf b/tests/topotests/zebra_rib/r1/frr-import.conf
index d07433144f89..687843be0c43 100644
--- a/tests/topotests/zebra_rib/r1/frr-import.conf
+++ b/tests/topotests/zebra_rib/r1/frr-import.conf
@@ -1,7 +1,6 @@
 !
 hostname r1
 password zebra
-log file /tmp/r1-frr.log
 !
 interface r1-eth0
  ip address 10.0.0.1/24
@@ -15,4 +14,4 @@ ip route 10.3.0.0/24 10.10.0.2 table 10
 ip route 10.4.0.0/24 10.10.0.2 table 10
 !
 ip forwarding
-!
\ No newline at end of file
+!