diff --git a/test/lib/c/02-subscribe-qos2.c b/test/lib/c/02-subscribe-qos2.c
index 68660301..ceb416c9 100644
--- a/test/lib/c/02-subscribe-qos2.c
+++ b/test/lib/c/02-subscribe-qos2.c
@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, -1, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/02-unsubscribe.c b/test/lib/c/02-unsubscribe.c
index c757f510..6b28f217 100644
--- a/test/lib/c/02-unsubscribe.c
+++ b/test/lib/c/02-unsubscribe.c
@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, -1, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-publish-b2c-qos2-len.c b/test/lib/c/03-publish-b2c-qos2-len.c
index 3975d914..b5a7f49c 100644
--- a/test/lib/c/03-publish-b2c-qos2-len.c
+++ b/test/lib/c/03-publish-b2c-qos2-len.c
@@ -69,6 +69,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 100, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-publish-b2c-qos2-unexpected-pubrel.c b/test/lib/c/03-publish-b2c-qos2-unexpected-pubrel.c
index 091a6045..f51b814a 100644
--- a/test/lib/c/03-publish-b2c-qos2-unexpected-pubrel.c
+++ b/test/lib/c/03-publish-b2c-qos2-unexpected-pubrel.c
@@ -67,6 +67,7 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-publish-b2c-qos2.c b/test/lib/c/03-publish-b2c-qos2.c
index 3c2f340d..2345b6b5 100644
--- a/test/lib/c/03-publish-b2c-qos2.c
+++ b/test/lib/c/03-publish-b2c-qos2.c
@@ -63,6 +63,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 300, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-publish-c2b-qos1-len.c b/test/lib/c/03-publish-c2b-qos1-len.c
index 66fe76e6..fb3ae056 100644
--- a/test/lib/c/03-publish-c2b-qos1-len.c
+++ b/test/lib/c/03-publish-c2b-qos1-len.c
@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 300, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-publish-c2b-qos1-receive-maximum.c b/test/lib/c/03-publish-c2b-qos1-receive-maximum.c
index 5ef072a7..bfbbd529 100644
--- a/test/lib/c/03-publish-c2b-qos1-receive-maximum.c
+++ b/test/lib/c/03-publish-c2b-qos1-receive-maximum.c
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 300, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-publish-c2b-qos2-len.c b/test/lib/c/03-publish-c2b-qos2-len.c
index ab59adb7..1b2eb2e5 100644
--- a/test/lib/c/03-publish-c2b-qos2-len.c
+++ b/test/lib/c/03-publish-c2b-qos2-len.c
@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 300, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-publish-c2b-qos2-maximum-qos-0.c b/test/lib/c/03-publish-c2b-qos2-maximum-qos-0.c
index cfe7ab1d..49049ac6 100644
--- a/test/lib/c/03-publish-c2b-qos2-maximum-qos-0.c
+++ b/test/lib/c/03-publish-c2b-qos2-maximum-qos-0.c
@@ -53,6 +53,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 50, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-publish-c2b-qos2-maximum-qos-1.c b/test/lib/c/03-publish-c2b-qos2-maximum-qos-1.c
index b4c0981e..0f7c4eb6 100644
--- a/test/lib/c/03-publish-c2b-qos2-maximum-qos-1.c
+++ b/test/lib/c/03-publish-c2b-qos2-maximum-qos-1.c
@@ -54,6 +54,7 @@ int main(int argc, char *argv[])
 	}
 	mosquitto_loop(mosq, 50, 1);
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-publish-c2b-qos2-pubrec-error.c b/test/lib/c/03-publish-c2b-qos2-pubrec-error.c
index f7a64b17..170ee842 100644
--- a/test/lib/c/03-publish-c2b-qos2-pubrec-error.c
+++ b/test/lib/c/03-publish-c2b-qos2-pubrec-error.c
@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 100, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-publish-c2b-qos2-receive-maximum-1.c b/test/lib/c/03-publish-c2b-qos2-receive-maximum-1.c
index ab507986..1d49b271 100644
--- a/test/lib/c/03-publish-c2b-qos2-receive-maximum-1.c
+++ b/test/lib/c/03-publish-c2b-qos2-receive-maximum-1.c
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 300, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-publish-c2b-qos2-receive-maximum-2.c b/test/lib/c/03-publish-c2b-qos2-receive-maximum-2.c
index ab507986..1d49b271 100644
--- a/test/lib/c/03-publish-c2b-qos2-receive-maximum-2.c
+++ b/test/lib/c/03-publish-c2b-qos2-receive-maximum-2.c
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 300, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-publish-qos0.c b/test/lib/c/03-publish-qos0.c
index 5d4a2464..1562b3c3 100644
--- a/test/lib/c/03-publish-qos0.c
+++ b/test/lib/c/03-publish-qos0.c
@@ -45,6 +45,7 @@ int main(int argc, char *argv[])
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/03-request-response-2.c b/test/lib/c/03-request-response-2.c
index 3419f395..d548ebaf 100644
--- a/test/lib/c/03-request-response-2.c
+++ b/test/lib/c/03-request-response-2.c
@@ -61,6 +61,7 @@ int main(int argc, char *argv[])
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/08-ssl-bad-cacert.c b/test/lib/c/08-ssl-bad-cacert.c
index d32a8dd0..b7291221 100644
--- a/test/lib/c/08-ssl-bad-cacert.c
+++ b/test/lib/c/08-ssl-bad-cacert.c
@@ -15,6 +15,7 @@ int main(int argc, char *argv[])
 	if(mosquitto_tls_set(mosq, "this/file/doesnt/exist", NULL, NULL, NULL, NULL) == MOSQ_ERR_INVAL){
 		rc = 0;
 	}
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return rc;
 }
