diff --git a/test/lib/01-server-keepalive-pingreq.py b/test/lib/01-server-keepalive-pingreq.py
new file mode 100755
index 00000000..2d6fa9c2
--- /dev/null
+++ b/test/lib/01-server-keepalive-pingreq.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+
+# Test whether a client sends a pingreq after the keepalive time
+# Client sets a keepalive of 60 seconds, but receives a server keepalive to set
+# it back to 4 seconds.
+
+from mosq_test_helper import *
+
+port = mosq_test.get_lib_port()
+
+rc = 1
+keepalive = 60
+server_keepalive = 4
+connect_packet = mosq_test.gen_connect("01-server-keepalive-pingreq", keepalive=keepalive, proto_ver=5)
+
+props = mqtt5_props.gen_uint16_prop(mqtt5_props.PROP_SERVER_KEEP_ALIVE, server_keepalive)
+connack_packet = mosq_test.gen_connack(rc=0, proto_ver=5, properties=props)
+
+pingreq_packet = mosq_test.gen_pingreq()
+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(('', port))
+sock.listen(5)
+
+client_args = sys.argv[1:]
+env = dict(os.environ)
+env['LD_LIBRARY_PATH'] = '../../lib:../../lib/cpp'
+try:
+    pp = env['PYTHONPATH']
+except KeyError:
+    pp = ''
+env['PYTHONPATH'] = '../../lib/python:'+pp
+client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
+
+try:
+    (conn, address) = sock.accept()
+    conn.settimeout(server_keepalive+10)
+
+    if mosq_test.expect_packet(conn, "connect", connect_packet):
+        conn.send(connack_packet)
+
+        if mosq_test.expect_packet(conn, "pingreq", pingreq_packet):
+            time.sleep(1.0)
+            conn.send(pingresp_packet)
+
+            if mosq_test.expect_packet(conn, "pingreq", pingreq_packet):
+                rc = 0
+
+    conn.close()
+finally:
+    client.terminate()
+    client.wait()
+    sock.close()
+
+exit(rc)
+
diff --git a/test/lib/Makefile b/test/lib/Makefile
index cb71a4e7..49f3088b 100644
--- a/test/lib/Makefile
+++ b/test/lib/Makefile
@@ -27,6 +27,7 @@ c : test-compile
 	./01-will-unpwd-set.py $@/01-will-unpwd-set.test
 	./01-no-clean-session.py $@/01-no-clean-session.test
 	./01-keepalive-pingreq.py $@/01-keepalive-pingreq.test
+	./01-server-keepalive-pingreq.py $@/01-server-keepalive-pingreq.test
 	./02-subscribe-qos0.py $@/02-subscribe-qos0.test
 	./02-subscribe-qos1.py $@/02-subscribe-qos1.test
 	./02-subscribe-qos2.py $@/02-subscribe-qos2.test
diff --git a/test/lib/c/01-server-keepalive-pingreq.c b/test/lib/c/01-server-keepalive-pingreq.c
new file mode 100644
index 00000000..99da6f69
--- /dev/null
+++ b/test/lib/c/01-server-keepalive-pingreq.c
@@ -0,0 +1,37 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <mosquitto.h>
+
+static int run = -1;
+
+void on_connect(struct mosquitto *mosq, void *obj, int rc)
+{
+	if(rc){
+		exit(1);
+	}
+}
+
+int main(int argc, char *argv[])
+{
+	int rc;
+	struct mosquitto *mosq;
+
+	int port = atoi(argv[1]);
+
+	mosquitto_lib_init();
+
+	mosq = mosquitto_new("01-server-keepalive-pingreq", true, NULL);
+	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
+	mosquitto_connect_callback_set(mosq, on_connect);
+
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
+
+	while(run == -1){
+		mosquitto_loop(mosq, -1, 1);
+	}
+
+	mosquitto_destroy(mosq);
+	mosquitto_lib_cleanup();
+	return run;
+}
diff --git a/test/lib/c/Makefile b/test/lib/c/Makefile
index 2df4221c..f02beb90 100644
--- a/test/lib/c/Makefile
+++ b/test/lib/c/Makefile
@@ -10,6 +10,7 @@ SRC = \
 	01-will-unpwd-set.c \
 	01-no-clean-session.c \
 	01-keepalive-pingreq.c \
+	01-server-keepalive-pingreq.c \
 	02-subscribe-qos0.c \
 	02-subscribe-qos1.c \
 	02-subscribe-qos2.c \
diff --git a/test/lib/ptest.py b/test/lib/ptest.py
index b94e6b40..c12142a1 100755
--- a/test/lib/ptest.py
+++ b/test/lib/ptest.py
@@ -8,6 +8,7 @@ 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-server-keepalive-pingreq.py', 'c/01-server-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'),