diff --git a/test/Makefile.am b/test/Makefile.am
index 8ef31cab1..783511c16 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -213,6 +213,10 @@ REFERENCE_IMAGES = \
 	clip-push-group.quartz.ref.png \
 	clip-push-group.ref.png \
 	clip-push-group.xlib.ref.png \
+	clip-text.ref.png \
+	clip-text.ps.xfail.png \
+	clip-text.svg.ref.png \
+	clip-text.xlib.ref.png \
 	clip-twice.pdf.argb32.ref.png \
 	clip-twice.ps2.argb32.ref.png \
 	clip-twice.ps2.rgb24.ref.png \
diff --git a/test/Makefile.sources b/test/Makefile.sources
index dd71856d5..45bf5fd01 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -20,6 +20,7 @@ test_sources = \
 	clip-nesting.c					\
 	clip-operator.c					\
 	clip-push-group.c				\
+	clip-text.c					\
 	clip-twice.c					\
 	clip-unbounded.c				\
 	clip-zero.c					\
diff --git a/test/clip-text.c b/test/clip-text.c
new file mode 100644
index 000000000..ed8e10796
--- /dev/null
+++ b/test/clip-text.c
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2009 Chris Wilson
+ *
+ * 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
+ * Chris Wilson not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Chris Wilson makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL CHRIS WILSON 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: Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+#define WIDTH 20
+#define HEIGHT 20
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    const char *cairo = "Cairo";
+    cairo_text_extents_t extents;
+    double x0, y0;
+
+    cairo_text_extents (cr, cairo, &extents);
+    x0 = WIDTH/2. - (extents.width/2. + extents.x_bearing);
+    y0 = HEIGHT/2. - (extents.height/2. + extents.y_bearing);
+
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    /* aligned-clip */
+    cairo_save (cr);
+    cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+    cairo_rectangle (cr, 0, 0, 20, 20);
+    cairo_rectangle (cr, 3, 3, 10, 10);
+    cairo_rectangle (cr, 7, 7, 10, 10);
+    cairo_clip (cr);
+
+    cairo_set_source_rgb (cr, 0.7, 0, 0);
+    cairo_paint (cr);
+    cairo_set_source_rgb (cr, 0, 0, 0);
+
+    cairo_move_to (cr, x0, y0);
+    cairo_show_text (cr, cairo);
+    cairo_restore (cr);
+
+    cairo_translate (cr, WIDTH, 0);
+
+    /* force a clip-mask */
+    cairo_save (cr);
+    cairo_arc (cr, 10, 10, 10, 0, 2 * M_PI);
+    cairo_new_sub_path (cr);
+    cairo_arc_negative (cr, 10, 10, 5, 2 * M_PI, 0);
+    cairo_new_sub_path (cr);
+    cairo_arc (cr, 10, 10, 2, 0, 2 * M_PI);
+    cairo_clip (cr);
+
+    cairo_set_source_rgb (cr, 0, 0, 0.7);
+    cairo_paint (cr);
+    cairo_set_source_rgb (cr, 0, 0, 0);
+
+    cairo_move_to (cr, x0, y0);
+    cairo_show_text (cr, cairo);
+    cairo_restore (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (clip_text,
+	    "Tests drawing text through complex clips.",
+	    "clip, text", /* keywords */
+	    NULL, /* requirements */
+	    2 * WIDTH, HEIGHT,
+	    NULL, draw)
diff --git a/test/clip-text.ps.xfail.png b/test/clip-text.ps.xfail.png
new file mode 100644
index 000000000..b50217d88
Binary files /dev/null and b/test/clip-text.ps.xfail.png differ
diff --git a/test/clip-text.ref.png b/test/clip-text.ref.png
new file mode 100644
index 000000000..5cb003067
Binary files /dev/null and b/test/clip-text.ref.png differ
diff --git a/test/clip-text.svg.ref.png b/test/clip-text.svg.ref.png
new file mode 100644
index 000000000..8a2dc29fa
Binary files /dev/null and b/test/clip-text.svg.ref.png differ
diff --git a/test/clip-text.xlib.ref.png b/test/clip-text.xlib.ref.png
new file mode 100644
index 000000000..be27b9618
Binary files /dev/null and b/test/clip-text.xlib.ref.png differ