diff --git a/test/functional/abc-get-invalid-block.py b/test/functional/abc-get-invalid-block.py
new file mode 100755
--- /dev/null
+++ b/test/functional/abc-get-invalid-block.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python3
+# Copyright (c) 2019 The Bitcoin developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test requesting invalid blocks behaves safely."""
+
+from test_framework.messages import (
+    CInv,
+    msg_getblocks,
+    msg_getdata,
+    msg_getheaders,
+    MSG_BLOCK,
+    MSG_CMPCTBLOCK,
+)
+from test_framework.mininode import mininode_lock, P2PInterface
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal
+
+
+class GetInvalidBlockTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+
+    def run_test(self):
+        node = self.nodes[0]
+        node.add_p2p_connection(P2PInterface())
+        chaintip = node.getbestblockhash()
+
+        # Mine some blocks and invalidate them
+        blocks = node.generate(nblocks=3)
+        assert_equal(blocks[-1], node.getbestblockhash())
+        node.invalidateblock(blocks[0])
+        assert_equal(chaintip, node.getbestblockhash())
+
+        # Clear any old messages
+        with mininode_lock:
+            node.p2p.last_message.pop("block", None)
+            node.p2p.last_message.pop("cmpctblock", None)
+            node.p2p.last_message.pop("headers", None)
+
+        # Requests for the invalidated block and it's decendants should fail.
+        # Not doing so is a potential DoS vector.
+        for b in blocks:
+            block_hash = int(b, 16)
+
+            # Currently, the implementation for getblocks skips blocks which
+            # are not on the currently active chain. This is the only logged
+            # indication of such.
+            with node.assert_debug_log(expected_msgs=["getblocks -1 to"]):
+                msg = msg_getblocks()
+                msg.locator.vHave = [block_hash]
+                node.p2p.send_message(msg)
+                node.p2p.sync_with_ping()
+
+            with node.assert_debug_log(expected_msgs=["ignoring request from peer=0 for old block that isn't in the main chain"]):
+                msg = msg_getdata()
+                msg.inv.append(CInv(MSG_BLOCK, block_hash))
+                node.p2p.send_message(msg)
+                node.p2p.sync_with_ping()
+
+            with node.assert_debug_log(expected_msgs=["ignoring request from peer=0 for old block that isn't in the main chain"]):
+                msg = msg_getdata()
+                msg.inv.append(CInv(MSG_CMPCTBLOCK, block_hash))
+                node.p2p.send_message(msg)
+                node.p2p.sync_with_ping()
+
+            with node.assert_debug_log(expected_msgs=["ignoring request from peer=0 for old block header that isn't in the main chain"]):
+                msg = msg_getheaders()
+                msg.hashstop = block_hash
+                node.p2p.send_message(msg)
+                node.p2p.sync_with_ping()
+
+
+if __name__ == '__main__':
+    GetInvalidBlockTest().main()
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -54,6 +54,7 @@
 
 MSG_TX = 1
 MSG_BLOCK = 2
+MSG_CMPCTBLOCK = 4
 MSG_TYPE_MASK = 0xffffffff >> 2
 
 # Serialization/deserialization tools