diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
index 1a0a96f2b..82a91e368 100644
--- a/lightningd/peer_control.c
+++ b/lightningd/peer_control.c
@@ -2034,7 +2034,7 @@ static bool peer_start_channeld(struct peer *peer,
 				      &peer->ld->id,
 				      &peer->id,
 				      time_to_msec(cfg->commit_time),
-				      cfg->deadline_blocks,
+				      cfg->min_htlc_expiry,
 				      peer->last_was_revoke,
 				      peer->last_sent_commit,
 				      peer->next_index[LOCAL],
diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c
index f793251cf..9f9c268ed 100644
--- a/lightningd/peer_htlcs.c
+++ b/lightningd/peer_htlcs.c
@@ -514,7 +514,7 @@ static void forward_htlc(struct htlc_in *hin,
 	}
 
 	if (!check_ctlv(hin, cltv_expiry, outgoing_cltv_value,
-			ld->config.deadline_blocks)) {
+			ld->config.min_htlc_expiry)) {
 		failcode = WIRE_INCORRECT_CLTV_EXPIRY;
 		goto fail;
 	}
diff --git a/tests/test_lightningd.py b/tests/test_lightningd.py
index ce66dd1cf..acc1898a6 100644
--- a/tests/test_lightningd.py
+++ b/tests/test_lightningd.py
@@ -689,11 +689,11 @@ class LightningDTests(BaseLightningDTests):
 
         baseroute = [ { 'msatoshi' : amt + fee,
                         'id' : l2.info['id'],
-                        'delay' : 10,
+                        'delay' : 12,
                         'channel' : chanid1 },
                       { 'msatoshi' : amt,
                         'id' : l3.info['id'],
-                        'delay' : 5,
+                        'delay' : 6,
                         'channel' : chanid2 } ]
 
         # Unknown other peer