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

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

new file mode 100644
--- /dev/null
+++ b/tests/test-imaxdiv.c
@@ -0,0 +1,51 @@
+/*
+ * 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 <inttypes.h>
+
+#include "signature.h"
+SIGNATURE_CHECK (imaxdiv, imaxdiv_t, (intmax_t, intmax_t));
+
+#include "macros.h"
+
+int
+main (void)
+{
+  {
+    imaxdiv_t result = imaxdiv (101, 7);
+    ASSERT (result.quot = 14);
+    ASSERT (result.rem = 3);
+  }
+  {
+    imaxdiv_t result = imaxdiv (-101, 7);
+    ASSERT (result.quot = -14);
+    ASSERT (result.rem = -3);
+  }
+  {
+    imaxdiv_t result = imaxdiv (101, -7);
+    ASSERT (result.quot = -14);
+    ASSERT (result.rem = 3);
+  }
+  {
+    imaxdiv_t result = imaxdiv (-101, -7);
+    ASSERT (result.quot = 14);
+    ASSERT (result.rem = -3);
+  }
+
+  return 0;
+}