diff --git a/nanoprintf.h b/nanoprintf.h
index 290ddfe..081fc47 100644
--- a/nanoprintf.h
+++ b/nanoprintf.h
@@ -158,6 +158,9 @@ NPF_VISIBILITY int npf_vpprintf(
     #pragma GCC diagnostic ignored "-Wc++98-compat-pedantic"
     #pragma GCC diagnostic ignored "-Wcovered-switch-default"
     #pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+    #ifndef __APPLE__
+      #pragma GCC diagnostic ignored "-Wunsafe-buffer-usage"
+    #endif
   #elif NANOPRINTF_GCC_PAST_4_6
     #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
   #endif
diff --git a/tests/conformance.cc b/tests/conformance.cc
index 7f6b30f..35e9188 100644
--- a/tests/conformance.cc
+++ b/tests/conformance.cc
@@ -26,6 +26,7 @@
     #pragma GCC diagnostic ignored "-Wold-style-cast"
     #ifndef __APPLE__
       #pragma GCC diagnostic ignored "-Wreserved-identifier"
+      #pragma GCC diagnostic ignored "-Wunsafe-buffer-usage"
     #endif
   #endif
   #pragma GCC diagnostic ignored "-Wformat"
diff --git a/tests/doctest_main.cc b/tests/doctest_main.cc
index b8081c3..5e90be1 100644
--- a/tests/doctest_main.cc
+++ b/tests/doctest_main.cc
@@ -4,5 +4,9 @@
   #pragma warning(disable:5264) // unused const variable
 #endif
 
+#if defined(__clang__) && !defined(__APPLE__)
+  #pragma GCC diagnostic ignored "-Wunsafe-buffer-usage"
+#endif
+
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "doctest.h"
diff --git a/tests/mpaland-conformance b/tests/mpaland-conformance
index d0c6796..550f932 160000
--- a/tests/mpaland-conformance
+++ b/tests/mpaland-conformance
@@ -1 +1 @@
-Subproject commit d0c67966b538efa18ef8d2b767492072c6f20c69
+Subproject commit 550f932df0fcf3d41c875fec4b5e57faaaa9ce66
diff --git a/tests/unit_nanoprintf.h b/tests/unit_nanoprintf.h
index 2ea8b76..b2e5d5d 100644
--- a/tests/unit_nanoprintf.h
+++ b/tests/unit_nanoprintf.h
@@ -21,6 +21,7 @@
     #pragma GCC diagnostic ignored "-Wc++98-compat-pedantic"
     #ifndef __APPLE__
       #pragma GCC diagnostic ignored "-Wreserved-identifier"
+      #pragma GCC diagnostic ignored "-Wunsafe-buffer-usage"
     #endif
   #endif
 #endif