diff --git a/test/broker/10-listener-mount-point-helper.py b/test/broker/10-listener-mount-point-helper.py
deleted file mode 100755
index 1612e751..00000000
--- a/test/broker/10-listener-mount-point-helper.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python3
-
-from mosq_test_helper import *
-
-port = mosq_test.get_port()
-
-rc = 1
-keepalive = 60
-connect_packet = mosq_test.gen_connect("test-helper", keepalive=keepalive)
-connack_packet = mosq_test.gen_connack(rc=0)
-
-publish_packet = mosq_test.gen_publish("test", qos=0, payload="mount point")
-
-sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port, connack_error="helper connack")
-sock.send(publish_packet)
-rc = 0
-sock.close()
-
-exit(rc)
-
diff --git a/test/broker/10-listener-mount-point.py b/test/broker/10-listener-mount-point.py
index 8ffc8255..05ad183c 100755
--- a/test/broker/10-listener-mount-point.py
+++ b/test/broker/10-listener-mount-point.py
@@ -11,43 +11,59 @@ def write_config(filename, port1, port2):
         f.write("\n")
         f.write("log_type debug\n")
 
-(port1, port2) = mosq_test.get_port(2)
-conf_file = os.path.basename(__file__).replace('.py', '.conf')
-write_config(conf_file, port1, port2)
 
-rc = 1
-keepalive = 60
-connect_packet = mosq_test.gen_connect("test2", keepalive=keepalive)
-connack_packet = mosq_test.gen_connack(rc=0)
+def helper(port, proto_ver):
+    connect_packet = mosq_test.gen_connect("test-helper", keepalive=60, proto_ver=proto_ver)
+    connack_packet = mosq_test.gen_connack(rc=0, proto_ver=proto_ver)
 
-mid = 1
-subscribe_packet = mosq_test.gen_subscribe(mid, "#", 0)
-suback_packet = mosq_test.gen_suback(mid, 0)
+    publish_packet = mosq_test.gen_publish("test", qos=0, payload="mount point", proto_ver=proto_ver)
 
-publish_packet = mosq_test.gen_publish("mount/test", qos=0, payload="mount point")
+    sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port, connack_error="helper connack")
+    sock.send(publish_packet)
+    sock.close()
 
-broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port1)
 
-try:
-    sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port1)
-    mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback")
+def do_test(proto_ver):
+    (port1, port2) = mosq_test.get_port(2)
+    conf_file = os.path.basename(__file__).replace('.py', '.conf')
+    write_config(conf_file, port1, port2)
 
-    pub = subprocess.Popen(['./10-listener-mount-point-helper.py', str(port2)], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    pub.wait()
-    (stdo, stde) = pub.communicate()
-    # Should have now received a publish command
+    rc = 1
+    keepalive = 60
+    connect_packet = mosq_test.gen_connect("test2", keepalive=keepalive, proto_ver=proto_ver)
+    connack_packet = mosq_test.gen_connack(rc=0, proto_ver=proto_ver)
 
-    if mosq_test.expect_packet(sock, "publish", publish_packet):
-        rc = 0
+    mid = 1
+    subscribe_packet = mosq_test.gen_subscribe(mid, "#", 0, proto_ver=proto_ver)
+    suback_packet = mosq_test.gen_suback(mid, 0, proto_ver=proto_ver)
 
-    sock.close()
-finally:
-    os.remove(conf_file)
-    broker.terminate()
-    broker.wait()
-    (stdo, stde) = broker.communicate()
-    if rc:
-        print(stde.decode('utf-8'))
-
-exit(rc)
+    publish_packet = mosq_test.gen_publish("mount/test", qos=0, payload="mount point", proto_ver=proto_ver)
+
+    broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port1)
+
+    try:
+        sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port1)
+        mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback")
+
+        helper(port2, proto_ver)
+        # Should have now received a publish command
+
+        if mosq_test.expect_packet(sock, "publish", publish_packet):
+            rc = 0
+
+        sock.close()
+    finally:
+        os.remove(conf_file)
+        broker.terminate()
+        broker.wait()
+        (stdo, stde) = broker.communicate()
+        if rc:
+            print(stde.decode('utf-8'))
+            print("proto_ver=%d" % (proto_ver))
+            exit(rc)
+
+
+do_test(proto_ver=4)
+do_test(proto_ver=5)
+exit(0)