diff --git a/test/functional/abc-sync-chain.py b/test/functional/abc-sync-chain.py
new file mode 100755
index 0000000000..bf0bd9e438
--- /dev/null
+++ b/test/functional/abc-sync-chain.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018 The Bitcoin developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+"""
+Test that a node receiving many (potentially out of order) blocks exits
+initial block download (IBD; this occurs once it has passed minimumchainwork)
+and continues to sync without seizing.
+"""
+
+import random
+
+from test_framework.blocktools import create_block, create_coinbase
+from test_framework.mininode import (CBlockHeader,
+                                     NetworkThread,
+                                     NodeConn,
+                                     NodeConnCB,
+                                     msg_block,
+                                     msg_headers)
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal, wait_until, p2p_port
+
+
+NUM_IBD_BLOCKS = 50
+
+
+class BaseNode(NodeConnCB):
+    def send_header(self, block):
+        msg = msg_headers()
+        msg.headers = [CBlockHeader(block)]
+        self.send_message(msg)
+
+    def send_block(self, block):
+        self.send_message(msg_block(block))
+
+
+class SyncChainTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+        # Setting minimumchainwork makes sure we test IBD as well as post-IBD
+        self.extra_args = [
+            ["-minimumchainwork={:#x}".format(202 + 2 * NUM_IBD_BLOCKS)]]
+
+    def run_test(self):
+        node0conn = BaseNode()
+        node0conn.add_connection(
+            NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], node0conn))
+
+        NetworkThread().start()
+        node0conn.wait_for_verack()
+
+        node0 = self.nodes[0]
+
+        tip = int(node0.getbestblockhash(), 16)
+        height = node0.getblockcount() + 1
+        time = node0.getblock(node0.getbestblockhash())['time'] + 1
+
+        blocks = []
+        for i in range(NUM_IBD_BLOCKS * 2):
+            block = create_block(tip, create_coinbase(height), time)
+            block.solve()
+            blocks.append(block)
+            tip = block.sha256
+            height += 1
+            time += 1
+
+        # Headers need to be sent in-order
+        for b in blocks:
+            node0conn.send_header(b)
+
+        # Send blocks in some random order
+        for b in random.sample(blocks, len(blocks)):
+            node0conn.send_block(b)
+
+        # The node should eventually, completely sync without getting stuck
+        def node_synced():
+            return node0.getbestblockhash() == blocks[-1].hash
+        wait_until(node_synced)
+
+
+if __name__ == '__main__':
+    SyncChainTest().main()
diff --git a/test/functional/timing.json b/test/functional/timing.json
index cfc78702eb..ebe3147da5 100644
--- a/test/functional/timing.json
+++ b/test/functional/timing.json
@@ -1,363 +1,367 @@
 [
  {
   "name": "abandonconflict.py",
   "time": 17
  },
  {
   "name": "abc-checkdatasig-activation.py",
   "time": 3
  },
  {
   "name": "abc-cmdline.py",
   "time": 8
  },
  {
   "name": "abc-finalize-block.py",
   "time": 4
  },
  {
   "name": "abc-high_priority_transaction.py",
   "time": 6
  },
  {
   "name": "abc-magnetic-anomaly-activation.py",
   "time": 6
  },
  {
   "name": "abc-mempool-accept-txn.py",
   "time": 3
  },
  {
   "name": "abc-p2p-compactblocks.py",
   "time": 273
  },
  {
   "name": "abc-p2p-fullblocktest.py",
   "time": 62
  },
  {
   "name": "abc-parkedchain.py",
   "time": 17
  },
  {
   "name": "abc-replay-protection.py",
   "time": 4
  },
  {
   "name": "abc-rpc.py",
   "time": 2
  },
+ {
+  "name": "abc-sync-chain.py",
+  "time": 11
+ },
  {
   "name": "abc-transaction-ordering.py",
   "time": 6
  },
  {
   "name": "assumevalid.py",
   "time": 17
  },
  {
   "name": "bip65-cltv-p2p.py",
   "time": 6
  },
  {
   "name": "bip68-112-113-p2p.py",
   "time": 15
  },
  {
   "name": "bip68-sequence.py",
   "time": 32
  },
  {
   "name": "bipdersig-p2p.py",
   "time": 6
  },
  {
   "name": "bitcoin_cli.py",
   "time": 4
  },
  {
   "name": "blockchain.py",
   "time": 19
  },
  {
   "name": "dbcrash.py",
   "time": 1292
  },
  {
   "name": "decodescript.py",
   "time": 2
  },
  {
   "name": "deprecated_rpc.py",
   "time": 2
  },
  {
   "name": "disablewallet.py",
   "time": 2
  },
  {
   "name": "disconnect_ban.py",
   "time": 6
  },
  {
   "name": "example_test.py",
   "time": 16
  },
  {
   "name": "fundrawtransaction.py",
   "time": 40
  },
  {
   "name": "getblocktemplate_longpoll.py",
   "time": 69
  },
  {
   "name": "getchaintips.py",
   "time": 4
  },
  {
   "name": "httpbasics.py",
   "time": 17
  },
  {
   "name": "import-rescan.py",
   "time": 18
  },
  {
   "name": "importmulti.py",
   "time": 11
  },
  {
   "name": "importprunedfunds.py",
   "time": 5
  },
  {
   "name": "invalidateblock.py",
   "time": 8
  },
  {
   "name": "invalidblockrequest.py",
   "time": 5
  },
  {
   "name": "invalidtxrequest.py",
   "time": 15
  },
  {
   "name": "keypool-topup.py",
   "time": 34
  },
  {
   "name": "keypool.py",
   "time": 7
  },
  {
   "name": "listsinceblock.py",
   "time": 24
  },
  {
   "name": "listtransactions.py",
   "time": 23
  },
  {
   "name": "maxuploadtarget.py",
   "time": 28
  },
  {
   "name": "mempool_limit.py",
   "time": 8
  },
  {
   "name": "mempool_packages.py",
   "time": 55
  },
  {
   "name": "mempool_persist.py",
   "time": 19
  },
  {
   "name": "mempool_reorg.py",
   "time": 6
  },
  {
   "name": "mempool_resurrect_test.py",
   "time": 2
  },
  {
   "name": "mempool_spendcoinbase.py",
   "time": 5
  },
  {
   "name": "merkle_blocks.py",
   "time": 32
  },
  {
   "name": "minchainwork.py",
   "time": 6
  },
  {
   "name": "mining.py",
   "time": 5
  },
  {
   "name": "multi_rpc.py",
   "time": 18
  },
  {
   "name": "multiwallet.py",
   "time": 20
  },
  {
   "name": "net.py",
   "time": 13
  },
  {
   "name": "notifications.py",
   "time": 6
  },
  {
   "name": "nulldummy.py",
   "time": 5
  },
  {
   "name": "p2p-acceptblock.py",
   "time": 14
  },
  {
   "name": "p2p-compactblocks.py",
   "time": 22
  },
  {
   "name": "p2p-feefilter.py",
   "time": 51
  },
  {
   "name": "p2p-fullblocktest.py",
   "time": 148
  },
  {
   "name": "p2p-leaktests.py",
   "time": 8
  },
  {
   "name": "p2p-mempool.py",
   "time": 3
 
  },
  {
   "name": "p2p-timeouts.py",
   "time": 64
  },
  {
   "name": "preciousblock.py",
   "time": 3
  },
  {
   "name": "prioritise_transaction.py",
   "time": 34
  },
  {
   "name": "proxy_test.py",
   "time": 3
  },
  {
   "name": "pruning.py",
   "time": 1511
  },
  {
   "name": "rawtransactions.py",
   "time": 16
  },
  {
   "name": "receivedby.py",
   "time": 37
  },
  {
   "name": "reindex.py",
   "time": 18
  },
  {
   "name": "resendwallettransactions.py",
   "time": 18
  },
  {
   "name": "rest.py",
   "time": 20
  },
  {
   "name": "rpcbind_test.py",
   "time": 28
  },
  {
   "name": "rpcnamedargs.py",
   "time": 2
  },
  {
   "name": "sendheaders.py",
   "time": 16
  },
  {
   "name": "signmessages.py",
   "time": 3
  },
  {
   "name": "signrawtransactions.py",
   "time": 2
  },
  {
   "name": "txn_clone.py",
   "time": 8
  },
  {
   "name": "txn_clone.py --mineblock",
   "time": 6
  },
  {
   "name": "txn_doublespend.py",
   "time": 7
  },
  {
   "name": "txn_doublespend.py --mineblock",
   "time": 7
  },
  {
   "name": "uptime.py",
   "time": 2
  },
  {
   "name": "wallet.py",
   "time": 34
  },
  {
   "name": "wallet_accounts.py",
   "time": 5
  },
  {
   "name": "wallet_dump.py",
   "time": 6
  },
  {
   "name": "wallet_encryption.py",
   "time": 8
  },
  {
   "name": "wallet_hd.py",
   "time": 54
  },
  {
   "name": "wallet_receivedby.py",
   "time": 9
  },
  {
   "name": "walletbackup.py",
   "time": 116
  },
  {
   "name": "zapwallettxes.py",
   "time": 10
  },
  {
   "name": "zmq_test.py",
   "time": 9
  }
-]
\ No newline at end of file
+]