--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-08-02  Bruno Haible  <bruno@clisp.org>
 
+	Tests for module 'sys_utsname'.
+	* modules/sys_utsname-tests: New file.
+	* tests/test-sys_utsname.c: New file.
+
 	New module 'sys_utsname'.
 	* lib/sys_utsname.in.h: New file, based on glibc's <sys/utsname.h>.
 	* m4/sys_utsname_h.m4: New file.

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

new file mode 100644
--- /dev/null
+++ b/tests/test-sys_utsname.c
@@ -0,0 +1,37 @@
+/* Test of <sys/utsname.h> substitute.
+   Copyright (C) 2009 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 3 of the License, 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, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2009.  */
+
+#include <config.h>
+
+#include <sys/utsname.h>
+
+#include <string.h>
+
+int
+main ()
+{
+  struct utsname buf;
+
+  strcpy (buf.sysname, "Linux");
+  strcpy (buf.nodename, "hobbybox");
+  strcpy (buf.release, "3.141.592");
+  strcpy (buf.version, "GENERIC");
+  strcpy (buf.machine, "i586");
+
+  return 0;
+}