--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-09-20  Bruno Haible  <bruno@clisp.org>
 
+	Tests for module 'getsockopt'.
+	* modules/getsockopt-tests: New file.
+	* tests/test-getsockopt.c: New file.
+
 	Tests for module 'getsockname'.
 	* modules/getsockname-tests: New file.
 	* tests/test-getsockname.c: New file.

new file mode 100644
--- /dev/null
+++ b/modules/getsockopt-tests
@@ -0,0 +1,15 @@
+Files:
+tests/test-getsockopt.c
+tests/signature.h
+tests/macros.h
+
+Depends-on:
+netinet_in
+sockets
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-getsockopt
+check_PROGRAMS += test-getsockopt
+test_getsockopt_LDADD = $(LDADD) @LIBSOCKET@

new file mode 100644
--- /dev/null
+++ b/tests/test-getsockopt.c
@@ -0,0 +1,55 @@
+/* Test getsockopt() function.
+   Copyright (C) 2011 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/>.  */
+
+#include <config.h>
+
+#include <sys/socket.h>
+
+#include "signature.h"
+SIGNATURE_CHECK (getsockopt, int, (int, int, int, void *, socklen_t *));
+
+#include <errno.h>
+
+#include "sockets.h"
+#include "macros.h"
+
+int
+main (void)
+{
+  gl_sockets_startup (SOCKETS_1_1);
+
+  /* Test behaviour for invalid file descriptors.  */
+  {
+    int value;
+    socklen_t value_len = sizeof (value);
+
+    errno = 0;
+    ASSERT (getsockopt (-1, SOL_SOCKET, SO_REUSEADDR, &value, &value_len)
+            == -1);
+    ASSERT (errno == EBADF);
+  }
+  {
+    int value;
+    socklen_t value_len = sizeof (value);
+
+    errno = 0;
+    ASSERT (getsockopt (99, SOL_SOCKET, SO_REUSEADDR, &value, &value_len)
+            == -1);
+    ASSERT (errno == EBADF);
+  }
+
+  return 0;
+}