diff --git a/ChangeLog b/ChangeLog
index 2d3152d65c..152723a2f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-15  Arjun Shankar  <arjun.is@lostca.se>
+
+	* elf/tst-audit9.c (main): Converted to ...
+	(do_test): ... this.
+	(TEST_FUNCTION): New macro.
+	Include test-skeleton.c.
+
 2015-07-15  Mike Frysinger  <vapier@gentoo.org>
 
 	* timezone/tst-tzset.c (TIMEOUT): Define to 5.
diff --git a/elf/tst-audit9.c b/elf/tst-audit9.c
index 0982d8b716..7b90a5ad2d 100644
--- a/elf/tst-audit9.c
+++ b/elf/tst-audit9.c
@@ -1,8 +1,12 @@
 #include <dlfcn.h>
 
-int main(void)
+static int
+do_test (void)
 {
   void *h = dlopen("$ORIGIN/tst-auditmod9b.so", RTLD_LAZY);
   int (*fp)(void) = dlsym(h, "f");
   return fp() - 1;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"