diff --git a/test/lib/c/02-subscribe-qos2.c b/test/lib/c/02-subscribe-qos2.c
index 736c4c91..ceb416c9 100644
--- a/test/lib/c/02-subscribe-qos2.c
+++ b/test/lib/c/02-subscribe-qos2.c
@@ -43,7 +43,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
diff --git a/test/lib/c/02-unsubscribe.c b/test/lib/c/02-unsubscribe.c
index 05942295..6b28f217 100644
--- a/test/lib/c/02-unsubscribe.c
+++ b/test/lib/c/02-unsubscribe.c
@@ -43,7 +43,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
diff --git a/test/lib/c/03-publish-b2c-qos2-len.c b/test/lib/c/03-publish-b2c-qos2-len.c
index 0e1cad81..b5a7f49c 100644
--- a/test/lib/c/03-publish-b2c-qos2-len.c
+++ b/test/lib/c/03-publish-b2c-qos2-len.c
@@ -68,7 +68,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 100, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
diff --git a/test/lib/c/03-publish-b2c-qos2.c b/test/lib/c/03-publish-b2c-qos2.c
index d8c17391..2345b6b5 100644
--- a/test/lib/c/03-publish-b2c-qos2.c
+++ b/test/lib/c/03-publish-b2c-qos2.c
@@ -62,7 +62,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
diff --git a/test/lib/c/03-publish-c2b-qos1-len.c b/test/lib/c/03-publish-c2b-qos1-len.c
index e4b5ce50..fb3ae056 100644
--- a/test/lib/c/03-publish-c2b-qos1-len.c
+++ b/test/lib/c/03-publish-c2b-qos1-len.c
@@ -46,7 +46,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
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 b0f1f048..bfbbd529 100644
--- a/test/lib/c/03-publish-c2b-qos1-receive-maximum.c
+++ b/test/lib/c/03-publish-c2b-qos1-receive-maximum.c
@@ -48,7 +48,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
diff --git a/test/lib/c/03-publish-c2b-qos2-len.c b/test/lib/c/03-publish-c2b-qos2-len.c
index 9facb09f..1b2eb2e5 100644
--- a/test/lib/c/03-publish-c2b-qos2-len.c
+++ b/test/lib/c/03-publish-c2b-qos2-len.c
@@ -46,7 +46,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
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 f03a9d74..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
@@ -52,7 +52,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 50, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
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 3b3369e7..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
@@ -53,7 +53,6 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 50, 1);
 	}
 	mosquitto_loop(mosq, 50, 1);
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
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 e98bdd1e..170ee842 100644
--- a/test/lib/c/03-publish-c2b-qos2-pubrec-error.c
+++ b/test/lib/c/03-publish-c2b-qos2-pubrec-error.c
@@ -43,7 +43,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 100, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
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 213bf069..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
@@ -48,7 +48,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
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 213bf069..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
@@ -48,7 +48,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
diff --git a/test/lib/c/03-publish-qos0.c b/test/lib/c/03-publish-qos0.c
index 1ae58b16..1562b3c3 100644
--- a/test/lib/c/03-publish-qos0.c
+++ b/test/lib/c/03-publish-qos0.c
@@ -44,7 +44,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
diff --git a/test/lib/c/03-request-response-2.c b/test/lib/c/03-request-response-2.c
index fe6094a5..a7c11b9f 100644
--- a/test/lib/c/03-request-response-2.c
+++ b/test/lib/c/03-request-response-2.c
@@ -62,7 +62,6 @@ int main(int argc, char *argv[])
 	}
 	mosquitto_destroy(mosq);
 
-	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }
diff --git a/test/lib/c/11-prop-send-content-type.c b/test/lib/c/11-prop-send-content-type.c
index 094a8fc9..3222d9d5 100644
--- a/test/lib/c/11-prop-send-content-type.c
+++ b/test/lib/c/11-prop-send-content-type.c
@@ -53,7 +53,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
-	mosquitto_destroy(mosq);
 
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
diff --git a/test/lib/cpp/02-subscribe-qos1.cpp b/test/lib/cpp/02-subscribe-qos1.cpp
index 03a86d4a..67dc84f5 100644
--- a/test/lib/cpp/02-subscribe-qos1.cpp
+++ b/test/lib/cpp/02-subscribe-qos1.cpp
@@ -51,7 +51,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
-	delete mosq;
 
 	delete mosq;
 	mosqpp::lib_cleanup();
diff --git a/test/lib/cpp/03-publish-c2b-qos2.cpp b/test/lib/cpp/03-publish-c2b-qos2.cpp
index a6c1f8f4..52da8d53 100644
--- a/test/lib/cpp/03-publish-c2b-qos2.cpp
+++ b/test/lib/cpp/03-publish-c2b-qos2.cpp
@@ -53,7 +53,6 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
-	delete mosq;
 
 	delete mosq;
 	mosqpp::lib_cleanup();