diff --git a/test/lib/02-unsubscribe-v5.py b/test/lib/02-unsubscribe-v5.py
new file mode 100755
index 00000000..9b55d276
--- /dev/null
+++ b/test/lib/02-unsubscribe-v5.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python
+
+# Test whether a v5 client sends a correct UNSUBSCRIBE packet, and handles the UNSUBACK.
+
+from mosq_test_helper import *
+
+port = mosq_test.get_lib_port()
+
+keepalive = 60
+connect_packet = mosq_test.gen_connect("unsubscribe-test", keepalive=keepalive, proto_ver=5)
+connack_packet = mosq_test.gen_connack(rc=0, proto_ver=5)
+
+disconnect_packet = mosq_test.gen_disconnect(proto_ver=5)
+
+mid = 1
+unsubscribe_packet = mosq_test.gen_unsubscribe(mid, "unsubscribe/test", proto_ver=5)
+unsuback_packet = mosq_test.gen_unsuback(mid, proto_ver=5)
+
+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(10)
+
+    if mosq_test.expect_packet(conn, "connect", connect_packet):
+        conn.send(connack_packet)
+
+        if mosq_test.expect_packet(conn, "unsubscribe", unsubscribe_packet):
+            conn.send(unsuback_packet)
+
+            if mosq_test.expect_packet(conn, "disconnect", disconnect_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 d88f58a1..00d963a7 100644
--- a/test/lib/Makefile
+++ b/test/lib/Makefile
@@ -32,6 +32,7 @@ c : test-compile
 	./02-subscribe-qos1.py $@/02-subscribe-qos1.test
 	./02-subscribe-qos2.py $@/02-subscribe-qos2.test
 	./02-unsubscribe.py $@/02-unsubscribe.test
+	./02-unsubscribe-v5.py $@/02-unsubscribe-v5.test
 	./03-publish-qos0.py $@/03-publish-qos0.test
 	./03-publish-qos0-no-payload.py $@/03-publish-qos0-no-payload.test
 	./03-publish-c2b-qos1-disconnect.py $@/03-publish-c2b-qos1-disconnect.test
diff --git a/test/lib/c/02-unsubscribe-v5.c b/test/lib/c/02-unsubscribe-v5.c
new file mode 100644
index 00000000..50e7377b
--- /dev/null
+++ b/test/lib/c/02-unsubscribe-v5.c
@@ -0,0 +1,50 @@
+#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);
+	}else{
+		mosquitto_unsubscribe(mosq, NULL, "unsubscribe/test");
+	}
+}
+
+void on_disconnect(struct mosquitto *mosq, void *obj, int rc)
+{
+	run = rc;
+}
+
+void on_unsubscribe(struct mosquitto *mosq, void *obj, int mid)
+{
+	mosquitto_disconnect(mosq);
+}
+
+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);
+	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
+	mosquitto_connect_callback_set(mosq, on_connect);
+	mosquitto_disconnect_callback_set(mosq, on_disconnect);
+	mosquitto_unsubscribe_callback_set(mosq, on_unsubscribe);
+
+	rc = mosquitto_connect(mosq, "localhost", port, 60);
+
+	while(run == -1){
+		mosquitto_loop(mosq, -1, 1);
+	}
+
+	mosquitto_lib_cleanup();
+	return run;
+}
diff --git a/test/lib/c/Makefile b/test/lib/c/Makefile
index f02beb90..79552efc 100644
--- a/test/lib/c/Makefile
+++ b/test/lib/c/Makefile
@@ -15,6 +15,7 @@ SRC = \
 	02-subscribe-qos1.c \
 	02-subscribe-qos2.c \
 	02-unsubscribe.c \
+	02-unsubscribe-v5.c \
 	03-publish-qos0.c \
 	03-publish-qos0-no-payload.c \
 	03-publish-c2b-qos1-disconnect.c \
diff --git a/test/lib/test.py b/test/lib/test.py
index 76d7dc0d..29c309bc 100755
--- a/test/lib/test.py
+++ b/test/lib/test.py
@@ -15,6 +15,7 @@ tests = [
     (1, ['./02-subscribe-qos1.py', 'c/02-subscribe-qos1.test']),
     (1, ['./02-subscribe-qos2.py', 'c/02-subscribe-qos2.test']),
     (1, ['./02-unsubscribe.py', 'c/02-unsubscribe.test']),
+    (1, ['./02-unsubscribe-v5.py', 'c/02-unsubscribe-v5.test']),
     (1, ['./03-publish-b2c-qos1.py', 'c/03-publish-b2c-qos1.test']),
     (1, ['./03-publish-b2c-qos2.py', 'c/03-publish-b2c-qos2.test']),
     (1, ['./03-publish-c2b-qos1-len.py', 'c/03-publish-c2b-qos1-len.test']),