diff --git a/test/lib/c/09-util-topic-tokenise.c b/test/lib/c/09-util-topic-tokenise.c
index 24baf07f..39e335d3 100644
--- a/test/lib/c/09-util-topic-tokenise.c
+++ b/test/lib/c/09-util-topic-tokenise.c
@@ -30,6 +30,7 @@ int main(int argc, char *argv[])
 		print_error("topic", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("a/deep/topic/hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -43,6 +44,7 @@ int main(int argc, char *argv[])
 		print_error("a/deep/topic/hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("/a/deep/topic/hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -57,6 +59,7 @@ int main(int argc, char *argv[])
 		print_error("/a/deep/topic/hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("a/b/c", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -69,6 +72,7 @@ int main(int argc, char *argv[])
 		print_error("a/b/c", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("/a/b/c", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -82,6 +86,7 @@ int main(int argc, char *argv[])
 		print_error("/a/b/c", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("a///hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -95,6 +100,7 @@ int main(int argc, char *argv[])
 		print_error("a///hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("/a///hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -109,6 +115,7 @@ int main(int argc, char *argv[])
 		print_error("/a///hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("/a///hierarchy/", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -124,6 +131,7 @@ int main(int argc, char *argv[])
 		print_error("/a///hierarchy/", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	return 0;
 }
diff --git a/test/lib/c/11-prop-send-content-type.c b/test/lib/c/11-prop-send-content-type.c
index d60c8b5a..3222d9d5 100644
--- a/test/lib/c/11-prop-send-content-type.c
+++ b/test/lib/c/11-prop-send-content-type.c
@@ -18,6 +18,7 @@ void on_connect(struct mosquitto *mosq, void *obj, int rc)
 	}else{
 		rc2 = mosquitto_property_add_string(&proplist, MQTT_PROP_CONTENT_TYPE, "application/json");
 		mosquitto_publish_v5(mosq, &sent_mid, "prop/qos0", strlen("message"), "message", 0, false, proplist);
+		mosquitto_property_free_all(&proplist);
 	}
 }
 
@@ -53,6 +54,7 @@ int main(int argc, char *argv[])
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/11-prop-send-payload-format.c b/test/lib/c/11-prop-send-payload-format.c
index 516d86d4..3630f4a6 100644
--- a/test/lib/c/11-prop-send-payload-format.c
+++ b/test/lib/c/11-prop-send-payload-format.c
@@ -18,6 +18,7 @@ void on_connect(struct mosquitto *mosq, void *obj, int rc)
 	}else{
 		rc2 = mosquitto_property_add_byte(&proplist, MQTT_PROP_PAYLOAD_FORMAT_INDICATOR, 1);
 		mosquitto_publish_v5(mosq, &sent_mid, "prop/qos0", strlen("message"), "message", 0, false, proplist);
+		mosquitto_property_free_all(&proplist);
 	}
 }
 
diff --git a/test/lib/cpp/01-con-discon-success.cpp b/test/lib/cpp/01-con-discon-success.cpp
index 82cc8b4f..45dedb78 100644
--- a/test/lib/cpp/01-con-discon-success.cpp
+++ b/test/lib/cpp/01-con-discon-success.cpp
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/01-keepalive-pingreq.cpp b/test/lib/cpp/01-keepalive-pingreq.cpp
index 677066b2..97657c42 100644
--- a/test/lib/cpp/01-keepalive-pingreq.cpp
+++ b/test/lib/cpp/01-keepalive-pingreq.cpp
@@ -37,6 +37,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/01-no-clean-session.cpp b/test/lib/cpp/01-no-clean-session.cpp
index 0a6f4987..ce58b556 100644
--- a/test/lib/cpp/01-no-clean-session.cpp
+++ b/test/lib/cpp/01-no-clean-session.cpp
@@ -29,6 +29,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/01-unpwd-set.cpp b/test/lib/cpp/01-unpwd-set.cpp
index 24e53f43..df6046a2 100644
--- a/test/lib/cpp/01-unpwd-set.cpp
+++ b/test/lib/cpp/01-unpwd-set.cpp
@@ -30,6 +30,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/01-will-set.cpp b/test/lib/cpp/01-will-set.cpp
index 1b9f7132..b1af2bd3 100644
--- a/test/lib/cpp/01-will-set.cpp
+++ b/test/lib/cpp/01-will-set.cpp
@@ -33,6 +33,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/01-will-unpwd-set.cpp b/test/lib/cpp/01-will-unpwd-set.cpp
index f3ee1fe5..81b22c17 100644
--- a/test/lib/cpp/01-will-unpwd-set.cpp
+++ b/test/lib/cpp/01-will-unpwd-set.cpp
@@ -31,6 +31,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/02-subscribe-qos0.cpp b/test/lib/cpp/02-subscribe-qos0.cpp
index 5a1582bc..c61b437d 100644
--- a/test/lib/cpp/02-subscribe-qos0.cpp
+++ b/test/lib/cpp/02-subscribe-qos0.cpp
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/02-subscribe-qos1.cpp b/test/lib/cpp/02-subscribe-qos1.cpp
index 3b53bf22..67dc84f5 100644
--- a/test/lib/cpp/02-subscribe-qos1.cpp
+++ b/test/lib/cpp/02-subscribe-qos1.cpp
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/02-subscribe-qos2.cpp b/test/lib/cpp/02-subscribe-qos2.cpp
index 3b2d1116..609bd380 100644
--- a/test/lib/cpp/02-subscribe-qos2.cpp
+++ b/test/lib/cpp/02-subscribe-qos2.cpp
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/03-publish-b2c-qos1.cpp b/test/lib/cpp/03-publish-b2c-qos1.cpp
index d7e3cb24..3930a81b 100644
--- a/test/lib/cpp/03-publish-b2c-qos1.cpp
+++ b/test/lib/cpp/03-publish-b2c-qos1.cpp
@@ -71,6 +71,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return 1;
diff --git a/test/lib/cpp/03-publish-b2c-qos2.cpp b/test/lib/cpp/03-publish-b2c-qos2.cpp
index a4feeed9..9ac221cf 100644
--- a/test/lib/cpp/03-publish-b2c-qos2.cpp
+++ b/test/lib/cpp/03-publish-b2c-qos2.cpp
@@ -73,6 +73,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp b/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp
index c17eae12..7f70d5c5 100644
--- a/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp
+++ b/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp
@@ -63,6 +63,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp b/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp
index 96991f24..2ec53b51 100644
--- a/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp
+++ b/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp
@@ -63,6 +63,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/03-publish-c2b-qos2.cpp b/test/lib/cpp/03-publish-c2b-qos2.cpp
index 9fe606e8..52da8d53 100644
--- a/test/lib/cpp/03-publish-c2b-qos2.cpp
+++ b/test/lib/cpp/03-publish-c2b-qos2.cpp
@@ -54,6 +54,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/03-publish-qos0-no-payload.cpp b/test/lib/cpp/03-publish-qos0-no-payload.cpp
index acd97e05..ab4bb4c6 100644
--- a/test/lib/cpp/03-publish-qos0-no-payload.cpp
+++ b/test/lib/cpp/03-publish-qos0-no-payload.cpp
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/03-publish-qos0.cpp b/test/lib/cpp/03-publish-qos0.cpp
index fba30baa..82503c4a 100644
--- a/test/lib/cpp/03-publish-qos0.cpp
+++ b/test/lib/cpp/03-publish-qos0.cpp
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/04-retain-qos0.cpp b/test/lib/cpp/04-retain-qos0.cpp
index 6b7b61ee..8e6a87ef 100644
--- a/test/lib/cpp/04-retain-qos0.cpp
+++ b/test/lib/cpp/04-retain-qos0.cpp
@@ -41,6 +41,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/08-ssl-bad-cacert.cpp b/test/lib/cpp/08-ssl-bad-cacert.cpp
index b54d4fc5..d6367d7c 100644
--- a/test/lib/cpp/08-ssl-bad-cacert.cpp
+++ b/test/lib/cpp/08-ssl-bad-cacert.cpp
@@ -25,6 +25,7 @@ int main(int argc, char *argv[])
 	if(mosq->tls_set("this/file/doesnt/exist") == MOSQ_ERR_INVAL){
 		rc = 0;
 	}
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return rc;
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 55d8bc73..d512fe04 100644
--- a/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp
+++ b/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp
@@ -58,6 +58,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/08-ssl-connect-cert-auth.cpp b/test/lib/cpp/08-ssl-connect-cert-auth.cpp
index 8e041510..5c51b8b8 100644
--- a/test/lib/cpp/08-ssl-connect-cert-auth.cpp
+++ b/test/lib/cpp/08-ssl-connect-cert-auth.cpp
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/08-ssl-connect-no-auth.cpp b/test/lib/cpp/08-ssl-connect-no-auth.cpp
index cfa0402f..d6fbd9df 100644
--- a/test/lib/cpp/08-ssl-connect-no-auth.cpp
+++ b/test/lib/cpp/08-ssl-connect-no-auth.cpp
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;
diff --git a/test/lib/cpp/08-ssl-fake-cacert.cpp b/test/lib/cpp/08-ssl-fake-cacert.cpp
index d4aa0dda..3b385caa 100644
--- a/test/lib/cpp/08-ssl-fake-cacert.cpp
+++ b/test/lib/cpp/08-ssl-fake-cacert.cpp
@@ -36,6 +36,7 @@ int main(int argc, char *argv[])
 	mosq->connect("localhost", port, 60);
 
 	rc = mosq->loop_forever();
+	delete mosq;
 	if(rc == MOSQ_ERR_ERRNO && errno == EPROTO){
 		return 0;
 	}else{
diff --git a/test/lib/cpp/09-util-topic-tokenise.cpp b/test/lib/cpp/09-util-topic-tokenise.cpp
index 3094d29d..469994d2 100644
--- a/test/lib/cpp/09-util-topic-tokenise.cpp
+++ b/test/lib/cpp/09-util-topic-tokenise.cpp
@@ -29,6 +29,7 @@ int main(int argc, char *argv[])
 		print_error("topic", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("a/deep/topic/hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -42,6 +43,7 @@ int main(int argc, char *argv[])
 		print_error("a/deep/topic/hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("/a/deep/topic/hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -56,6 +58,7 @@ int main(int argc, char *argv[])
 		print_error("/a/deep/topic/hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("a/b/c", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -68,6 +71,7 @@ int main(int argc, char *argv[])
 		print_error("a/b/c", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("/a/b/c", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -81,6 +85,7 @@ int main(int argc, char *argv[])
 		print_error("/a/b/c", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("a///hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -94,6 +99,7 @@ int main(int argc, char *argv[])
 		print_error("a///hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("/a///hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -108,6 +114,7 @@ int main(int argc, char *argv[])
 		print_error("/a///hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("/a///hierarchy/", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -123,6 +130,7 @@ int main(int argc, char *argv[])
 		print_error("/a///hierarchy/", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	return 0;
 }