diff --git a/ChangeLog b/ChangeLog
index e6fcdd086d..c586ef2e5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf/tst-dlopen-aout.c (TEST_FUNCTION): Removed.
+	(TEST_FUNCTION_ARGV): New.
+
 2017-04-05  Wainer dos Santos Moschetta  <wainersm@linux.vnet.ibm.com>
 
 	* elf/next.c: Import support/test-driver.c instead of
diff --git a/elf/tst-dlopen-aout.c b/elf/tst-dlopen-aout.c
index 34a1cdbf50..cccc508966 100644
--- a/elf/tst-dlopen-aout.c
+++ b/elf/tst-dlopen-aout.c
@@ -63,5 +63,5 @@ do_test (int argc, char *argv[])
   return 0;
 }
 
-#define TEST_FUNCTION do_test (argc, argv)
+#define TEST_FUNCTION_ARGV do_test
 #include <support/test-driver.c>