diff --git a/test-cli/open-channel.c b/test-cli/open-channel.c
index 9fc59dcae..54eb76f19 100644
--- a/test-cli/open-channel.c
+++ b/test-cli/open-channel.c
@@ -84,8 +84,11 @@ int main(int argc, char *argv[])
 	       revocation_hash.u.u8, sizeof(revocation_hash.u.u8));
 
 	pkt = open_channel_pkt(ctx, &revocation_hash, &commitkey, &finalkey,
-			       locktime_seconds, offer_anchor, min_confirms,
-			       commit_tx_fee);
+			       locktime_seconds,
+			       offer_anchor
+			       ? OPEN_CHANNEL__ANCHOR_OFFER__WILL_CREATE_ANCHOR
+			       : OPEN_CHANNEL__ANCHOR_OFFER__WONT_CREATE_ANCHOR,
+			       min_confirms, commit_tx_fee);
 
 	if (!write_all(STDOUT_FILENO, pkt, pkt_totlen(pkt)))
 		err(1, "Writing out packet");
diff --git a/test-cli/pkt.c b/test-cli/pkt.c
index 7c350d9fd..08300275f 100644
--- a/test-cli/pkt.c
+++ b/test-cli/pkt.c
@@ -36,7 +36,7 @@ struct pkt *open_channel_pkt(const tal_t *ctx,
 			     const struct pubkey *commit,
 			     const struct pubkey *final,
 			     u32 rel_locktime_seconds,
-			     bool offer_anchor,
+			     OpenChannel__AnchorOffer offer_anchor,
 			     u32 min_depth,
 			     u64 commitment_fee)
 {
@@ -50,10 +50,9 @@ struct pkt *open_channel_pkt(const tal_t *ctx,
 	lt.seconds = rel_locktime_seconds;
 	o.delay = <
 	o.commitment_fee = commitment_fee;
-	if (offer_anchor)
-		o.anch = OPEN_CHANNEL__ANCHOR_OFFER__WILL_CREATE_ANCHOR;
-	else
-		o.anch = OPEN_CHANNEL__ANCHOR_OFFER__WONT_CREATE_ANCHOR;
+	o.anch = offer_anchor;
+	assert(o.anch == OPEN_CHANNEL__ANCHOR_OFFER__WILL_CREATE_ANCHOR
+	       || o.anch == OPEN_CHANNEL__ANCHOR_OFFER__WONT_CREATE_ANCHOR);
 
 	o.min_depth = min_depth;
 
diff --git a/test-cli/pkt.h b/test-cli/pkt.h
index b0f6b2f85..6d4f13556 100644
--- a/test-cli/pkt.h
+++ b/test-cli/pkt.h
@@ -45,7 +45,7 @@ struct pkt *open_channel_pkt(const tal_t *ctx,
 			     const struct pubkey *commit,
 			     const struct pubkey *final,
 			     u32 rel_locktime_seconds,
-			     bool offer_anchor,
+			     OpenChannel__AnchorOffer offer_anchor,
 			     u32 min_depth,
 			     u64 commitment_fee);