diff --git a/tests/lib/functional_test.c b/tests/lib/functional_test.c
index 8ff08cf8a..33eeec451 100644
--- a/tests/lib/functional_test.c
+++ b/tests/lib/functional_test.c
@@ -26,15 +26,10 @@ grub_functional_test (struct grub_extcmd *cmd __attribute__ ((unused)),
 		      int argc __attribute__ ((unused)),
 		      char **args __attribute__ ((unused)))
 {
-  auto int run_test (grub_test_t test);
-  int run_test (grub_test_t test)
-  {
-    grub_test_run (test);
-    return 0;
-  }
+  grub_test_t test;
 
-  grub_list_iterate (GRUB_AS_LIST (grub_test_list),
-		     (grub_list_hook_t) run_test);
+  for (test = grub_test_list; test; test = test->next)
+    grub_test_run (test);
   return GRUB_ERR_NONE;
 }