7 files changed, 20 insertions, 22 deletions
diff --git a/tests/bgpd/test_aspath.c b/tests/bgpd/test_aspath.c
index f3999cbcff..e5ff6a1377 100644
--- a/tests/bgpd/test_aspath.c
+++ b/tests/bgpd/test_aspath.c
@@ -1332,7 +1332,7 @@ main (void)
 {
   int i = 0;
   qobj_init ();
-  bgp_master_init ();
+  bgp_master_init (thread_master_create ());
   master = bm->master;
   bgp_option_set (BGP_OPT_NO_LISTEN);
   bgp_attr_init ();
diff --git a/tests/bgpd/test_capability.c b/tests/bgpd/test_capability.c
index f83dee5e1c..c3de6a16e8 100644
--- a/tests/bgpd/test_capability.c
+++ b/tests/bgpd/test_capability.c
@@ -650,7 +650,7 @@ main (void)
   
   qobj_init ();
   master = thread_master_create ();
-  bgp_master_init ();
+  bgp_master_init (master);
   vrf_init ();
   bgp_option_set (BGP_OPT_NO_LISTEN);
   
diff --git a/tests/bgpd/test_mp_attr.c b/tests/bgpd/test_mp_attr.c
index 883cac0cc6..6824c11fea 100644
--- a/tests/bgpd/test_mp_attr.c
+++ b/tests/bgpd/test_mp_attr.c
@@ -750,7 +750,7 @@ main (void)
   
   qobj_init ();
   master = thread_master_create ();
-  bgp_master_init ();
+  bgp_master_init (master);
   vrf_init ();
   bgp_option_set (BGP_OPT_NO_LISTEN);
   bgp_attr_init ();
diff --git a/tests/bgpd/test_mpath.c b/tests/bgpd/test_mpath.c
index f9eb1534f3..a2fd66528c 100644
--- a/tests/bgpd/test_mpath.c
+++ b/tests/bgpd/test_mpath.c
@@ -379,7 +379,7 @@ global_test_init (void)
   qobj_init ();
   master = thread_master_create ();
   zclient = zclient_new(master);
-  bgp_master_init ();
+  bgp_master_init (master);
   vrf_init ();
   bgp_option_set (BGP_OPT_NO_LISTEN);
   
diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index 104352f516..56db460438 100644
--- a/tests/lib/cli/common_cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -52,7 +52,7 @@ static void vty_do_exit(void)
   cmd_terminate ();
   vty_terminate ();
   thread_master_free (master);
-  closezlog (zlog_default);
+  closezlog ();
 
   log_memstats_stderr ("testcli");
   exit (0);
@@ -70,11 +70,11 @@ main (int argc, char **argv)
   /* master init. */
   master = thread_master_create ();
 
-  zlog_default = openzlog ("common-cli", ZLOG_NONE, 0,
-                           LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
-  zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
-  zlog_set_level (NULL, ZLOG_DEST_STDOUT, ZLOG_DISABLED);
-  zlog_set_level (NULL, ZLOG_DEST_MONITOR, LOG_DEBUG);
+  openzlog("common-cli", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID,
+           LOG_DAEMON);
+  zlog_set_level(ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
+  zlog_set_level(ZLOG_DEST_STDOUT, ZLOG_DISABLED);
+  zlog_set_level(ZLOG_DEST_MONITOR, LOG_DEBUG);
 
   /* Library inits. */
   cmd_init (1);
diff --git a/tests/lib/test_segv.c b/tests/lib/test_segv.c
index 1810c5f4b2..dfc9d5f482 100644
--- a/tests/lib/test_segv.c
+++ b/tests/lib/test_segv.c
@@ -49,11 +49,10 @@ main (void)
   master = thread_master_create ();
   signal_init (master, array_size(sigs), sigs);
 
-  zlog_default = openzlog("testsegv", ZLOG_NONE, 0,
-                          LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
-  zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
-  zlog_set_level (NULL, ZLOG_DEST_STDOUT, LOG_DEBUG);
-  zlog_set_level (NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED);
+  openzlog("testsegv", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
+  zlog_set_level(ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
+  zlog_set_level(ZLOG_DEST_STDOUT, LOG_DEBUG);
+  zlog_set_level(ZLOG_DEST_MONITOR, ZLOG_DISABLED);
 
   thread_execute (master, threadfunc, 0, 0);
 
diff --git a/tests/lib/test_sig.c b/tests/lib/test_sig.c
index 4a04240303..10bce2303e 100644
--- a/tests/lib/test_sig.c
+++ b/tests/lib/test_sig.c
@@ -64,13 +64,12 @@ main (void)
 {
   master = thread_master_create ();
   signal_init (master, array_size(sigs), sigs);
-  
-  zlog_default = openzlog("testsig", ZLOG_NONE, 0,
-                          LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
-  zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
-  zlog_set_level (NULL, ZLOG_DEST_STDOUT, LOG_DEBUG);
-  zlog_set_level (NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED);
-  
+
+  openzlog("testsig", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
+  zlog_set_level(ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
+  zlog_set_level(ZLOG_DEST_STDOUT, LOG_DEBUG);
+  zlog_set_level(ZLOG_DEST_MONITOR, ZLOG_DISABLED);
+
   while (thread_fetch (master, &t))
     thread_call (&t);