diff --git a/ChangeLog b/ChangeLog
index 312506637..42330237a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/tests/setjmp_test.c: Reset counter to 0 before starting.
+
 2013-11-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/proc.c: Allow \0 in proc files.
diff --git a/grub-core/tests/setjmp_test.c b/grub-core/tests/setjmp_test.c
index 4d315115c..390cb26eb 100644
--- a/grub-core/tests/setjmp_test.c
+++ b/grub-core/tests/setjmp_test.c
@@ -51,6 +51,7 @@ setjmp_test (void)
   int val;
 
   expected = 0;
+  ctr = 0;
   val = grub_setjmp (jmp_point);
 
   grub_test_assert (val == expected, "setjmp returned %d instead of %d",