diff --git a/common/t-exechelp.c b/common/t-exechelp.c
new file mode 100644
index 000000000..7ab6bbe0a
--- /dev/null
+++ b/common/t-exechelp.c
@@ -0,0 +1,188 @@
+/* t-exechelp.c - Module test for exechelp.c
+ *	Copyright (C) 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <assert.h>
+#include <unistd.h>
+
+#include "util.h"
+#include "exechelp.h"
+
+static int verbose;
+
+
+static void
+print_open_fds (int *array)
+{
+  int n;
+
+  for (n=0; array[n] != -1; n++)
+    ;
+  printf ("open file descriptors: %d", n);
+  if (verbose)
+    {
+      putchar (' ');
+      putchar (' ');
+      putchar ('(');
+      for (n=0; array[n] != -1; n++)
+        printf ("%d%s", array[n], array[n+1] == -1?"":" ");
+      putchar (')');
+    }
+  putchar ('\n');
+}
+
+
+static int *
+xget_all_open_fds (void)
+{
+  int *array;
+
+  array = get_all_open_fds ();
+  if (!array)
+    {
+      fprintf (stderr, "%s:%d: get_all_open_fds failed: %s\n",
+               __FILE__, __LINE__, strerror (errno));
+      exit (1);
+    }
+  return array;
+}
+
+
+/* That is a very crude test.  To do a proper test we would need to
+   fork a test process and best return information by some other means
+   that file descriptors. */
+static void
+test_close_all_fds (void)
+{
+  int max_fd = get_max_fds ();
+  int *array;
+  int fd;
+  int initial_count, count, n;
+#if 1
+  char buffer[100];
+
+  snprintf (buffer, sizeof buffer, "/bin/ls -l /proc/%d/fd", (int)getpid ());
+  system (buffer);
+#endif
+
+  printf ("max. file descriptors: %d\n", max_fd);
+  array = xget_all_open_fds ();
+  print_open_fds (array);
+  for (initial_count=n=0; array[n] != -1; n++)
+    initial_count++;
+  free (array);
+
+  /* Some dups to get more file descriptors and close one. */
+  dup (1);
+  dup (1);
+  fd = dup (1);
+  dup (1);
+  close (fd);
+
+  array = xget_all_open_fds ();
+  if (verbose)
+    print_open_fds (array);
+  for (count=n=0; array[n] != -1; n++)
+    count++;
+  if (count != initial_count+3)
+    {
+      fprintf (stderr, "%s:%d: dup or close failed\n",
+               __FILE__, __LINE__);
+      exit (1);
+    }
+  free (array);
+
+  /* Close the non standard ones.  */
+  close_all_fds (3, NULL);
+
+  /* Get a list to check whether they are all closed.  */
+  array = xget_all_open_fds ();
+  if (verbose)
+    print_open_fds (array);
+  for (count=n=0; array[n] != -1; n++)
+    count++;
+  if (count > initial_count)
+    {
+      fprintf (stderr, "%s:%d: not all files were closed\n",
+               __FILE__, __LINE__);
+      exit (1);
+    }
+  initial_count = count;
+  free (array);
+
+  /* Now let's check the realloc we use.  We do this and the next
+     tests only if we are allowed to open enought descriptors.  */
+  if (get_max_fds () > 32)
+    {
+      int except[] = { 20, 23, 24, -1 };
+
+      for (n=initial_count; n < 31; n++)
+        dup (1);
+      array = xget_all_open_fds ();
+      if (verbose)
+        print_open_fds (array);
+      free (array);
+      for (n=0; n < 5; n++)
+        {
+          dup (1);
+          array = xget_all_open_fds ();
+          if (verbose)
+            print_open_fds (array);
+          free (array);
+        }
+      
+      /* Check whether the except list works.  */
+      close_all_fds (3, except);
+      array = xget_all_open_fds ();
+      if (verbose)
+        print_open_fds (array);
+      for (count=n=0; array[n] != -1; n++)
+        count++;
+      free (array);
+
+      if (count != initial_count + DIM(except)-1)
+        {
+          fprintf (stderr, "%s:%d: close_all_fds failed\n",
+                   __FILE__, __LINE__);
+          exit (1);
+        }
+    }
+
+}
+
+
+int
+main (int argc, char **argv)
+{
+  if (argc)
+    { argc--; argv++; }
+  if (argc && !strcmp (argv[0], "--verbose"))
+    {
+      verbose = 1;
+      argc--; argv++;
+    }
+  
+  test_close_all_fds ();
+
+  return 0;
+}
+