diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index dd7b74fffc..4f6a55e2a6 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -3035,7 +3035,7 @@ void
 dig_startup(void) {
 	debug("dig_startup()");
 
-	isc_loop_setup(isc_loopmgr_mainloop(loopmgr), run_loop, NULL);
+	isc_loopmgr_setup(loopmgr, run_loop, NULL);
 	isc_loopmgr_run(loopmgr);
 }
 
diff --git a/bin/dig/host.c b/bin/dig/host.c
index b505cfb13d..c4a52dc8c6 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -910,7 +910,7 @@ main(int argc, char **argv) {
 		setup_text_key();
 	}
 
-	isc_loop_setup(isc_loopmgr_mainloop(loopmgr), run_loop, NULL);
+	isc_loopmgr_setup(loopmgr, run_loop, NULL);
 	isc_loopmgr_run(loopmgr);
 
 	cancel_all();
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 4f4408c739..a085843577 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -934,9 +934,9 @@ main(int argc, char **argv) {
 		set_search_domain(domainopt);
 	}
 	if (in_use) {
-		isc_loop_setup(isc_loopmgr_mainloop(loopmgr), run_loop, NULL);
+		isc_loopmgr_setup(loopmgr, run_loop, NULL);
 	} else {
-		isc_loop_setup(isc_loopmgr_mainloop(loopmgr), getinput, NULL);
+		isc_loopmgr_setup(loopmgr, getinput, NULL);
 	}
 	in_use = !in_use;
 
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 1c805cb7dd..a52022d5b7 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -3395,7 +3395,7 @@ main(int argc, char **argv) {
 	setup_system();
 
 	loopmgr = isc_loopmgr_new(gmctx, 1);
-	isc_loop_setup(isc_loopmgr_mainloop(loopmgr), getinput, NULL);
+	isc_loopmgr_setup(loopmgr, getinput, NULL);
 	isc_loopmgr_run(loopmgr);
 	isc_loopmgr_destroy(&loopmgr);
 
diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 374f9644d2..8284573be7 100644
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -1070,7 +1070,7 @@ main(int argc, char **argv) {
 
 	loopmgr = isc_loopmgr_new(rndc_mctx, 1);
 
-	isc_loop_setup(isc_loopmgr_mainloop(loopmgr), rndc_start, rndc_task);
+	isc_loopmgr_setup(loopmgr, rndc_start, rndc_task);
 	isc_loopmgr_run(loopmgr);
 
 	isc_task_detach(&rndc_task);
diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
index 694249dd7a..ca407a84bb 100644
--- a/bin/tests/system/pipelined/pipequeries.c
+++ b/bin/tests/system/pipelined/pipequeries.c
@@ -274,7 +274,7 @@ main(int argc, char *argv[]) {
 	RUNCHECK(dns_view_create(mctx, 0, "_test", &view));
 
 	loopmgr = isc_loopmgr_new(mctx, 1);
-	isc_loop_setup(isc_loopmgr_mainloop(loopmgr), sendqueries, task);
+	isc_loopmgr_setup(loopmgr, sendqueries, task);
 	isc_loopmgr_run(loopmgr);
 	isc_loopmgr_destroy(&loopmgr);
 
diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
index ca3bd04af0..957230b3e6 100644
--- a/bin/tests/system/tkey/keycreate.c
+++ b/bin/tests/system/tkey/keycreate.c
@@ -245,7 +245,7 @@ main(int argc, char *argv[]) {
 	isc_buffer_add(&nonce, sizeof(noncedata));
 
 	loopmgr = isc_loopmgr_new(mctx, 1);
-	isc_loop_setup(isc_loopmgr_mainloop(loopmgr), sendquery, task);
+	isc_loopmgr_setup(loopmgr, sendquery, task);
 	isc_loopmgr_run(loopmgr);
 	isc_loopmgr_destroy(&loopmgr);
 
diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
index fd0dcbfcce..af13e6f9b5 100644
--- a/bin/tests/system/tkey/keydelete.c
+++ b/bin/tests/system/tkey/keydelete.c
@@ -187,7 +187,7 @@ main(int argc, char **argv) {
 	CHECK("dns_tsigkey_createfromkey", result);
 
 	loopmgr = isc_loopmgr_new(mctx, 1);
-	isc_loop_setup(isc_loopmgr_mainloop(loopmgr), sendquery, task);
+	isc_loopmgr_setup(loopmgr, sendquery, task);
 	isc_loopmgr_run(loopmgr);
 	isc_loopmgr_destroy(&loopmgr);
 
diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index c356d296d4..ab23816a95 100644
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -2178,7 +2178,7 @@ main(int argc, char *argv[]) {
 	RUNCHECK(dns_view_create(mctx, 0, "_test", &view));
 
 	query = ISC_LIST_HEAD(queries);
-	isc_loop_setup(isc_loopmgr_mainloop(loopmgr), sendqueries, query);
+	isc_loopmgr_setup(loopmgr, sendqueries, query);
 
 	/*
 	 * Stall to the start of a new second.
diff --git a/lib/dns/tests/zt_test.c b/lib/dns/tests/zt_test.c
index 9289d40373..e58c58c9c1 100644
--- a/lib/dns/tests/zt_test.c
+++ b/lib/dns/tests/zt_test.c
@@ -197,8 +197,7 @@ asyncload_zone(void **state) {
 	args.arg3 = false;
 
 	loopmgr = isc_loopmgr_new(dt_mctx, 1);
-	isc_loop_setup(isc_loopmgr_mainloop(loopmgr), start_zone_asyncload,
-		       &args);
+	isc_loopmgr_setup(loopmgr, start_zone_asyncload, &args);
 	isc_loopmgr_run(loopmgr);
 	isc_loopmgr_destroy(&loopmgr);
 
@@ -223,8 +222,7 @@ asyncload_zone(void **state) {
 	args.arg3 = true;
 
 	loopmgr = isc_loopmgr_new(dt_mctx, 1);
-	isc_loop_setup(isc_loopmgr_mainloop(loopmgr), start_zone_asyncload,
-		       &args);
+	isc_loopmgr_setup(loopmgr, start_zone_asyncload, &args);
 	isc_loopmgr_run(loopmgr);
 	isc_loopmgr_destroy(&loopmgr);
 
@@ -243,8 +241,7 @@ asyncload_zone(void **state) {
 	args.arg3 = false;
 
 	loopmgr = isc_loopmgr_new(dt_mctx, 1);
-	isc_loop_setup(isc_loopmgr_mainloop(loopmgr), start_zone_asyncload,
-		       &args);
+	isc_loopmgr_setup(loopmgr, start_zone_asyncload, &args);
 	isc_loopmgr_run(loopmgr);
 	isc_loopmgr_destroy(&loopmgr);
 
@@ -321,8 +318,7 @@ asyncload_zt(void **state) {
 	args.arg2 = &done;
 
 	loopmgr = isc_loopmgr_new(dt_mctx, 1);
-	isc_loop_setup(isc_loopmgr_mainloop(loopmgr), start_zt_asyncload,
-		       &args);
+	isc_loopmgr_setup(loopmgr, start_zt_asyncload, &args);
 	isc_loopmgr_run(loopmgr);
 	isc_loopmgr_destroy(&loopmgr);