diff --git a/test/.gitignore b/test/.gitignore
index 6454dd334..0ad92da83 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -168,6 +168,7 @@ svg-surface-source.svg
 pixman-rotate
 pthread-show-text
 rectangle-rounding-error
+rectilinear-fill
 rectilinear-miter-limit
 rectilinear-stroke
 reflected-stroke
diff --git a/test/Makefile.am b/test/Makefile.am
index 72aa9e0f2..1dcde7dda 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -121,6 +121,7 @@ push-group$(EXEEXT)					\
 radial-gradient$(EXEEXT)				\
 random-intersections$(EXEEXT)				\
 rectangle-rounding-error$(EXEEXT)			\
+rectilinear-fill$(EXEEXT)				\
 rectilinear-miter-limit$(EXEEXT)			\
 rectilinear-stroke$(EXEEXT)				\
 reflected-stroke$(EXEEXT)				\
@@ -600,6 +601,7 @@ REFERENCE_IMAGES = \
 	random-intersections-quartz-ref.png \
 	rgb24-ignore-alpha-ref.png \
 	rectangle-rounding-error-ref.png	\
+	rectilinear-fill-ref.png	\
 	rectilinear-miter-limit-ref.png		\
 	rectilinear-miter-limit-ps-ref.png	\
 	rectilinear-stroke-ref.png	\
diff --git a/test/rectilinear-fill-ref.png b/test/rectilinear-fill-ref.png
new file mode 100644
index 000000000..84b5967e2
Binary files /dev/null and b/test/rectilinear-fill-ref.png differ
diff --git a/test/rectilinear-fill.c b/test/rectilinear-fill.c
new file mode 100644
index 000000000..14fc511ac
--- /dev/null
+++ b/test/rectilinear-fill.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright © 2008 Chris Wilson
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+#define SIZE 24
+
+static cairo_test_draw_function_t draw;
+
+static const cairo_test_t test = {
+    "rectilinear-fill",
+    "Test rectilinear fill operations (covering only whole pixels)",
+    SIZE, 2 * SIZE,
+    draw
+};
+
+static void
+draw_rectangles (cairo_t *cr)
+{
+    cairo_save (cr);
+
+    /* test constructing single rectangles */
+    cairo_rectangle (cr, 0, 0, SIZE/2, 2);
+    cairo_fill (cr);
+
+    cairo_rectangle (cr, 0, 5, SIZE/2, -2);
+    cairo_fill (cr);
+
+    cairo_rectangle (cr, SIZE/2, 6, -SIZE/2, 2);
+    cairo_fill (cr);
+
+    cairo_rectangle (cr, SIZE/2, 11, -SIZE/2, -2);
+    cairo_fill (cr);
+
+    /* test constructing multiple rectangles */
+    cairo_translate (cr, 0, 12);
+    cairo_rectangle (cr, 0, 0, SIZE/2, 2);
+    cairo_rectangle (cr, 0, 5, SIZE/2, -2);
+    cairo_rectangle (cr, SIZE/2, 6, -SIZE/2, 2);
+    cairo_rectangle (cr, SIZE/2, 11, -SIZE/2, -2);
+    cairo_fill (cr);
+
+    cairo_restore (cr);
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    /* Paint background white, then draw in black. */
+    cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
+    cairo_paint (cr);
+    cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */
+
+    draw_rectangles (cr);
+
+    /* and check using cw winding */
+    cairo_translate (cr, SIZE, SIZE);
+    cairo_scale (cr, -1, 1);
+
+    draw_rectangles (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test);
+}