diff --git a/tests/client_util.c b/tests/client_util.c
index 9a6468e9..20ac1dad 100644
--- a/tests/client_util.c
+++ b/tests/client_util.c
@@ -60,6 +60,13 @@ struct Client *make_local_person_full(const char *nick, const char *username, co
 	return client;
 }
 
+void make_local_person_oper(struct Client *client)
+{
+	rb_dlinkAddAlloc(client, &local_oper_list);
+	rb_dlinkAddAlloc(client, &oper_list);
+	SetOper(client);
+}
+
 void remove_local_person(struct Client *client)
 {
 	exit_client(NULL, client, &me, "Test client removed");
diff --git a/tests/client_util.h b/tests/client_util.h
index 5bacac08..7fb0bd5b 100644
--- a/tests/client_util.h
+++ b/tests/client_util.h
@@ -41,6 +41,7 @@ void client_util_free(void);
 struct Client *make_local_person(void);
 struct Client *make_local_person_nick(const char *nick);
 struct Client *make_local_person_full(const char *nick, const char *username, const char *hostname, const char *ip, const char *realname);
+void make_local_person_oper(struct Client *client);
 void remove_local_person(struct Client *client);
 
 char *get_client_sendq(const struct Client *client);
diff --git a/tests/send1.c b/tests/send1.c
index 2ed74ab5..3cd0db93 100644
--- a/tests/send1.c
+++ b/tests/send1.c
@@ -49,21 +49,10 @@ static void sendto_wallops_flags1(void)
 	struct Client *oper3 = make_local_person_nick("oper3");
 	struct Client *oper4 = make_local_person_nick("oper4");
 
-	rb_dlinkAddAlloc(oper1, &local_oper_list);
-	rb_dlinkAddAlloc(oper1, &oper_list);
-	SetOper(oper1);
-
-	rb_dlinkAddAlloc(oper2, &local_oper_list);
-	rb_dlinkAddAlloc(oper2, &oper_list);
-	SetOper(oper2);
-
-	rb_dlinkAddAlloc(oper3, &local_oper_list);
-	rb_dlinkAddAlloc(oper3, &oper_list);
-	SetOper(oper3);
-
-	rb_dlinkAddAlloc(oper4, &local_oper_list);
-	rb_dlinkAddAlloc(oper4, &oper_list);
-	SetOper(oper4);
+	make_local_person_oper(oper1);
+	make_local_person_oper(oper2);
+	make_local_person_oper(oper3);
+	make_local_person_oper(oper4);
 
 	user1->umodes |= UMODE_WALLOP;
 	oper1->umodes |= UMODE_WALLOP | UMODE_OPERWALL;