diff --git a/src/db_test.c b/src/db_test.c
index 7891c90..0d10797 100644
--- a/src/db_test.c
+++ b/src/db_test.c
@@ -49,7 +49,7 @@
 
 	g_hlr = talloc_zero(NULL, struct hlr);
 
-	rc = osmo_init_logging(&hlr_log_info);
+	rc = osmo_init_logging2(g_hlr, &hlr_log_info);
 	if (rc < 0) {
 		fprintf(stderr, "Error initializing logging\n");
 		exit(1);
diff --git a/src/hlr.c b/src/hlr.c
index 4fbc268..3845993 100644
--- a/src/hlr.c
+++ b/src/hlr.c
@@ -475,7 +475,7 @@
 
 	g_hlr = talloc_zero(hlr_ctx, struct hlr);
 
-	rc = osmo_init_logging(&hlr_log_info);
+	rc = osmo_init_logging2(hlr_ctx, &hlr_log_info);
 	if (rc < 0) {
 		fprintf(stderr, "Error initializing logging\n");
 		exit(1);
diff --git a/src/hlr_db_tool.c b/src/hlr_db_tool.c
index 318308c..e83b098 100644
--- a/src/hlr_db_tool.c
+++ b/src/hlr_db_tool.c
@@ -386,7 +386,7 @@
 	OSMO_ASSERT(g_hlr_db_tool_ctx);
 	talloc_set_name_const(g_hlr_db_tool_ctx, "OsmoHLR-db-tool");
 
-	rc = osmo_init_logging(&hlr_log_info);
+	rc = osmo_init_logging2(g_hlr_db_tool_ctx, &hlr_log_info);
 	if (rc < 0) {
 		fprintf(stderr, "Error initializing logging\n");
 		exit(EXIT_FAILURE);
diff --git a/tests/auc/auc_test.c b/tests/auc/auc_test.c
index e9c114c..e23cc02 100644
--- a/tests/auc/auc_test.c
+++ b/tests/auc/auc_test.c
@@ -610,7 +610,9 @@
 
 	handle_options(argc, argv);
 
-	osmo_init_logging(&hlr_log_info);
+	void *tall_ctx = talloc_named_const(NULL, 1, "auc_test");
+
+	osmo_init_logging2(tall_ctx, &hlr_log_info);
 	log_set_print_filename(osmo_stderr_target, cmdline_opts.verbose);
 	log_set_print_timestamp(osmo_stderr_target, 0);
 	log_set_use_color(osmo_stderr_target, 0);
diff --git a/tests/auc/gen_ts_55_205_test_sets/main_template.c b/tests/auc/gen_ts_55_205_test_sets/main_template.c
index 37f47c3..a78bddb 100644
--- a/tests/auc/gen_ts_55_205_test_sets/main_template.c
+++ b/tests/auc/gen_ts_55_205_test_sets/main_template.c
@@ -29,6 +29,7 @@
 #include <osmocom/core/application.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/core/logging.h>
+#include <osmocom/core/msgb.h>
 
 #include <osmocom/crypt/auth.h>
 
@@ -102,7 +103,9 @@
 int main()
 {
 	printf("3GPP TS 55.205 Test Sets\n");
-	osmo_init_logging(&hlr_log_info);
+	void *tall_ctx = talloc_named_const(NULL, 1, "test");
+	msgb_talloc_ctx_init(tall_ctx, 0);
+	osmo_init_logging2(tall_ctx, &hlr_log_info);
 	log_set_print_filename(osmo_stderr_target, 0);
 	log_set_print_timestamp(osmo_stderr_target, 0);
 	log_set_use_color(osmo_stderr_target, 0);
diff --git a/tests/db/db_test.c b/tests/db/db_test.c
index 6bf7a86..058588b 100644
--- a/tests/db/db_test.c
+++ b/tests/db/db_test.c
@@ -839,7 +839,7 @@
 
 	handle_options(argc, argv);
 
-	osmo_init_logging(&hlr_log_info);
+	osmo_init_logging2(ctx, &hlr_log_info);
 	log_set_print_filename(osmo_stderr_target, cmdline_opts.verbose);
 	log_set_print_timestamp(osmo_stderr_target, 0);
 	log_set_use_color(osmo_stderr_target, 0);