--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-10-06  Bruno Haible  <bruno@clisp.org>
 
+	* modules/fopen-tests: New file.
+	* tests/test-fopen.c: New file.
+
 	* modules/fopen: New file.
 	* lib/fopen.c: New file.
 	* m4/fopen.m4: New file.

new file mode 100644
--- /dev/null
+++ b/modules/fopen-tests
@@ -0,0 +1,11 @@
+Files:
+tests/test-fopen.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-fopen
+check_PROGRAMS += test-fopen
+

new file mode 100644
--- /dev/null
+++ b/tests/test-fopen.c
@@ -0,0 +1,42 @@
+/* Test of opening a file stream.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program 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 2, or (at your option)
+   any later version.
+
+   This program 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, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  ASSERT (fopen ("/dev/null", "r") != NULL);
+
+  return 0;
+}