--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-25  Bruno Haible  <bruno@clisp.org>
 
+	Tests for module 'regex-quote'.
+	* modules/regex-quote-tests: New file.
+	* tests/test-regex-quote.c: New file.
+
 	New module 'regex-quote'.
 	* lib/regex-quote.h: New file.
 	* lib/regex-quote.c: New file.

new file mode 100644
--- /dev/null
+++ b/modules/regex-quote-tests
@@ -0,0 +1,13 @@
+Files:
+tests/test-regex-quote.c
+tests/macros.h
+
+Depends-on:
+regex
+xalloc
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-regex-quote
+check_PROGRAMS += test-regex-quote

new file mode 100644
--- /dev/null
+++ b/tests/test-regex-quote.c
@@ -0,0 +1,78 @@
+/* Test of constructing a regular expression from a literal string.
+   Copyright (C) 2010 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>, 2010.  */
+
+#include <config.h>
+
+#include "regex-quote.h"
+
+#include <string.h>
+
+#include "regex.h"
+#include "xalloc.h"
+#include "macros.h"
+
+static void
+check (const char *literal, int cflags, const char *expected)
+{
+  char *result;
+  size_t length;
+
+  result = regex_quote (literal, cflags);
+  ASSERT (strcmp (result, expected) == 0);
+  length = regex_quote_length (literal, cflags);
+  ASSERT (length == strlen (result));
+  free (result);
+
+  result = (char *) xmalloc (1 + length + 1 + 1);
+  result[0] = '^';
+  strcpy (regex_quote_copy (result + 1, literal, cflags), "$");
+  {
+    regex_t regex;
+    regmatch_t match[1];
+
+    ASSERT (regcomp (&regex, result, cflags) == 0);
+
+    ASSERT (regexec (&regex, literal, 1, match, 0) == 0);
+    ASSERT (match[0].rm_so == 0);
+    ASSERT (match[0].rm_eo == strlen (literal));
+    regfree (&regex);
+  }
+  free (result);
+}
+
+static void
+test_bre (void)
+{
+  check ("aBc", 0, "aBc");
+  check ("(foo[$HOME])", 0, "(foo\\[\\$HOME\\])");
+}
+
+static void
+test_ere (void)
+{
+  check ("aBc", REG_EXTENDED, "aBc");
+  check ("(foo[$HOME])", REG_EXTENDED, "\\(foo\\[\\$HOME\\]\\)");
+}
+
+int
+main ()
+{
+  test_bre ();
+  test_ere ();
+  return 0;
+}