diff --git a/openbsc/src/libcommon/gsup_client.c b/openbsc/src/libcommon/gsup_client.c
index 2e920a6..de00d8d 100644
--- a/openbsc/src/libcommon/gsup_client.c
+++ b/openbsc/src/libcommon/gsup_client.c
@@ -254,8 +254,7 @@
 
 static void start_test_procedure(struct gsup_client *gsupc)
 {
-	gsupc->ping_timer.data = gsupc;
-	gsupc->ping_timer.cb = &ping_timer_cb;
+	osmo_timer_setup(&gsupc->ping_timer, ping_timer_cb, gsupc);
 
 	gsupc->got_ipa_pong = 0;
 	osmo_timer_schedule(&gsupc->ping_timer, GSUP_CLIENT_PING_INTERVAL, 0);
@@ -290,8 +289,7 @@
 	if (!gsupc->link)
 		goto failed;
 
-	gsupc->connect_timer.data = gsupc;
-	gsupc->connect_timer.cb = &connect_timer_cb;
+	osmo_timer_setup(&gsupc->connect_timer, connect_timer_cb, gsupc);
 
 	rc = gsup_client_connect(gsupc);
 
diff --git a/openbsc/src/libcommon/gsup_test_client.c b/openbsc/src/libcommon/gsup_test_client.c
index 8be4e7a..8fc38d6 100644
--- a/openbsc/src/libcommon/gsup_test_client.c
+++ b/openbsc/src/libcommon/gsup_test_client.c
@@ -77,8 +77,7 @@
 	io = talloc_zero(ctx, struct imsi_op);
 	osmo_strlcpy(io->imsi, imsi, sizeof(io->imsi));
 	io->type = type;
-	io->timer.cb = imsi_op_timer_cb;
-	io->timer.data = io;
+	osmo_timer_setup(&io->timer, imsi_op_timer_cb, io);
 	llist_add(&io->list, &g_imsi_ops);
 	imsi_op_stats[type].num_alloc++;