diff --git a/test/functional/abc-get-invalid-block.py b/test/functional/abc-get-invalid-block.py
--- a/test/functional/abc-get-invalid-block.py
+++ b/test/functional/abc-get-invalid-block.py
@@ -10,7 +10,7 @@
     msg_getdata,
     msg_getheaders,
     MSG_BLOCK,
-    MSG_CMPCTBLOCK,
+    MSG_CMPCT_BLOCK,
 )
 from test_framework.mininode import mininode_lock, P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
@@ -61,7 +61,7 @@
 
             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))
+                msg.inv.append(CInv(MSG_CMPCT_BLOCK, block_hash))
                 node.p2p.send_message(msg)
                 node.p2p.sync_with_ping()
 
diff --git a/test/functional/p2p_compactblocks.py b/test/functional/p2p_compactblocks.py
--- a/test/functional/p2p_compactblocks.py
+++ b/test/functional/p2p_compactblocks.py
@@ -25,6 +25,7 @@
     FromHex,
     HeaderAndShortIDs,
     MSG_BLOCK,
+    MSG_CMPCT_BLOCK,
     msg_block,
     msg_blocktxn,
     msg_cmpctblock,
@@ -355,7 +356,7 @@
         # Now fetch the compact block using a normal non-announce getdata
         with mininode_lock:
             test_node.clear_block_announcement()
-            inv = CInv(4, block_hash)  # 4 == "CompactBlock"
+            inv = CInv(MSG_CMPCT_BLOCK, block_hash)
             test_node.send_message(msg_getdata([inv]))
 
         wait_until(test_node.received_block_announcement,
@@ -685,7 +686,8 @@
                        timeout=30, lock=mininode_lock)
 
         test_node.clear_block_announcement()
-        test_node.send_message(msg_getdata([CInv(4, int(new_blocks[0], 16))]))
+        test_node.send_message(msg_getdata(
+            [CInv(MSG_CMPCT_BLOCK, int(new_blocks[0], 16))]))
         wait_until(lambda: "cmpctblock" in test_node.last_message,
                    timeout=30, lock=mininode_lock)
 
@@ -696,7 +698,8 @@
         test_node.clear_block_announcement()
         with mininode_lock:
             test_node.last_message.pop("block", None)
-        test_node.send_message(msg_getdata([CInv(4, int(new_blocks[0], 16))]))
+        test_node.send_message(msg_getdata(
+            [CInv(MSG_CMPCT_BLOCK, int(new_blocks[0], 16))]))
         wait_until(lambda: "block" in test_node.last_message,
                    timeout=30, lock=mininode_lock)
         with mininode_lock:
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
@@ -60,7 +60,7 @@
 MSG_TX = 1
 MSG_BLOCK = 2
 MSG_FILTERED_BLOCK = 3
-MSG_CMPCTBLOCK = 4
+MSG_CMPCT_BLOCK = 4
 MSG_TYPE_MASK = 0xffffffff >> 2
 
 FILTER_TYPE_BASIC = 0
@@ -250,7 +250,7 @@
         MSG_TX: "TX",
         MSG_BLOCK: "Block",
         MSG_FILTERED_BLOCK: "filtered Block",
-        MSG_CMPCTBLOCK: "CompactBlock"
+        MSG_CMPCT_BLOCK: "CompactBlock"
     }
 
     def __init__(self, t=0, h=0):