diff --git a/bin/tests/dispatch_tcp_test.c b/bin/tests/dispatch_tcp_test.c
index 569d62235c..d4f0492d0d 100644
--- a/bin/tests/dispatch_tcp_test.c
+++ b/bin/tests/dispatch_tcp_test.c
@@ -185,7 +185,7 @@ start_response(void)
 				&from.type.sin.sin_addr) == 1);
 
 	msg = NULL;
-	result = dns_message_create(mctx, &msg, DNS_MESSAGE_INTENTRENDER);
+	result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER, &msg);
 	CHECKRESULT(result, "dns_message_create()");
 
 	dns_message_addname(msg, &name, DNS_SECTION_QUESTION);
@@ -261,7 +261,7 @@ got_response(isc_task_t *task, isc_event_t *ev_in)
 	       ev->id, isc_result_totext(ev->result));
 
 	msg = NULL;
-	result = dns_message_create(mctx, &msg, DNS_MESSAGE_INTENTPARSE);
+	result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &msg);
 	CHECKRESULT(result, "dns_message_create() failed");
 
 	result = dns_message_parse(msg, &ev->buffer);
@@ -301,7 +301,7 @@ got_request(isc_task_t *task, isc_event_t *ev_in)
 	hex_dump(&ev->buffer);
 
 	msg = NULL;
-	result = dns_message_create(mctx, &msg, DNS_MESSAGE_INTENTPARSE);
+	result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &msg);
 	CHECKRESULT(result, "dns_message_create() failed");
 
 	result = dns_message_parse(msg, &ev->buffer);
diff --git a/bin/tests/dispatch_test.c b/bin/tests/dispatch_test.c
index da61ec02c5..c4981dcb0d 100644
--- a/bin/tests/dispatch_test.c
+++ b/bin/tests/dispatch_test.c
@@ -161,7 +161,7 @@ start_response(clictx_t *cli, char *query, isc_task_t *task)
 				&from.type.sin.sin_addr) == 1);
 
 	msg = NULL;
-	result = dns_message_create(mctx, &msg, DNS_MESSAGE_INTENTRENDER);
+	result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER, &msg);
 	CHECKRESULT(result, "dns_message_create()");
 
 	dns_message_addname(msg, &name, DNS_SECTION_QUESTION);
@@ -257,7 +257,7 @@ got_response(isc_task_t *task, isc_event_t *ev_in)
 	}
 
 	msg = NULL;
-	result = dns_message_create(mctx, &msg, DNS_MESSAGE_INTENTPARSE);
+	result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &msg);
 	CHECKRESULT(result, "dns_message_create() failed");
 
 	result = dns_message_parse(msg, &ev->buffer);
@@ -311,7 +311,7 @@ got_request(isc_task_t *task, isc_event_t *ev_in)
 	hex_dump(&ev->buffer);
 
 	msg = NULL;
-	result = dns_message_create(mctx, &msg, DNS_MESSAGE_INTENTPARSE);
+	result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &msg);
 	CHECKRESULT(result, "dns_message_create() failed");
 
 	result = dns_message_parse(msg, &ev->buffer);
diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c
index fef1f1eda9..eeabd08293 100644
--- a/bin/tests/wire_test.c
+++ b/bin/tests/wire_test.c
@@ -131,7 +131,7 @@ main(int argc, char *argv[]) {
 	isc_buffer_add(&source, bp - b);
 
 	message = NULL;
-	result = dns_message_create(mctx, &message, DNS_MESSAGE_INTENTPARSE);
+	result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &message);
 	CHECKRESULT(result, "dns_message_create failed");
 
 	result = dns_message_parse(message, &source);
@@ -185,7 +185,7 @@ main(int argc, char *argv[]) {
 	printf("Message rendered.\n");
 	isc_mem_stats(mctx, stdout);
 
-	result = dns_message_create(mctx, &message, DNS_MESSAGE_INTENTPARSE);
+	result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &message);
 	CHECKRESULT(result, "dns_message_create failed");
 
 	result = dns_message_parse(message, &source);