diff --git a/ChangeLog b/ChangeLog
index 84657594e..0f7911293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/test.h: Use gnu_printf rather than printf on GRUB
+	functions.
+
 2013-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/loader/i386/linux.c: Use grub_addr_t rather than long when
diff --git a/include/grub/test.h b/include/grub/test.h
index 84e3ccd62..b83bdb14e 100644
--- a/include/grub/test.h
+++ b/include/grub/test.h
@@ -58,13 +58,13 @@ int grub_test_run (grub_test_t test);
 void grub_test_nonzero (int cond, const char *file,
 			const char *func, grub_uint32_t line,
 			const char *fmt, ...)
-  __attribute__ ((format (printf, 5, 6)));
+  __attribute__ ((format (GNU_PRINTF, 5, 6)));
 
 /* Macro to fill in location details and an optional error message.  */
 void grub_test_assert_helper (int cond, const char *file,
                             const char *func, grub_uint32_t line,
                             const char *condstr, const char *fmt, ...)
-  __attribute__ ((format (printf, 6, 7)));
+  __attribute__ ((format (GNU_PRINTF, 6, 7)));
 
 #define grub_test_assert(cond, ...)				\
   grub_test_assert_helper(cond, GRUB_FILE, __FUNCTION__, __LINE__,     \