diff --git a/tests/lib/test.c b/tests/lib/test.c
index b5c054370..3029495c6 100644
--- a/tests/lib/test.c
+++ b/tests/lib/test.c
@@ -134,23 +134,17 @@ grub_test_unregister (const char *name)
 int
 grub_test_run (grub_test_t test)
 {
-  auto int print_failure (grub_test_failure_t item);
-  int print_failure (grub_test_failure_t item)
-  {
-    grub_test_failure_t failure = (grub_test_failure_t) item;
-
-    grub_printf (" %s:%s:%u: %s\n",
-		 (failure->file ? : "<unknown_file>"),
-		 (failure->funp ? : "<unknown_function>"),
-		 failure->line, (failure->message ? : "<no message>"));
-    return 0;
-  }
+  grub_test_failure_t failure;
 
   test->main ();
 
   grub_printf ("%s:\n", test->name);
-  grub_list_iterate (GRUB_AS_LIST (failure_list),
-		     (grub_list_hook_t) print_failure);
+  FOR_LIST_ELEMENTS (failure, failure_list)
+    grub_printf (" %s:%s:%u: %s\n",
+		 (failure->file ? : "<unknown_file>"),
+		 (failure->funp ? : "<unknown_function>"),
+		 failure->line, (failure->message ? : "<no message>"));
+
   if (!failure_list)
     grub_printf ("%s: PASS\n", test->name);
   else
diff --git a/tests/lib/unit_test.c b/tests/lib/unit_test.c
index e461150de..e8b97b1f4 100644
--- a/tests/lib/unit_test.c
+++ b/tests/lib/unit_test.c
@@ -34,16 +34,12 @@ main (int argc __attribute__ ((unused)),
   extern void grub_unit_test_init (void);
   extern void grub_unit_test_fini (void);
 
-  auto int run_test (grub_test_t test);
-  int run_test (grub_test_t test)
-  {
-    status = grub_test_run (test) ? : status;
-    return 0;
-  }
+  grub_test_t test;
 
   grub_unit_test_init ();
-  grub_list_iterate (GRUB_AS_LIST (grub_test_list),
-		     (grub_list_hook_t) run_test);
+  FOR_LIST_ELEMENTS (test, grub_test_list)
+    status = grub_test_run (test) ? : status;
+
   grub_unit_test_fini ();
 
   exit (status);