diff --git a/src/platforms/px4_defines.h b/src/platforms/px4_defines.h
index f85baa3b75..8660276405 100644
--- a/src/platforms/px4_defines.h
+++ b/src/platforms/px4_defines.h
@@ -115,6 +115,9 @@ typedef param_t px4_param_t;
 #ifndef PRIu64
 #define PRIu64 "llu"
 #endif
+#ifndef PRId64
+#define PRId64 "lld"
+#endif
 
 /* 
  * POSIX Specific defines
diff --git a/src/systemcmds/tests/test_bson.c b/src/systemcmds/tests/test_bson.c
index 6309e23160..bba1ae4f12 100644
--- a/src/systemcmds/tests/test_bson.c
+++ b/src/systemcmds/tests/test_bson.c
@@ -174,7 +174,7 @@ decode_callback(bson_decoder_t decoder, void *private, bson_node_t node)
 		len = bson_decoder_data_pending(decoder);
 
 		if (len != strlen(sample_string) + 1) {
-			PX4_ERR("FAIL: decoder: string1 length %d wrong, expected %ld", len, strlen(sample_string) + 1);
+			PX4_ERR("FAIL: decoder: string1 length %d wrong, expected %zd", len, strlen(sample_string) + 1);
 			return 1;
 		}
 
@@ -213,7 +213,7 @@ decode_callback(bson_decoder_t decoder, void *private, bson_node_t node)
 		len = bson_decoder_data_pending(decoder);
 
 		if (len != sizeof(sample_data)) {
-			PX4_ERR("FAIL: decoder: data1 length %d, expected %lu", len, sizeof(sample_data));
+			PX4_ERR("FAIL: decoder: data1 length %d, expected %zu", len, sizeof(sample_data));
 			return 1;
 		}
 
diff --git a/src/systemcmds/tests/test_int.c b/src/systemcmds/tests/test_int.c
index f9a24d6843..f19eff3d84 100644
--- a/src/systemcmds/tests/test_int.c
+++ b/src/systemcmds/tests/test_int.c
@@ -37,13 +37,13 @@
  ****************************************************************************/
 
 #include <px4_config.h>
+#include <px4_defines.h>
 
 #include <sys/types.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <inttypes.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>