diff --git a/ChangeLog b/ChangeLog
index a690d5525..715614e22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-14  Carl Worth  <cworth@cworth.org>
+
+	* test/.cvsignore:
+	* test/Makefile.am:
+	* test/set-source-ref.png:
+	* test/set-source.c: (draw), (main): Add set-source test in
+	preparation for upcoming cairo_set_source patch.
+
 2005-04-14  Owen Taylor  <otaylor@redhat.com>
 
 	* src/cairo-font.c (_cairo_simple_font_face_destroy): Remove
diff --git a/test/.cvsignore b/test/.cvsignore
index 41621aa91..991540222 100644
--- a/test/.cvsignore
+++ b/test/.cvsignore
@@ -14,8 +14,9 @@ linear-gradient
 move-to-show-surface
 path-data
 pixman-rotate
-surface-finish-twice
+set-source
 select-font-no-show-text
+surface-finish-twice
 text-cache-crash
 text-rotate
 transforms
diff --git a/test/Makefile.am b/test/Makefile.am
index 116be1c0a..d3f21e135 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -11,8 +11,9 @@ linear-gradient		\
 move-to-show-surface	\
 path-data		\
 pixman-rotate		\
-surface-finish-twice	\
 select-font-no-show-text\
+set-source		\
+surface-finish-twice	\
 text-cache-crash	\
 text-rotate		\
 transforms		\
@@ -35,6 +36,7 @@ clip-twice-ref.png		\
 path-data-ref.png		\
 pixman-rotate-ref.png		\
 romedalen.png			\
+set-source-ref.png		\
 transforms-ref.png		\
 translate-show-surface-ref.png	\
 trap-clip-ref.png
@@ -92,8 +94,9 @@ linear_gradient_LDADD = $(LDADDS)
 move_to_show_surface_LDADD = $(LDADDS)
 path_data_LDADD = $(LDADDS)
 pixman_rotate_LDADD = $(LDADDS)
-surface_finish_twice_LDADD = $(LDADDS)
 select_font_no_show_text_LDADD = $(LDADDS)
+set_source_LDADD = $(LDADDS)
+surface_finish_twice_LDADD = $(LDADDS)
 text_cache_crash_LDADD = $(LDADDS)
 text_rotate_LDADD = $(LDADDS)
 transforms_LDADD = $(LDADDS)
diff --git a/test/set-source-ref.png b/test/set-source-ref.png
new file mode 100644
index 000000000..c5d5e9205
Binary files /dev/null and b/test/set-source-ref.png differ
diff --git a/test/set-source.c b/test/set-source.c
new file mode 100644
index 000000000..b4d46c8a1
--- /dev/null
+++ b/test/set-source.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2005 Red Hat, 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
+ * Red Hat, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Red Hat, Inc. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL RED HAT, 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: Carl D. Worth <cworth@cworth.org>
+ */
+
+#include "cairo-test.h"
+
+cairo_test_t test = {
+    "set-source",
+    "Tests calls to various set_source functions",
+    5, 5
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    int i;
+    /* This color value might need to change in the future when we fix
+     * the rounding in cairo-color.c */
+    unsigned long color = 0x7f19334C;
+    cairo_surface_t *surface;
+    cairo_pattern_t *pattern;
+
+    surface = cairo_surface_create_for_image ((unsigned char *) &color,
+					      CAIRO_FORMAT_ARGB32, 1, 1, 4);
+    pattern = cairo_pattern_create_for_surface (surface);
+    cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+
+    /* Several different means of making mostly the same color (though
+     * we can't get anything but alpha==1.0 out of
+     * cairo_set_source_rgb. */
+    for (i=0; i < width; i++) {
+	switch (i) {
+	case 0:
+	    cairo_set_rgb_color (cr, .6, .7, .8);
+	    break;
+	case 1:
+	    cairo_set_rgb_color (cr, .2, .4, .6);
+	    cairo_set_alpha (cr, 0.5);
+	    break;
+	case 2:
+	    /* XXX: When ported, this should become:
+	    cairo_set_source_rgba_premultiplied (cr, .1, .2, .3, 0.5);
+	    */
+	    cairo_set_rgb_color (cr, .2, .4, .6);
+	    cairo_set_alpha (cr, 0.5);
+	    break;
+	case 3:
+	default:
+	    cairo_set_alpha (cr, 1.0);
+	    cairo_set_pattern (cr, pattern);
+	    break;
+	}
+
+	cairo_rectangle (cr, i, 0, 1, height);
+	cairo_fill (cr);
+    }
+
+    cairo_pattern_destroy (pattern);
+    cairo_surface_destroy (surface);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test, draw);
+}