diff --git a/ChangeLog b/ChangeLog
index 152723a2f7..3d07c118b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2015-07-15  Arjun Shankar  <arjun.is@lostca.se>
 
+	* elf/tst-leaks1.c (main): Converted to ...
+	(do_test): ... this.
+	(TEST_FUNCTION): New macro.
+	Include test-skeleton.c.
+	* localedata/tst-langinfo.c (main): Converted to ...
+	(do_test): ... this.
+	(TEST_FUNCTION): New macro.
+	Include test-skeleton.c.
+	* math/test-fpucw.c (main): Converted to ...
+	(do_test): ... this.
+	(TEST_FUNCTION): New macro.
+	Include test-skeleton.c.
+	* math/test-tgmath.c (main): Converted to ...
+	(do_test): ... this.
+	(TEST_FUNCTION): New macro.
+	Include test-skeleton.c.
+	* math/test-tgmath2.c (main): Converted to ...
+	(do_test): ... this.
+	(TEST_FUNCTION): New macro.
+	Include test-skeleton.c.
+	* setjmp/tst-setjmp.c (main): Converted to ...
+	(do_test): ... this.
+	(TEST_FUNCTION): New macro.
+	Include test-skeleton.c.
+	* stdio-common/tst-sscanf.c (main): Converted to ...
+	(do_test): ... this.
+	(TEST_FUNCTION): New macro.
+	Include test-skeleton.c.
+	* sysdeps/x86_64/tst-audit6.c (main): Converted to ...
+	(do_test): ... this.
+	(TEST_FUNCTION): New macro.
+	Include test-skeleton.c.
+
 	* elf/tst-audit9.c (main): Converted to ...
 	(do_test): ... this.
 	(TEST_FUNCTION): New macro.
diff --git a/elf/tst-leaks1.c b/elf/tst-leaks1.c
index 36e4aee9cf..dcff28dafa 100644
--- a/elf/tst-leaks1.c
+++ b/elf/tst-leaks1.c
@@ -3,8 +3,8 @@
 #include <mcheck.h>
 #include <stdlib.h>
 
-int
-main (void)
+static int
+do_test (void)
 {
   mtrace ();
 
@@ -23,3 +23,6 @@ main (void)
 
   return ret;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/localedata/tst-langinfo.c b/localedata/tst-langinfo.c
index f42ac8b864..49807f454f 100644
--- a/localedata/tst-langinfo.c
+++ b/localedata/tst-langinfo.c
@@ -138,8 +138,8 @@ map_paramstr (const char *str)
 # define REASON(str)
 #endif
 
-int
-main (void)
+static int
+do_test (void)
 {
   int result = 0;
 
@@ -281,3 +281,6 @@ main (void)
 
   return result;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/math/test-fpucw.c b/math/test-fpucw.c
index 21e6d2e8f6..a3331197ef 100644
--- a/math/test-fpucw.c
+++ b/math/test-fpucw.c
@@ -23,8 +23,8 @@
 # define FPU_CONTROL _FPU_DEFAULT
 #endif
 
-int
-main (void)
+static int
+do_test (void)
 {
 #ifdef _FPU_GETCW
 /* Some architectures don't have _FPU_GETCW (e.g. Linux/Alpha).  */
@@ -44,3 +44,6 @@ main (void)
   return 0;
 #endif
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/math/test-tgmath.c b/math/test-tgmath.c
index ef5ac20b9a..b82413eb31 100644
--- a/math/test-tgmath.c
+++ b/math/test-tgmath.c
@@ -54,8 +54,8 @@ int count_cldouble;
 #define NCALLS_INT 4
 #define NCCALLS    47
 
-int
-main (void)
+static int
+do_test (void)
 {
   int result = 0;
 
@@ -210,6 +210,9 @@ main (void)
 #include "test-tgmath.c"
 #endif
 
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
+
 #else
 
 #ifdef DEBUG
diff --git a/math/test-tgmath2.c b/math/test-tgmath2.c
index 467debac8c..b03bc55676 100644
--- a/math/test-tgmath2.c
+++ b/math/test-tgmath2.c
@@ -334,8 +334,8 @@ test (const int Vint4, const long long int Vllong4)
   return result;
 }
 
-int
-main (void)
+static int
+do_test (void)
 {
   return test (vint1, vllong1);
 }
@@ -366,6 +366,9 @@ main (void)
 #include "test-tgmath2.c"
 #endif
 
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
+
 #else
 
 #ifdef DEBUG
diff --git a/setjmp/tst-setjmp.c b/setjmp/tst-setjmp.c
index 264f517753..3d6c84908e 100644
--- a/setjmp/tst-setjmp.c
+++ b/setjmp/tst-setjmp.c
@@ -28,8 +28,8 @@ jump (int val)
   longjmp (env, val);
 }
 
-int
-main (void)
+static int
+do_test (void)
 {
   int value;
 
@@ -115,3 +115,6 @@ main (void)
 
   return lose ? EXIT_FAILURE : EXIT_SUCCESS;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/stdio-common/tst-sscanf.c b/stdio-common/tst-sscanf.c
index 8a2eb9e39c..9c61ab3b1b 100644
--- a/stdio-common/tst-sscanf.c
+++ b/stdio-common/tst-sscanf.c
@@ -124,8 +124,8 @@ struct test2
   { L("0x.e+0"), L("%g%c"), 2, '+' },
 };
 
-int
-main (void)
+static int
+do_test (void)
 {
   double d[6];
   long l[6];
@@ -268,3 +268,6 @@ main (void)
 
   return result;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/sysdeps/x86_64/tst-audit6.c b/sysdeps/x86_64/tst-audit6.c
index 64209a152e..f2f6a487c4 100644
--- a/sysdeps/x86_64/tst-audit6.c
+++ b/sysdeps/x86_64/tst-audit6.c
@@ -25,8 +25,8 @@ avx_enabled (void)
 }
 
 
-int
-main (void)
+static int
+do_test (void)
 {
   /* Run AVX test only if AVX is supported.  */
   if (avx_enabled ())
@@ -40,3 +40,6 @@ main (void)
     }
   return 0;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../../test-skeleton.c"