diff --git a/ChangeLog b/ChangeLog
index bfed63980..37a1bba3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/test.h (grub_unit_test_init): Add missing prototype.
+	(grub_unit_test_fini): Likewise.
+	* tests/lib/unit_test.c (main): Remove extra nested external prototype.
+
+2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/test.h (GRUB_UNIT_TEST)
+
 2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/script/execute.c (grub_script_break): Clarify logic.
diff --git a/include/grub/test.h b/include/grub/test.h
index 04a8ca13a..5d1ba7510 100644
--- a/include/grub/test.h
+++ b/include/grub/test.h
@@ -59,6 +59,9 @@ void grub_test_nonzero (int cond, const char *file,
 		    ## __VA_ARGS__,				\
 		    "assert failed: %s", #cond)
 
+void grub_unit_test_init (void);
+void grub_unit_test_fini (void);
+
 /* Macro to define a unit test.  */
 #define GRUB_UNIT_TEST(name, funp)		\
   void grub_unit_test_init (void)		\
diff --git a/tests/lib/unit_test.c b/tests/lib/unit_test.c
index a780d6862..6adfd9922 100644
--- a/tests/lib/unit_test.c
+++ b/tests/lib/unit_test.c
@@ -30,9 +30,6 @@ main (int argc __attribute__ ((unused)),
 {
   int status = 0;
 
-  extern void grub_unit_test_init (void);
-  extern void grub_unit_test_fini (void);
-
   grub_test_t test;
 
   grub_unit_test_init ();