diff --git a/test/.gitignore b/test/.gitignore
index 7c442669f..e56151d5b 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -7,6 +7,7 @@ ref.hash
 a1-image-sample
 a1-traps-sample
 a8-mask
+big-line
 big-trap
 bitmap-font
 caps-joins
diff --git a/test/Makefile.am b/test/Makefile.am
index e6a1760a3..c359f1f6b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,6 +5,7 @@ TESTS =							\
 a1-image-sample$(EXEEXT)				\
 a1-traps-sample$(EXEEXT)				\
 a8-mask$(EXEEXT)					\
+big-line$(EXEEXT)					\
 big-trap$(EXEEXT)					\
 caps-joins$(EXEEXT)					\
 caps-joins-alpha$(EXEEXT)				\
@@ -244,6 +245,10 @@ REFERENCE_IMAGES = \
 	a1-image-sample-ref.png		\
 	a1-traps-sample-ref.png		\
 	a8-mask-ref.png	\
+	big-line-ref.png		\
+	big-line-rgb24-ref.png		\
+	big-line-ps-ref.png		\
+	big-line-ps-rgb24-ref.png	\
 	bitmap-font-pdf-argb32-ref.png	\
 	bitmap-font-ref.png	\
 	bitmap-font-rgb24-ref.png	\
diff --git a/test/big-line-ps-ref.png b/test/big-line-ps-ref.png
new file mode 100644
index 000000000..b8a7d9bc9
Binary files /dev/null and b/test/big-line-ps-ref.png differ
diff --git a/test/big-line-ps-rgb24-ref.png b/test/big-line-ps-rgb24-ref.png
new file mode 100644
index 000000000..ead463b77
Binary files /dev/null and b/test/big-line-ps-rgb24-ref.png differ
diff --git a/test/big-line-ref.png b/test/big-line-ref.png
new file mode 100644
index 000000000..4cac5775c
Binary files /dev/null and b/test/big-line-ref.png differ
diff --git a/test/big-line-rgb24-ref.png b/test/big-line-rgb24-ref.png
new file mode 100644
index 000000000..0ac754b93
Binary files /dev/null and b/test/big-line-rgb24-ref.png differ
diff --git a/test/big-line.c b/test/big-line.c
new file mode 100644
index 000000000..e727125a8
--- /dev/null
+++ b/test/big-line.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2008 Novell, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Novell, Inc. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Larry Ewing <lewing@novell.com>
+ */
+
+#include "cairo-test.h"
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+    "big-line",
+    "Test drawing of simple lines with positive and negative coordinates > 2^16",
+    100, 100,
+    draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_new_path (cr);
+
+    cairo_set_source_rgb (cr, 1, 1, 0);
+    cairo_move_to (cr, 50, 50);
+    cairo_line_to (cr, 50000, 50000);
+    cairo_stroke (cr);
+
+    cairo_set_source_rgb (cr, 1, 0, 0);
+    cairo_move_to (cr, 50, 50);
+    cairo_line_to (cr, -50000, 50000);
+    cairo_stroke (cr);
+
+    cairo_set_source_rgb (cr, 0, 1, 0);
+    cairo_move_to (cr, 50, 50);
+    cairo_line_to (cr, 50000, -50000);
+    cairo_stroke (cr);
+
+    cairo_set_source_rgb (cr, 0, 0, 1);
+    cairo_move_to (cr, 50, 50);
+    cairo_line_to (cr, -50000, -50000);
+    cairo_stroke (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test);
+}