diff --git a/tests/fsm/fsm_dealloc_test.c b/tests/fsm/fsm_dealloc_test.c
index 48f80e571..f4be93dd7 100644
--- a/tests/fsm/fsm_dealloc_test.c
+++ b/tests/fsm/fsm_dealloc_test.c
@@ -443,7 +443,7 @@ int main(void)
 	ctx = talloc_named_const(NULL, 0, "main");
 	osmo_init_logging2(ctx, NULL);
 
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_level(osmo_stderr_target, 1);
 	log_set_print_category(osmo_stderr_target, 1);
 	log_set_print_category_hex(osmo_stderr_target, 0);
diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c
index 23e24cf26..2cfdacd20 100644
--- a/tests/fsm/fsm_test.c
+++ b/tests/fsm/fsm_test.c
@@ -412,7 +412,7 @@ int main(int argc, char **argv)
 	log_init(&log_info, NULL);
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
-	log_set_print_filename(stderr_target, 0);
+	log_set_print_filename2(stderr_target, LOG_FILENAME_NONE);
 	log_set_use_color(stderr_target, 0);
 	log_set_print_category(stderr_target, 0);
 	log_set_print_category_hex(stderr_target, 0);
diff --git a/tests/gb/bssgp_fc_test.c b/tests/gb/bssgp_fc_test.c
index 23bcd57eb..63e8308a1 100644
--- a/tests/gb/bssgp_fc_test.c
+++ b/tests/gb/bssgp_fc_test.c
@@ -148,7 +148,7 @@ int main(int argc, char **argv)
 
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category(osmo_stderr_target, 0);
 	log_set_print_category_hex(osmo_stderr_target, 0);
 
diff --git a/tests/gb/gprs_bssgp_test.c b/tests/gb/gprs_bssgp_test.c
index 52e986e85..43fc056cf 100644
--- a/tests/gb/gprs_bssgp_test.c
+++ b/tests/gb/gprs_bssgp_test.c
@@ -298,7 +298,7 @@ int main(int argc, char **argv)
 
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 
 	msgb_talloc_ctx_init(ctx, 0);
 
diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c
index 37719a93c..cc1b2f1f8 100644
--- a/tests/gb/gprs_ns2_test.c
+++ b/tests/gb/gprs_ns2_test.c
@@ -522,8 +522,7 @@ int main(int argc, char **argv)
 	void *ctx = talloc_named_const(NULL, 0, "gprs_ns2_test");
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category(osmo_stderr_target, 0);
 	log_set_print_category_hex(osmo_stderr_target, 0);
 	log_set_log_level(osmo_stderr_target, LOGL_INFO);
diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c
index e8e8b80b7..454a29e4c 100644
--- a/tests/gb/gprs_ns_test.c
+++ b/tests/gb/gprs_ns_test.c
@@ -906,11 +906,9 @@ int main(int argc, char **argv)
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_category(osmo_stderr_target, 0);
 	log_set_print_category_hex(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
-	osmo_signal_register_handler(SS_L_NS, &test_signal, NULL);
-
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_log_level(osmo_stderr_target, LOGL_INFO);
+	osmo_signal_register_handler(SS_L_NS, &test_signal, NULL);
 
 	setlinebuf(stdout);
 
diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c
index f84072c11..3d7ea4014 100644
--- a/tests/gsup/gsup_test.c
+++ b/tests/gsup/gsup_test.c
@@ -749,7 +749,7 @@ int main(int argc, char **argv)
 {
 	void *ctx = talloc_named_const(NULL, 0, "gsup_test");
 	osmo_init_logging2(ctx, &info);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_timestamp(osmo_stderr_target, 0);
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_category_hex(osmo_stderr_target, 0);
diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c
index d036dc50f..f87395874 100644
--- a/tests/logging/logging_test.c
+++ b/tests/logging/logging_test.c
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
 	log_set_all_filter(stderr_target, 1);
-	log_set_print_filename(stderr_target, 0);
+	log_set_print_filename2(stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category_hex(stderr_target, 0);
 	log_set_print_category(stderr_target, 1);
 	log_set_use_color(stderr_target, 0);
diff --git a/tests/loggingrb/loggingrb_test.c b/tests/loggingrb/loggingrb_test.c
index 4a4d1f93e..19378c3f2 100644
--- a/tests/loggingrb/loggingrb_test.c
+++ b/tests/loggingrb/loggingrb_test.c
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
 	ringbuf_target = log_target_create_rb(0x1000);
 	log_add_target(ringbuf_target);
 	log_set_all_filter(ringbuf_target, 1);
-	log_set_print_filename(ringbuf_target, 0);
+	log_set_print_filename2(ringbuf_target, LOG_FILENAME_NONE);
 	log_set_print_category(ringbuf_target, 0);
 	log_set_print_category_hex(ringbuf_target, 0);
 
diff --git a/tests/oap/oap_client_test.c b/tests/oap/oap_client_test.c
index 0ac32eabc..622912f99 100644
--- a/tests/oap/oap_client_test.c
+++ b/tests/oap/oap_client_test.c
@@ -260,7 +260,7 @@ int main(int argc, char **argv)
 	OSMO_ASSERT(osmo_stderr_target);
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_timestamp(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category_hex(osmo_stderr_target, 0);
 	log_set_print_category(osmo_stderr_target, 1);
 	log_parse_category_mask(osmo_stderr_target, "DLOAP,1");
diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c
index 9705038a7..4ca52a363 100644
--- a/tests/socket/socket_sctp_test.c
+++ b/tests/socket/socket_sctp_test.c
@@ -222,7 +222,7 @@ int main(int argc, char *argv[])
 	ctx = talloc_named_const(NULL, 0, "socket_test_sctp");
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category(osmo_stderr_target, 0);
 	log_set_print_category_hex(osmo_stderr_target, 0);
 #ifdef HAVE_LIBSCTP
diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c
index 961955381..614db55c5 100644
--- a/tests/socket/socket_test.c
+++ b/tests/socket/socket_test.c
@@ -400,7 +400,7 @@ int main(int argc, char *argv[])
 	ctx = talloc_named_const(NULL, 0, "socket_test");
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category(osmo_stderr_target, 0);
 	log_set_print_category_hex(osmo_stderr_target, 0);
 
diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c
index ede3082e0..d188eed20 100644
--- a/tests/tdef/tdef_test.c
+++ b/tests/tdef/tdef_test.c
@@ -477,7 +477,7 @@ int main(int argc, char **argv)
 	ctx = talloc_named_const(NULL, 0, "tdef_test.c");
 	osmo_init_logging2(ctx, NULL);
 
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category(osmo_stderr_target, 1);
 	log_set_use_color(osmo_stderr_target, 0);
 
diff --git a/tests/write_queue/wqueue_test.c b/tests/write_queue/wqueue_test.c
index 9c7a36e96..3823ef5be 100644
--- a/tests/write_queue/wqueue_test.c
+++ b/tests/write_queue/wqueue_test.c
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 	log_init(&log_info, NULL);
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
-	log_set_print_filename(stderr_target, 0);
+	log_set_print_filename2(stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category_hex(stderr_target, 0);
 	log_set_print_category(stderr_target, 0);
 
diff --git a/utils/osmo-ns-dummy.c b/utils/osmo-ns-dummy.c
index ee7f59162..0af1a897d 100644
--- a/utils/osmo-ns-dummy.c
+++ b/utils/osmo-ns-dummy.c
@@ -227,8 +227,7 @@ int main (int argc, char *argv[])
 
 	osmo_init_logging2(ctx, &log_info);
 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_log_level(osmo_stderr_target, LOGL_INFO);
 	msgb_talloc_ctx_init(ctx, 0);
 	osmo_stats_init(ctx);