diff --git a/test/functional/p2p_ping.py b/test/functional/p2p_ping.py
index fa719f88a67..8f341fe51b3 100755
--- a/test/functional/p2p_ping.py
+++ b/test/functional/p2p_ping.py
@@ -7,7 +7,10 @@
 
 import time
 
-from test_framework.messages import msg_pong
+from test_framework.messages import (
+    msg_pong,
+    msg_generic,
+)
 from test_framework.p2p import P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
@@ -20,11 +23,6 @@ PING_INTERVAL = 2 * 60
 TIMEOUT_INTERVAL = 20 * 60
 
 
-class msg_pong_corrupt(msg_pong):
-    def serialize(self):
-        return b""
-
-
 class NodeNoPong(P2PInterface):
     def on_ping(self, message):
         pass
@@ -60,7 +58,7 @@ class PingPongTest(BitcoinTestFramework):
 
         self.log.info('Reply without nonce cancels ping')
         with self.nodes[0].assert_debug_log(['pong peer=0: Short payload']):
-            no_pong_node.send_and_ping(msg_pong_corrupt())
+            no_pong_node.send_and_ping(msg_generic(b"pong", b""))
         self.check_peer_info(pingtime=None, minping=None, pingwait=None)
 
         self.log.info('Reply without ping')
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
index 62ddd53f26d..774775c00e1 100755
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -1374,8 +1374,8 @@ class msg_block:
         return "msg_block(block=%s)" % (repr(self.block))
 
 
-# for cases where a user needs tighter control over what is sent over the wire
-# note that the user must supply the name of the msgtype, and the data
+# Generic type to control the raw bytes sent over the wire.
+# The msgtype and the data must be provided.
 class msg_generic:
     __slots__ = ("msgtype", "data")