diff --git a/test/broker/12-prop-maximum-packet-size-connect.py b/test/broker/12-prop-maximum-packet-size-connect.py
index e81c64f2..e264dbab 100755
--- a/test/broker/12-prop-maximum-packet-size-connect.py
+++ b/test/broker/12-prop-maximum-packet-size-connect.py
@@ -8,7 +8,7 @@ from mosq_test_helper import *
 
 rc = 1
 
-keepalive = 10
+keepalive = 5
 props = mqtt5_props.gen_uint32_prop(mqtt5_props.PROP_MAXIMUM_PACKET_SIZE, 2)
 connect_packet = mosq_test.gen_connect("test", proto_ver=5, keepalive=keepalive, properties=props)
 
diff --git a/test/mosq_test.py b/test/mosq_test.py
index 91bba79d..c99d82df 100644
--- a/test/mosq_test.py
+++ b/test/mosq_test.py
@@ -163,7 +163,7 @@ def do_receive_send(sock, receive_packet, send_packet, error_string="receive sen
         raise ValueError
 
 
-def do_client_connect(connect_packet, connack_packet, hostname="localhost", port=1888, timeout=60, connack_error="connack"):
+def do_client_connect(connect_packet, connack_packet, hostname="localhost", port=1888, timeout=10, connack_error="connack"):
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     sock.settimeout(timeout)
     sock.connect((hostname, port))