diff --git a/src/include/unit_test.h b/src/include/unit_test.h
index 84425d6e2f..43ab8ea0ba 100644
--- a/src/include/unit_test.h
+++ b/src/include/unit_test.h
@@ -45,6 +45,7 @@
 			test_class* test = new test_class();		\
 			bool success = test->run_tests();			\
 			test->print_results();						\
+			delete test;                                              \
 			return success ? 0 : -1;					\
 		}												\
 	}
diff --git a/src/modules/mavlink/mavlink_tests/mavlink_ftp_test.cpp b/src/modules/mavlink/mavlink_tests/mavlink_ftp_test.cpp
index 87c0eebc64..fb554473c4 100644
--- a/src/modules/mavlink/mavlink_tests/mavlink_ftp_test.cpp
+++ b/src/modules/mavlink/mavlink_tests/mavlink_ftp_test.cpp
@@ -417,6 +417,7 @@ bool MavlinkFtpTest::_read_test()
 						 &reply);		// Payload inside FTP message response
 
 		if (!success) {
+			delete[] bytes;
 			return false;
 		}
 
@@ -432,6 +433,7 @@ bool MavlinkFtpTest::_read_test()
 					    &reply);	// Payload inside FTP message response
 
 		if (!success) {
+			delete[] bytes;
 			return false;
 		}
 
@@ -453,6 +455,7 @@ bool MavlinkFtpTest::_read_test()
 						    &reply);	// Payload inside FTP message response
 
 			if (!success) {
+				delete[] bytes;
 				return false;
 			}
 
@@ -465,6 +468,7 @@ bool MavlinkFtpTest::_read_test()
 						    &reply);	// Payload inside FTP message response
 
 			if (!success) {
+				delete[] bytes;
 				return false;
 			}
 
@@ -486,11 +490,15 @@ bool MavlinkFtpTest::_read_test()
 					    &reply);	// Payload inside FTP message response
 
 		if (!success) {
+			delete[] bytes;
 			return false;
 		}
 
 		ut_compare("Didn't get Ack back", reply->opcode, MavlinkFTP::kRspAck);
 		ut_compare("Incorrect payload size", reply->size, 0);
+
+		delete[] bytes;
+		bytes = nullptr;
 	}
 
 	return true;
@@ -531,6 +539,7 @@ bool MavlinkFtpTest::_burst_test()
 						 &reply);		// Payload inside FTP message response
 
 		if (!success) {
+			delete[] bytes;
 			return false;
 		}
 
@@ -573,11 +582,15 @@ bool MavlinkFtpTest::_burst_test()
 					    &reply);	// Payload inside FTP message response
 
 		if (!success) {
+			delete[] bytes;
 			return false;
 		}
 
 		ut_compare("Didn't get Ack back", reply->opcode, MavlinkFTP::kRspAck);
 		ut_compare("Incorrect payload size", reply->size, 0);
+
+		delete[] bytes;
+		bytes = nullptr;
 	}
 
 	return true;