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

new file mode 100644
--- /dev/null
+++ b/modules/ceill-tests
@@ -0,0 +1,16 @@
+Files:
+tests/test-ceill.c
+
+Depends-on:
+fpucw
+isnanl-nolibm
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ceill
+check_PROGRAMS += test-ceill
+test_ceill_LDADD = $(LDADD) @CEILL_LIBM@
+
+License:
+LGPL

new file mode 100644
--- /dev/null
+++ b/tests/test-ceill.c
@@ -0,0 +1,79 @@
+/* Test of rounding towards positive infinity.
+   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 <math.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "fpucw.h"
+#include "isnanl-nolibm.h"
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  DECL_LONG_DOUBLE_ROUNDING
+
+  BEGIN_LONG_DOUBLE_ROUNDING ();
+
+  /* Zero.  */
+  ASSERT (ceill (0.0L) == 0.0L);
+  ASSERT (ceill (-0.0L) == 0.0L);
+  /* Positive numbers.  */
+  ASSERT (ceill (0.3L) == 1.0L);
+  ASSERT (ceill (0.7L) == 1.0L);
+  ASSERT (ceill (1.0L) == 1.0L);
+  ASSERT (ceill (1.001L) == 2.0L);
+  ASSERT (ceill (1.5L) == 2.0L);
+  ASSERT (ceill (1.999L) == 2.0L);
+  ASSERT (ceill (2.0L) == 2.0L);
+  ASSERT (ceill (65535.999L) == 65536.0L);
+  ASSERT (ceill (65536.0L) == 65536.0L);
+  ASSERT (ceill (2.341e31L) == 2.341e31L);
+  /* Negative numbers.  */
+  ASSERT (ceill (-0.3L) == 0.0L);
+  ASSERT (ceill (-0.7L) == 0.0L);
+  ASSERT (ceill (-1.0L) == -1.0L);
+  ASSERT (ceill (-1.5L) == -1.0L);
+  ASSERT (ceill (-1.999L) == -1.0L);
+  ASSERT (ceill (-2.0L) == -2.0L);
+  ASSERT (ceill (-65535.999L) == -65535.0L);
+  ASSERT (ceill (-65536.0L) == -65536.0L);
+  ASSERT (ceill (-2.341e31L) == -2.341e31L);
+  /* Infinite numbers.  */
+  ASSERT (ceill (1.0L / 0.0L) == 1.0L / 0.0L);
+  ASSERT (ceill (-1.0L / 0.0L) == -1.0L / 0.0L);
+  /* NaNs.  */
+  ASSERT (isnanl (ceill (0.0L / 0.0L)));
+
+  return 0;
+}