diff --git a/test/Makefile b/test/Makefile
index b8746779..cf94ea73 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -15,7 +15,7 @@ test :
 	$(MAKE) -C broker test
 	$(MAKE) -C lib test
 
-ptest : broker-test lib-test
+ptest :
 	$(MAKE) -C broker ptest
 	$(MAKE) -C lib ptest
 
diff --git a/test/lib/01-con-discon-success.py b/test/lib/01-con-discon-success.py
index 5eaf67cd..bb5f4ce2 100755
--- a/test/lib/01-con-discon-success.py
+++ b/test/lib/01-con-discon-success.py
@@ -20,6 +20,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("01-con-discon-success", keepalive=keepalive)
@@ -30,7 +32,7 @@ disconnect_packet = mosq_test.gen_disconnect()
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -41,7 +43,8 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/01-keepalive-pingreq.py b/test/lib/01-keepalive-pingreq.py
index e438964c..8e95b5db 100755
--- a/test/lib/01-keepalive-pingreq.py
+++ b/test/lib/01-keepalive-pingreq.py
@@ -20,6 +20,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 4
 connect_packet = mosq_test.gen_connect("01-keepalive-pingreq", keepalive=keepalive)
@@ -31,7 +33,7 @@ pingresp_packet = mosq_test.gen_pingresp()
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -42,7 +44,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/01-no-clean-session.py b/test/lib/01-no-clean-session.py
index 15b3c9de..d5f46eb3 100755
--- a/test/lib/01-no-clean-session.py
+++ b/test/lib/01-no-clean-session.py
@@ -17,6 +17,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("01-no-clean-session", clean_session=False, keepalive=keepalive)
@@ -24,7 +26,7 @@ connect_packet = mosq_test.gen_connect("01-no-clean-session", clean_session=Fals
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -35,7 +37,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/01-unpwd-set.py b/test/lib/01-unpwd-set.py
index b727f23b..454e417a 100755
--- a/test/lib/01-unpwd-set.py
+++ b/test/lib/01-unpwd-set.py
@@ -17,6 +17,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("01-unpwd-set", keepalive=keepalive, username="uname", password=";'[08gn=#")
@@ -24,7 +26,7 @@ connect_packet = mosq_test.gen_connect("01-unpwd-set", keepalive=keepalive, user
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -35,7 +37,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/01-will-set.py b/test/lib/01-will-set.py
index 48aa4836..63a8e2ea 100755
--- a/test/lib/01-will-set.py
+++ b/test/lib/01-will-set.py
@@ -19,6 +19,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("01-will-set", keepalive=keepalive, will_topic="topic/on/unexpected/disconnect", will_qos=1, will_retain=True, will_payload="will message")
@@ -26,7 +28,7 @@ connect_packet = mosq_test.gen_connect("01-will-set", keepalive=keepalive, will_
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -37,7 +39,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/01-will-unpwd-set.py b/test/lib/01-will-unpwd-set.py
index 9104f347..2a64bef7 100755
--- a/test/lib/01-will-unpwd-set.py
+++ b/test/lib/01-will-unpwd-set.py
@@ -19,6 +19,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("01-will-unpwd-set",
@@ -28,7 +30,7 @@ connect_packet = mosq_test.gen_connect("01-will-unpwd-set",
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -39,7 +41,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/02-subscribe-qos0.py b/test/lib/02-subscribe-qos0.py
index 7b0d5988..f5f60d2f 100755
--- a/test/lib/02-subscribe-qos0.py
+++ b/test/lib/02-subscribe-qos0.py
@@ -24,6 +24,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("subscribe-qos0-test", keepalive=keepalive)
@@ -38,7 +40,7 @@ suback_packet = mosq_test.gen_suback(mid, 0)
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -49,7 +51,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/02-subscribe-qos1.py b/test/lib/02-subscribe-qos1.py
index fa5144bc..68ffa39d 100755
--- a/test/lib/02-subscribe-qos1.py
+++ b/test/lib/02-subscribe-qos1.py
@@ -24,6 +24,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("subscribe-qos1-test", keepalive=keepalive)
@@ -38,7 +40,7 @@ suback_packet = mosq_test.gen_suback(mid, 1)
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -49,7 +51,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/02-subscribe-qos2.py b/test/lib/02-subscribe-qos2.py
index 0fd1a72a..9a2864a5 100755
--- a/test/lib/02-subscribe-qos2.py
+++ b/test/lib/02-subscribe-qos2.py
@@ -24,6 +24,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("subscribe-qos2-test", keepalive=keepalive)
@@ -38,7 +40,7 @@ suback_packet = mosq_test.gen_suback(mid, 2)
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -49,7 +51,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/02-unsubscribe.py b/test/lib/02-unsubscribe.py
index ec9805ba..8d9560cf 100755
--- a/test/lib/02-unsubscribe.py
+++ b/test/lib/02-unsubscribe.py
@@ -14,6 +14,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("unsubscribe-test", keepalive=keepalive)
@@ -28,7 +30,7 @@ unsuback_packet = mosq_test.gen_unsuback(mid)
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -39,7 +41,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/03-publish-b2c-qos1.py b/test/lib/03-publish-b2c-qos1.py
index 53f3db46..4d6c475a 100755
--- a/test/lib/03-publish-b2c-qos1.py
+++ b/test/lib/03-publish-b2c-qos1.py
@@ -24,6 +24,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("publish-qos1-test", keepalive=keepalive)
@@ -38,7 +40,7 @@ puback_packet = mosq_test.gen_puback(mid)
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -49,7 +51,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/03-publish-b2c-qos2.py b/test/lib/03-publish-b2c-qos2.py
index 72c31541..a970ed55 100755
--- a/test/lib/03-publish-b2c-qos2.py
+++ b/test/lib/03-publish-b2c-qos2.py
@@ -29,6 +29,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("publish-qos2-test", keepalive=keepalive)
@@ -45,7 +47,7 @@ pubcomp_packet = mosq_test.gen_pubcomp(mid)
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -56,7 +58,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/03-publish-c2b-qos1-disconnect.py b/test/lib/03-publish-c2b-qos1-disconnect.py
index bcddecce..2111ae7c 100755
--- a/test/lib/03-publish-c2b-qos1-disconnect.py
+++ b/test/lib/03-publish-c2b-qos1-disconnect.py
@@ -14,6 +14,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("publish-qos1-test", keepalive=keepalive)
@@ -29,7 +31,7 @@ puback_packet = mosq_test.gen_puback(mid)
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -41,7 +43,7 @@ except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
 
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/03-publish-c2b-qos1-timeout.py b/test/lib/03-publish-c2b-qos1-timeout.py
index 3d0663ea..7cea7005 100755
--- a/test/lib/03-publish-c2b-qos1-timeout.py
+++ b/test/lib/03-publish-c2b-qos1-timeout.py
@@ -28,6 +28,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("publish-qos1-test", keepalive=keepalive)
@@ -43,7 +45,7 @@ puback_packet = mosq_test.gen_puback(mid)
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -54,7 +56,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/03-publish-c2b-qos2-disconnect.py b/test/lib/03-publish-c2b-qos2-disconnect.py
index 71195863..c9a5d526 100755
--- a/test/lib/03-publish-c2b-qos2-disconnect.py
+++ b/test/lib/03-publish-c2b-qos2-disconnect.py
@@ -14,6 +14,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("publish-qos2-test", keepalive=keepalive)
@@ -31,7 +33,7 @@ pubcomp_packet = mosq_test.gen_pubcomp(mid)
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -42,7 +44,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/03-publish-c2b-qos2-timeout.py b/test/lib/03-publish-c2b-qos2-timeout.py
index 00543f0e..37031a9a 100755
--- a/test/lib/03-publish-c2b-qos2-timeout.py
+++ b/test/lib/03-publish-c2b-qos2-timeout.py
@@ -32,6 +32,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("publish-qos2-test", keepalive=keepalive)
@@ -49,7 +51,7 @@ pubcomp_packet = mosq_test.gen_pubcomp(mid)
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -60,7 +62,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/03-publish-c2b-qos2.py b/test/lib/03-publish-c2b-qos2.py
index f8a604af..b27b6a06 100755
--- a/test/lib/03-publish-c2b-qos2.py
+++ b/test/lib/03-publish-c2b-qos2.py
@@ -32,6 +32,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("publish-qos2-test", keepalive=keepalive)
@@ -49,7 +51,7 @@ pubcomp_packet = mosq_test.gen_pubcomp(mid)
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -60,7 +62,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/03-publish-qos0-no-payload.py b/test/lib/03-publish-qos0-no-payload.py
index a858ad5c..b2185639 100755
--- a/test/lib/03-publish-qos0-no-payload.py
+++ b/test/lib/03-publish-qos0-no-payload.py
@@ -22,6 +22,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("publish-qos0-test-np", keepalive=keepalive)
@@ -34,7 +36,7 @@ disconnect_packet = mosq_test.gen_disconnect()
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -45,7 +47,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/03-publish-qos0.py b/test/lib/03-publish-qos0.py
index 1525da1d..3f7adc9b 100755
--- a/test/lib/03-publish-qos0.py
+++ b/test/lib/03-publish-qos0.py
@@ -22,6 +22,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 connect_packet = mosq_test.gen_connect("publish-qos0-test", keepalive=keepalive)
@@ -34,7 +36,7 @@ disconnect_packet = mosq_test.gen_disconnect()
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -45,7 +47,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/04-retain-qos0.py b/test/lib/04-retain-qos0.py
index ef234513..cb495df1 100755
--- a/test/lib/04-retain-qos0.py
+++ b/test/lib/04-retain-qos0.py
@@ -14,6 +14,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 rc = 1
 keepalive = 60
 mid = 16
@@ -25,7 +27,7 @@ publish_packet = mosq_test.gen_publish("retain/qos0/test", qos=0, payload="retai
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 sock.settimeout(10)
-sock.bind(('', 1888))
+sock.bind(('', port))
 sock.listen(5)
 
 client_args = sys.argv[1:]
@@ -36,7 +38,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = sock.accept()
diff --git a/test/lib/08-ssl-connect-cert-auth-enc.py b/test/lib/08-ssl-connect-cert-auth-enc.py
index 854fe128..d49540fa 100755
--- a/test/lib/08-ssl-connect-cert-auth-enc.py
+++ b/test/lib/08-ssl-connect-cert-auth-enc.py
@@ -23,6 +23,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 if sys.version < '2.7':
     print("WARNING: SSL not supported on Python 2.6")
     exit(0)
@@ -39,7 +41,7 @@ ssock = ssl.wrap_socket(sock, ca_certs="../ssl/all-ca.crt",
         keyfile="../ssl/server.key", certfile="../ssl/server.crt",
         server_side=True, ssl_version=ssl.PROTOCOL_TLSv1, cert_reqs=ssl.CERT_REQUIRED)
 ssock.settimeout(10)
-ssock.bind(('', 1888))
+ssock.bind(('', port))
 ssock.listen(5)
 
 client_args = sys.argv[1:]
@@ -50,7 +52,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = ssock.accept()
diff --git a/test/lib/08-ssl-connect-cert-auth.py b/test/lib/08-ssl-connect-cert-auth.py
index cd36e45d..f1485bb9 100755
--- a/test/lib/08-ssl-connect-cert-auth.py
+++ b/test/lib/08-ssl-connect-cert-auth.py
@@ -23,6 +23,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 if sys.version < '2.7':
     print("WARNING: SSL not supported on Python 2.6")
     exit(0)
@@ -39,7 +41,7 @@ ssock = ssl.wrap_socket(sock, ca_certs="../ssl/all-ca.crt",
         keyfile="../ssl/server.key", certfile="../ssl/server.crt",
         server_side=True, ssl_version=ssl.PROTOCOL_TLSv1, cert_reqs=ssl.CERT_REQUIRED)
 ssock.settimeout(10)
-ssock.bind(('', 1888))
+ssock.bind(('', port))
 ssock.listen(5)
 
 client_args = sys.argv[1:]
@@ -50,7 +52,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = ssock.accept()
diff --git a/test/lib/08-ssl-connect-no-auth.py b/test/lib/08-ssl-connect-no-auth.py
index 03d04a87..55c81962 100755
--- a/test/lib/08-ssl-connect-no-auth.py
+++ b/test/lib/08-ssl-connect-no-auth.py
@@ -22,6 +22,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 if sys.version < '2.7':
     print("WARNING: SSL not supported on Python 2.6")
     exit(0)
@@ -36,7 +38,7 @@ sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 ssock = ssl.wrap_socket(sock, ca_certs="../ssl/all-ca.crt", keyfile="../ssl/server.key", certfile="../ssl/server.crt", server_side=True, ssl_version=ssl.PROTOCOL_TLSv1)
 ssock.settimeout(10)
-ssock.bind(('', 1888))
+ssock.bind(('', port))
 ssock.listen(5)
 
 client_args = sys.argv[1:]
@@ -47,7 +49,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = ssock.accept()
diff --git a/test/lib/08-ssl-fake-cacert.py b/test/lib/08-ssl-fake-cacert.py
index 1dbc0266..48967fd2 100755
--- a/test/lib/08-ssl-fake-cacert.py
+++ b/test/lib/08-ssl-fake-cacert.py
@@ -14,6 +14,8 @@ if cmd_subfolder not in sys.path:
 
 import mosq_test
 
+port = mosq_test.get_lib_port()
+
 if sys.version < '2.7':
     print("WARNING: SSL not supported on Python 2.6")
     exit(0)
@@ -24,7 +26,7 @@ ssock = ssl.wrap_socket(sock, ca_certs="../ssl/all-ca.crt",
         keyfile="../ssl/server.key", certfile="../ssl/server.crt",
         server_side=True, ssl_version=ssl.PROTOCOL_TLSv1, cert_reqs=ssl.CERT_REQUIRED)
 ssock.settimeout(10)
-ssock.bind(('', 1888))
+ssock.bind(('', port))
 ssock.listen(5)
 
 client_args = sys.argv[1:]
@@ -35,7 +37,7 @@ try:
 except KeyError:
     pp = ''
 env['PYTHONPATH'] = '../../lib/python:'+pp
-client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
 
 try:
     (conn, address) = ssock.accept()
diff --git a/test/lib/Makefile b/test/lib/Makefile
index e2107107..229eb641 100644
--- a/test/lib/Makefile
+++ b/test/lib/Makefile
@@ -7,7 +7,8 @@ LD_LIBRARY_PATH=../../lib
 
 all :
 
-ptest : c cpp
+ptest : test-compile
+	./ptest.py
 
 test : c cpp
 
diff --git a/test/lib/c/01-con-discon-success.c b/test/lib/c/01-con-discon-success.c
index 1fbdfd41..5f17e80f 100644
--- a/test/lib/c/01-con-discon-success.c
+++ b/test/lib/c/01-con-discon-success.c
@@ -24,13 +24,15 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-con-discon-success", true, NULL);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/01-keepalive-pingreq.c b/test/lib/c/01-keepalive-pingreq.c
index 99823bc3..4db7a70d 100644
--- a/test/lib/c/01-keepalive-pingreq.c
+++ b/test/lib/c/01-keepalive-pingreq.c
@@ -17,12 +17,14 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-keepalive-pingreq", true, NULL);
 	mosquitto_connect_callback_set(mosq, on_connect);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 4);
+	rc = mosquitto_connect(mosq, "localhost", port, 4);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/01-no-clean-session.c b/test/lib/c/01-no-clean-session.c
index 43f79519..d2b9a618 100644
--- a/test/lib/c/01-no-clean-session.c
+++ b/test/lib/c/01-no-clean-session.c
@@ -10,11 +10,13 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-no-clean-session", false, NULL);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/01-unpwd-set.c b/test/lib/c/01-unpwd-set.c
index bec71640..4d1c244b 100644
--- a/test/lib/c/01-unpwd-set.c
+++ b/test/lib/c/01-unpwd-set.c
@@ -10,12 +10,14 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-unpwd-set", true, NULL);
 	mosquitto_username_pw_set(mosq, "uname", ";'[08gn=#");
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/01-will-set.c b/test/lib/c/01-will-set.c
index 041eef79..098cce70 100644
--- a/test/lib/c/01-will-set.c
+++ b/test/lib/c/01-will-set.c
@@ -10,12 +10,14 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-will-set", true, NULL);
 	mosquitto_will_set(mosq, "topic/on/unexpected/disconnect", strlen("will message"), "will message", 1, true);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/01-will-unpwd-set.c b/test/lib/c/01-will-unpwd-set.c
index af812f0d..94a64728 100644
--- a/test/lib/c/01-will-unpwd-set.c
+++ b/test/lib/c/01-will-unpwd-set.c
@@ -10,13 +10,15 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-will-unpwd-set", true, NULL);
 	mosquitto_username_pw_set(mosq, "oibvvwqw", "#'^2hg9a&nm38*us");
 	mosquitto_will_set(mosq, "will-topic", strlen("will message"), "will message", 2, false);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/02-subscribe-qos0.c b/test/lib/c/02-subscribe-qos0.c
index 9763f6aa..cbaea3c5 100644
--- a/test/lib/c/02-subscribe-qos0.c
+++ b/test/lib/c/02-subscribe-qos0.c
@@ -29,6 +29,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("subscribe-qos0-test", true, NULL);
@@ -36,7 +38,7 @@ int main(int argc, char *argv[])
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_subscribe_callback_set(mosq, on_subscribe);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/02-subscribe-qos1.c b/test/lib/c/02-subscribe-qos1.c
index 1f4677a8..757b1051 100644
--- a/test/lib/c/02-subscribe-qos1.c
+++ b/test/lib/c/02-subscribe-qos1.c
@@ -29,6 +29,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("subscribe-qos1-test", true, NULL);
@@ -36,7 +38,7 @@ int main(int argc, char *argv[])
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_subscribe_callback_set(mosq, on_subscribe);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/02-subscribe-qos2.c b/test/lib/c/02-subscribe-qos2.c
index 7832e8b6..68660301 100644
--- a/test/lib/c/02-subscribe-qos2.c
+++ b/test/lib/c/02-subscribe-qos2.c
@@ -29,6 +29,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("subscribe-qos2-test", true, NULL);
@@ -36,7 +38,7 @@ int main(int argc, char *argv[])
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_subscribe_callback_set(mosq, on_subscribe);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/02-unsubscribe.c b/test/lib/c/02-unsubscribe.c
index 406401fe..c757f510 100644
--- a/test/lib/c/02-unsubscribe.c
+++ b/test/lib/c/02-unsubscribe.c
@@ -29,6 +29,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("unsubscribe-test", true, NULL);
@@ -36,7 +38,7 @@ int main(int argc, char *argv[])
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_unsubscribe_callback_set(mosq, on_unsubscribe);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/03-publish-b2c-qos1.c b/test/lib/c/03-publish-b2c-qos1.c
index 64a06ea0..f68ce555 100644
--- a/test/lib/c/03-publish-b2c-qos1.c
+++ b/test/lib/c/03-publish-b2c-qos1.c
@@ -46,6 +46,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos1-test", true, NULL);
@@ -53,7 +55,7 @@ int main(int argc, char *argv[])
 	mosquitto_message_callback_set(mosq, on_message);
 	mosquitto_message_retry_set(mosq, 3);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(1){
 		mosquitto_loop(mosq, 300, 1);
diff --git a/test/lib/c/03-publish-b2c-qos2.c b/test/lib/c/03-publish-b2c-qos2.c
index 9e1a0cc8..3c2f340d 100644
--- a/test/lib/c/03-publish-b2c-qos2.c
+++ b/test/lib/c/03-publish-b2c-qos2.c
@@ -48,6 +48,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, &run);
@@ -55,7 +57,7 @@ int main(int argc, char *argv[])
 	mosquitto_message_callback_set(mosq, on_message);
 	mosquitto_message_retry_set(mosq, 5);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
diff --git a/test/lib/c/03-publish-c2b-qos1-disconnect.c b/test/lib/c/03-publish-c2b-qos1-disconnect.c
index 51b76a60..53238fbf 100644
--- a/test/lib/c/03-publish-c2b-qos1-disconnect.c
+++ b/test/lib/c/03-publish-c2b-qos1-disconnect.c
@@ -38,6 +38,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos1-test", true, NULL);
@@ -46,7 +48,7 @@ int main(int argc, char *argv[])
 	mosquitto_publish_callback_set(mosq, on_publish);
 	mosquitto_message_retry_set(mosq, 3);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
diff --git a/test/lib/c/03-publish-c2b-qos2-disconnect.c b/test/lib/c/03-publish-c2b-qos2-disconnect.c
index c9575263..8de4f828 100644
--- a/test/lib/c/03-publish-c2b-qos2-disconnect.c
+++ b/test/lib/c/03-publish-c2b-qos2-disconnect.c
@@ -38,6 +38,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, NULL);
@@ -46,7 +48,7 @@ int main(int argc, char *argv[])
 	mosquitto_publish_callback_set(mosq, on_publish);
 	mosquitto_message_retry_set(mosq, 3);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
diff --git a/test/lib/c/03-publish-c2b-qos2.c b/test/lib/c/03-publish-c2b-qos2.c
index 2c14818f..ec58ba72 100644
--- a/test/lib/c/03-publish-c2b-qos2.c
+++ b/test/lib/c/03-publish-c2b-qos2.c
@@ -30,6 +30,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, NULL);
@@ -37,7 +39,7 @@ int main(int argc, char *argv[])
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_publish_callback_set(mosq, on_publish);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
diff --git a/test/lib/c/03-publish-qos0-no-payload.c b/test/lib/c/03-publish-qos0-no-payload.c
index 87577909..b63130fa 100644
--- a/test/lib/c/03-publish-qos0-no-payload.c
+++ b/test/lib/c/03-publish-qos0-no-payload.c
@@ -31,13 +31,15 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos0-test-np", true, NULL);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_publish_callback_set(mosq, on_publish);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/03-publish-qos0.c b/test/lib/c/03-publish-qos0.c
index 442ee098..5d4a2464 100644
--- a/test/lib/c/03-publish-qos0.c
+++ b/test/lib/c/03-publish-qos0.c
@@ -31,13 +31,15 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos0-test", true, NULL);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_publish_callback_set(mosq, on_publish);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		rc = mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/04-retain-qos0.c b/test/lib/c/04-retain-qos0.c
index c2a96784..aa1b54fa 100644
--- a/test/lib/c/04-retain-qos0.c
+++ b/test/lib/c/04-retain-qos0.c
@@ -20,12 +20,14 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("retain-qos0-test", true, NULL);
 	mosquitto_connect_callback_set(mosq, on_connect);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/08-ssl-connect-cert-auth-enc.c b/test/lib/c/08-ssl-connect-cert-auth-enc.c
index 12b26381..853782a9 100644
--- a/test/lib/c/08-ssl-connect-cert-auth-enc.c
+++ b/test/lib/c/08-ssl-connect-cert-auth-enc.c
@@ -34,6 +34,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("08-ssl-connect-crt-auth-enc", true, NULL);
@@ -42,7 +44,7 @@ int main(int argc, char *argv[])
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/08-ssl-connect-cert-auth.c b/test/lib/c/08-ssl-connect-cert-auth.c
index 3adc7729..1a23e833 100644
--- a/test/lib/c/08-ssl-connect-cert-auth.c
+++ b/test/lib/c/08-ssl-connect-cert-auth.c
@@ -25,6 +25,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("08-ssl-connect-crt-auth", true, NULL);
@@ -33,7 +35,7 @@ int main(int argc, char *argv[])
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/08-ssl-connect-no-auth.c b/test/lib/c/08-ssl-connect-no-auth.c
index 84fe8e73..02e5eab5 100644
--- a/test/lib/c/08-ssl-connect-no-auth.c
+++ b/test/lib/c/08-ssl-connect-no-auth.c
@@ -25,6 +25,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("08-ssl-connect-no-auth", true, NULL);
@@ -34,7 +36,7 @@ int main(int argc, char *argv[])
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
diff --git a/test/lib/c/08-ssl-fake-cacert.c b/test/lib/c/08-ssl-fake-cacert.c
index 8bf06999..23346724 100644
--- a/test/lib/c/08-ssl-fake-cacert.c
+++ b/test/lib/c/08-ssl-fake-cacert.c
@@ -16,6 +16,8 @@ int main(int argc, char *argv[])
 	int rc;
 	struct mosquitto *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("08-ssl-connect-crt-auth", true, NULL);
@@ -23,7 +25,7 @@ int main(int argc, char *argv[])
 	mosquitto_tls_set(mosq, "../ssl/test-fake-root-ca.crt", NULL, "../ssl/client.crt", "../ssl/client.key", NULL);
 	mosquitto_connect_callback_set(mosq, on_connect);
 
-	rc = mosquitto_connect(mosq, "localhost", 1888, 60);
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	rc = mosquitto_loop_forever(mosq, -1, 1);
 	if(rc == MOSQ_ERR_ERRNO && errno == EPROTO){
diff --git a/test/lib/cpp/01-con-discon-success.cpp b/test/lib/cpp/01-con-discon-success.cpp
index 1e1c1dbb..82cc8b4f 100644
--- a/test/lib/cpp/01-con-discon-success.cpp
+++ b/test/lib/cpp/01-con-discon-success.cpp
@@ -37,11 +37,13 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("01-con-discon-success");
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/01-keepalive-pingreq.cpp b/test/lib/cpp/01-keepalive-pingreq.cpp
index fda15921..bf3c81b8 100644
--- a/test/lib/cpp/01-keepalive-pingreq.cpp
+++ b/test/lib/cpp/01-keepalive-pingreq.cpp
@@ -25,11 +25,13 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("01-keepalive-pingreq");
 
-	mosq->connect("localhost", 1888, 4);
+	mosq->connect("localhost", port, 4);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/01-no-clean-session.cpp b/test/lib/cpp/01-no-clean-session.cpp
index 508f05da..0a6f4987 100644
--- a/test/lib/cpp/01-no-clean-session.cpp
+++ b/test/lib/cpp/01-no-clean-session.cpp
@@ -17,11 +17,13 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("01-no-clean-session", false);
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/01-unpwd-set.cpp b/test/lib/cpp/01-unpwd-set.cpp
index 39017a00..24e53f43 100644
--- a/test/lib/cpp/01-unpwd-set.cpp
+++ b/test/lib/cpp/01-unpwd-set.cpp
@@ -17,12 +17,14 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("01-unpwd-set");
 	mosq->username_pw_set("uname", ";'[08gn=#");
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/01-will-set.cpp b/test/lib/cpp/01-will-set.cpp
index 4b6f337c..1b9f7132 100644
--- a/test/lib/cpp/01-will-set.cpp
+++ b/test/lib/cpp/01-will-set.cpp
@@ -20,12 +20,14 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("01-will-set");
 	mosq->will_set("topic/on/unexpected/disconnect", strlen("will message"), "will message", 1, true);
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/01-will-unpwd-set.cpp b/test/lib/cpp/01-will-unpwd-set.cpp
index 42101624..f3ee1fe5 100644
--- a/test/lib/cpp/01-will-unpwd-set.cpp
+++ b/test/lib/cpp/01-will-unpwd-set.cpp
@@ -17,13 +17,15 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("01-will-unpwd-set");
 	mosq->username_pw_set("oibvvwqw", "#'^2hg9a&nm38*us");
 	mosq->will_set("will-topic", strlen("will message"), "will message", 2, false);
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/02-subscribe-qos0.cpp b/test/lib/cpp/02-subscribe-qos0.cpp
index 9ef54d19..5a1582bc 100644
--- a/test/lib/cpp/02-subscribe-qos0.cpp
+++ b/test/lib/cpp/02-subscribe-qos0.cpp
@@ -39,11 +39,13 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("subscribe-qos0-test");
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/02-subscribe-qos1.cpp b/test/lib/cpp/02-subscribe-qos1.cpp
index 7bbcde0b..3b53bf22 100644
--- a/test/lib/cpp/02-subscribe-qos1.cpp
+++ b/test/lib/cpp/02-subscribe-qos1.cpp
@@ -40,11 +40,13 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("subscribe-qos1-test");
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/02-subscribe-qos2.cpp b/test/lib/cpp/02-subscribe-qos2.cpp
index 362fad73..3b2d1116 100644
--- a/test/lib/cpp/02-subscribe-qos2.cpp
+++ b/test/lib/cpp/02-subscribe-qos2.cpp
@@ -40,11 +40,13 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("subscribe-qos2-test");
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/02-unsubscribe.cpp b/test/lib/cpp/02-unsubscribe.cpp
index 5d074769..80df9344 100644
--- a/test/lib/cpp/02-unsubscribe.cpp
+++ b/test/lib/cpp/02-unsubscribe.cpp
@@ -39,11 +39,13 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("unsubscribe-test");
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/03-publish-b2c-qos1.cpp b/test/lib/cpp/03-publish-b2c-qos1.cpp
index e3950bb9..d7e3cb24 100644
--- a/test/lib/cpp/03-publish-b2c-qos1.cpp
+++ b/test/lib/cpp/03-publish-b2c-qos1.cpp
@@ -58,12 +58,14 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("publish-qos1-test");
 	mosq->message_retry_set(3);
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(1){
 		mosq->loop();
diff --git a/test/lib/cpp/03-publish-b2c-qos2.cpp b/test/lib/cpp/03-publish-b2c-qos2.cpp
index b8a12226..a4feeed9 100644
--- a/test/lib/cpp/03-publish-b2c-qos2.cpp
+++ b/test/lib/cpp/03-publish-b2c-qos2.cpp
@@ -60,12 +60,14 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("publish-qos2-test");
 	mosq->message_retry_set(3);
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp b/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp
index dde6f266..c17eae12 100644
--- a/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp
+++ b/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp
@@ -50,12 +50,14 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("publish-qos1-test");
 	mosq->message_retry_set(3);
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp b/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp
index 16c7cc0b..96991f24 100644
--- a/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp
+++ b/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp
@@ -50,12 +50,14 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("publish-qos2-test");
 	mosq->message_retry_set(3);
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/03-publish-c2b-qos2.cpp b/test/lib/cpp/03-publish-c2b-qos2.cpp
index 25295762..9fe606e8 100644
--- a/test/lib/cpp/03-publish-c2b-qos2.cpp
+++ b/test/lib/cpp/03-publish-c2b-qos2.cpp
@@ -42,11 +42,13 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("publish-qos2-test");
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/03-publish-qos0-no-payload.cpp b/test/lib/cpp/03-publish-qos0-no-payload.cpp
index e13e2609..acd97e05 100644
--- a/test/lib/cpp/03-publish-qos0-no-payload.cpp
+++ b/test/lib/cpp/03-publish-qos0-no-payload.cpp
@@ -40,11 +40,13 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("publish-qos0-test-np");
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/03-publish-qos0.cpp b/test/lib/cpp/03-publish-qos0.cpp
index 58ece0a8..fba30baa 100644
--- a/test/lib/cpp/03-publish-qos0.cpp
+++ b/test/lib/cpp/03-publish-qos0.cpp
@@ -40,11 +40,13 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("publish-qos0-test");
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/04-retain-qos0.cpp b/test/lib/cpp/04-retain-qos0.cpp
index beca2bc4..6b7b61ee 100644
--- a/test/lib/cpp/04-retain-qos0.cpp
+++ b/test/lib/cpp/04-retain-qos0.cpp
@@ -29,11 +29,13 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("retain-qos0-test");
 
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp b/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp
index ed2edbad..55d8bc73 100644
--- a/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp
+++ b/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp
@@ -43,6 +43,8 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("08-ssl-connect-crt-auth-enc");
@@ -50,7 +52,7 @@ int main(int argc, char *argv[])
 	mosq->tls_opts_set(1, "tlsv1", NULL);
 	//mosq->tls_set("../ssl/test-ca.crt", NULL, "../ssl/client.crt", "../ssl/client.key");
 	mosq->tls_set("../ssl/all-ca.crt", NULL, "../ssl/client-encrypted.crt", "../ssl/client-encrypted.key", password_callback);
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/08-ssl-connect-cert-auth.cpp b/test/lib/cpp/08-ssl-connect-cert-auth.cpp
index d47f4e56..8e041510 100644
--- a/test/lib/cpp/08-ssl-connect-cert-auth.cpp
+++ b/test/lib/cpp/08-ssl-connect-cert-auth.cpp
@@ -34,6 +34,8 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("08-ssl-connect-crt-auth");
@@ -41,7 +43,7 @@ int main(int argc, char *argv[])
 	mosq->tls_opts_set(1, "tlsv1", NULL);
 	//mosq->tls_set("../ssl/test-ca.crt", NULL, "../ssl/client.crt", "../ssl/client.key");
 	mosq->tls_set("../ssl/all-ca.crt", NULL, "../ssl/client.crt", "../ssl/client.key");
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/08-ssl-connect-no-auth.cpp b/test/lib/cpp/08-ssl-connect-no-auth.cpp
index 79b86f8a..cfa0402f 100644
--- a/test/lib/cpp/08-ssl-connect-no-auth.cpp
+++ b/test/lib/cpp/08-ssl-connect-no-auth.cpp
@@ -34,6 +34,8 @@ int main(int argc, char *argv[])
 {
 	struct mosquittopp_test *mosq;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("08-ssl-connect-no-auth");
@@ -41,7 +43,7 @@ int main(int argc, char *argv[])
 	mosq->tls_opts_set(1, "tlsv1", NULL);
 	//mosq->tls_set("../ssl/test-root-ca.crt");
 	mosq->tls_set("../ssl/all-ca.crt");
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	while(run == -1){
 		mosq->loop();
diff --git a/test/lib/cpp/08-ssl-fake-cacert.cpp b/test/lib/cpp/08-ssl-fake-cacert.cpp
index 615ea7cd..d4aa0dda 100644
--- a/test/lib/cpp/08-ssl-fake-cacert.cpp
+++ b/test/lib/cpp/08-ssl-fake-cacert.cpp
@@ -25,13 +25,15 @@ int main(int argc, char *argv[])
 	struct mosquittopp_test *mosq;
 	int rc;
 
+	int port = atoi(argv[1]);
+
 	mosqpp::lib_init();
 
 	mosq = new mosquittopp_test("08-ssl-fake-cacert");
 
 	mosq->tls_opts_set(1, "tlsv1", NULL);
 	mosq->tls_set("../ssl/test-fake-root-ca.crt", NULL, "../ssl/client.crt", "../ssl/client.key");
-	mosq->connect("localhost", 1888, 60);
+	mosq->connect("localhost", port, 60);
 
 	rc = mosq->loop_forever();
 	if(rc == MOSQ_ERR_ERRNO && errno == EPROTO){
diff --git a/test/lib/ptest.py b/test/lib/ptest.py
new file mode 100755
index 00000000..42821379
--- /dev/null
+++ b/test/lib/ptest.py
@@ -0,0 +1,114 @@
+#!/usr/bin/env python3
+
+import subprocess
+import time
+import sys
+
+max_running = 10
+tests = [
+    ('./01-con-discon-success.py', 'c/01-con-discon-success.test'),
+    ('./01-keepalive-pingreq.py', 'c/01-keepalive-pingreq.test'),
+    ('./01-no-clean-session.py', 'c/01-no-clean-session.test'),
+    ('./01-unpwd-set.py', 'c/01-unpwd-set.test'),
+    ('./01-will-set.py', 'c/01-will-set.test'),
+    ('./01-will-unpwd-set.py', 'c/01-will-unpwd-set.test'),
+    ('./02-subscribe-qos0.py', 'c/02-subscribe-qos0.test'),
+    ('./02-subscribe-qos1.py', 'c/02-subscribe-qos1.test'),
+    ('./02-subscribe-qos2.py', 'c/02-subscribe-qos2.test'),
+    ('./02-unsubscribe.py', 'c/02-unsubscribe.test'),
+    ('./03-publish-b2c-qos1.py', 'c/03-publish-b2c-qos1.test'),
+    ('./03-publish-b2c-qos2.py', 'c/03-publish-b2c-qos2.test'),
+    ('./03-publish-c2b-qos1-disconnect.py', 'c/03-publish-c2b-qos1-disconnect.test'),
+    ('./03-publish-c2b-qos2-disconnect.py', 'c/03-publish-c2b-qos2-disconnect.test'),
+    ('./03-publish-c2b-qos2.py', 'c/03-publish-c2b-qos2.test'),
+    ('./03-publish-qos0-no-payload.py', 'c/03-publish-qos0-no-payload.test'),
+    ('./03-publish-qos0.py', 'c/03-publish-qos0.test'),
+    ('./04-retain-qos0.py', 'c/04-retain-qos0.test'),
+    ('./08-ssl-bad-cacert.py', 'c/08-ssl-bad-cacert.test'),
+    ('./08-ssl-connect-cert-auth-enc.py', 'c/08-ssl-connect-cert-auth-enc.test'),
+    ('./08-ssl-connect-cert-auth.py', 'c/08-ssl-connect-cert-auth.test'),
+    ('./08-ssl-connect-no-auth.py', 'c/08-ssl-connect-no-auth.test'),
+    ('./09-util-topic-matching.py', 'c/09-util-topic-matching.test'),
+    ('./09-util-topic-tokenise.py', 'c/09-util-topic-tokenise.test'),
+    ('./09-util-utf8-validate.py', 'c/09-util-utf8-validate.test'),
+
+    ('./01-con-discon-success.py', 'cpp/01-con-discon-success.test'),
+    ('./01-keepalive-pingreq.py', 'cpp/01-keepalive-pingreq.test'),
+    ('./01-no-clean-session.py', 'cpp/01-no-clean-session.test'),
+    ('./01-unpwd-set.py', 'cpp/01-unpwd-set.test'),
+    ('./01-will-set.py', 'cpp/01-will-set.test'),
+    ('./01-will-unpwd-set.py', 'cpp/01-will-unpwd-set.test'),
+    ('./02-subscribe-qos0.py', 'cpp/02-subscribe-qos0.test'),
+    ('./02-subscribe-qos1.py', 'cpp/02-subscribe-qos1.test'),
+    ('./02-subscribe-qos2.py', 'cpp/02-subscribe-qos2.test'),
+    ('./02-unsubscribe.py', 'cpp/02-unsubscribe.test'),
+    ('./03-publish-b2c-qos1.py', 'cpp/03-publish-b2c-qos1.test'),
+    ('./03-publish-b2c-qos2.py', 'cpp/03-publish-b2c-qos2.test'),
+    ('./03-publish-c2b-qos1-disconnect.py', 'cpp/03-publish-c2b-qos1-disconnect.test'),
+    ('./03-publish-c2b-qos2-disconnect.py', 'cpp/03-publish-c2b-qos2-disconnect.test'),
+    ('./03-publish-c2b-qos2.py', 'cpp/03-publish-c2b-qos2.test'),
+    ('./03-publish-qos0-no-payload.py', 'cpp/03-publish-qos0-no-payload.test'),
+    ('./03-publish-qos0.py', 'cpp/03-publish-qos0.test'),
+    ('./04-retain-qos0.py', 'cpp/04-retain-qos0.test'),
+    ('./08-ssl-bad-cacert.py', 'cpp/08-ssl-bad-cacert.test'),
+    ('./08-ssl-connect-cert-auth-enc.py', 'cpp/08-ssl-connect-cert-auth-enc.test'),
+    ('./08-ssl-connect-cert-auth.py', 'cpp/08-ssl-connect-cert-auth.test'),
+    ('./08-ssl-connect-no-auth.py', 'cpp/08-ssl-connect-no-auth.test'),
+    ('./09-util-topic-matching.py', 'cpp/09-util-topic-matching.test'),
+    ('./09-util-topic-tokenise.py', 'cpp/09-util-topic-tokenise.test'),
+    ('./09-util-utf8-validate.py', 'cpp/09-util-utf8-validate.test'),
+    ]
+
+minport = 1888
+ports = list(range(minport, minport+max_running+1))
+
+def next_test(tests, ports):
+    if len(tests) == 0 or len(ports) == 0:
+        return
+
+    test = tests.pop()
+    port = ports.pop()
+    p = subprocess.Popen([test[0], test[1], str(port)])
+    p.mosq_port = port
+    return p
+
+def run_tests(tests, ports):
+    passed = 0
+    failed = 0
+
+    failed_tests = []
+
+    running_tests = []
+    while len(tests) > 0 or len(running_tests) > 0:
+        if len(running_tests) <= max_running:
+            t = next_test(tests, ports)
+            if t is None:
+                time.sleep(0.1)
+            else:
+                running_tests.append(t)
+
+        for t in running_tests:
+            t.poll()
+            if t.returncode is not None:
+                running_tests.remove(t)
+                if isinstance(t.mosq_port, tuple):
+                    for portret in t.mosq_port:
+                        ports.append(portret)
+                else:
+                    ports.append(t.mosq_port)
+                t.terminate()
+                t.wait()
+                #(stdo, stde) = t.communicate()
+                if t.returncode == 1:
+                    print("\033[31m %s %s\033[0m" % (t.args[0], t.args[1]))
+                    failed = failed + 1
+                else:
+                    passed = passed + 1
+                    print("\033[32m %s %s\033[0m" % (t.args[0], t.args[1]))
+
+    print("Passed: %d\nFailed: %d\nTotal: %d" % (passed, failed, passed+failed))
+    if failed > 0:
+        sys.exit(1)
+
+
+run_tests(tests, ports)
diff --git a/test/mosq_test.py b/test/mosq_test.py
index 69900163..dc1ba532 100644
--- a/test/mosq_test.py
+++ b/test/mosq_test.py
@@ -45,12 +45,13 @@ def start_broker(filename, cmd=None, port=0, use_conf=False):
             return broker
     raise IOError
 
-def start_client(filename, cmd, env):
+def start_client(filename, cmd, env, port=1888):
     if cmd is None:
         raise ValueError
     if os.environ.get('MOSQ_USE_VALGRIND') is not None:
         cmd = ['valgrind', '-q', '--log-file='+filename+'.vglog'] + cmd
 
+    cmd = cmd + [str(port)]
     return subprocess.Popen(cmd, env=env)
 
 def expect_packet(sock, name, expected):
@@ -432,3 +433,10 @@ def get_port(count=1):
             return p
         else:
             return tuple(range(1888, 1888+count))
+
+
+def get_lib_port():
+    if len(sys.argv) == 3:
+        return int(sys.argv[2])
+    else:
+        return 1888