Index: uspace/lib/c/test/stdio/scanf.c
===================================================================
--- uspace/lib/c/test/stdio/scanf.c	(revision 1c9bf2921b28e891268eafe623bde93bee097636)
+++ uspace/lib/c/test/stdio/scanf.c	(revision 7b1ae098e673b53b51f36a80130f0d25dec7be04)
@@ -43,4 +43,6 @@
 
 #pragma GCC diagnostic ignored "-Wformat-zero-length"
+#pragma GCC diagnostic ignored "-Wformat"
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
 
 PCUT_INIT;
Index: uspace/lib/c/test/string.c
===================================================================
--- uspace/lib/c/test/string.c	(revision 1c9bf2921b28e891268eafe623bde93bee097636)
+++ uspace/lib/c/test/string.c	(revision 7b1ae098e673b53b51f36a80130f0d25dec7be04)
@@ -28,7 +28,6 @@
 
 /* Prevent an error from being generated */
-#undef _HELENOS_SOURCE
+#define _REALLY_WANT_STRING_H
 #include <string.h>
-#define _HELENOS_SOURCE
 #include <pcut/pcut.h>