diff --git a/test/Makefile.am b/test/Makefile.am
index f48c5ab12..61e40ba60 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,7 @@
 # Here are all the tests that are run unconditionally
 TESTS = 			\
 a8-mask				\
+big-trap			\
 caps-joins			\
 caps-joins-alpha		\
 caps-sub-paths			\
diff --git a/test/big-trap.c b/test/big-trap.c
new file mode 100644
index 000000000..b5e3255d0
--- /dev/null
+++ b/test/big-trap.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2006 Mozilla Corporation
+ *
+ * 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
+ * Mozilla Corporation not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Mozilla Corporation makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * MOZILLA CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL MOZILLA CORPORATION 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: Vladimir Vukicevic <vladimir@pobox.com>
+ */
+
+#include "cairo-test.h"
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+    "big-trap",
+    "Test oversize trapezoid with a clip region",
+    100, 100,
+    draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    /* Note that without the clip, this doesn't crash... */
+    cairo_new_path (cr);
+    cairo_rectangle (cr, 0, 0, width, height);
+    cairo_clip (cr);
+
+    cairo_new_path (cr);
+    cairo_line_to (cr, 8.0, 8.0);
+    cairo_line_to (cr, 312.0, 8.0);
+    cairo_line_to (cr, 310.0, 31378756.2666666666);
+    cairo_line_to (cr, 10.0, 31378756.2666666666);
+    cairo_line_to (cr, 8.0, 8.0);
+    cairo_fill (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test);
+}