diff --git a/ChangeLog b/ChangeLog
index 0f2d1d9c57..dd590b06ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2015-02-25  Roland McGrath  <roland@hack.frob.com>
 
+	* iconv/tst-iconv3.c (main): Converted to ...
+	(do_test): ... this.
+	(TEST_FUNCTION): New macro.
+	Include test-skeleton.c.
+
 	* iconv/tst-iconv5.c (testcode, number): Make variables static const.
 	(convert): Make function static.
 	(test_unalign): Likewise.  Add const to argument pointee types.
diff --git a/iconv/tst-iconv3.c b/iconv/tst-iconv3.c
index f31c8129d7..b06f75f0bc 100644
--- a/iconv/tst-iconv3.c
+++ b/iconv/tst-iconv3.c
@@ -7,8 +7,8 @@
 
 #define BUFSIZE 10000
 
-int
-main (int argc, char *argv[])
+static int
+do_test (void)
 {
   char inbuf[BUFSIZE];
   wchar_t outbuf[BUFSIZE];
@@ -51,3 +51,6 @@ main (int argc, char *argv[])
 
   return result;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"