diff --git a/src/mosquitto.c b/src/mosquitto.c
index 8880d464..8f6fffc2 100644
--- a/src/mosquitto.c
+++ b/src/mosquitto.c
@@ -360,9 +360,11 @@ int main(int argc, char *argv[])
 	if(config.test_configuration){
 		if(!db.config_file){
 			log__printf(NULL, MOSQ_LOG_ERR, "Please provide a configuration file to test.");
+			config__cleanup(&config);
 			return MOSQ_ERR_INVAL;
 		}else{
 			log__printf(NULL, MOSQ_LOG_INFO, "Configuration file is OK.");
+			config__cleanup(&config);
 			return MOSQ_ERR_SUCCESS;
 		}
 	}