diff --git a/test/.gitignore b/test/.gitignore
index c3a021824..c0881dcb6 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -71,6 +71,7 @@ pthread-show-text
 rectangle-rounding-error
 rel-path
 scale-source-surface-paint
+select-font-face
 select-font-no-show-text
 self-copy
 self-intersecting
diff --git a/test/Makefile.am b/test/Makefile.am
index 90b5a9c08..b7b440a44 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -48,6 +48,7 @@ pattern-get-type		\
 pixman-rotate			\
 rectangle-rounding-error	\
 scale-source-surface-paint	\
+select-font-face		\
 select-font-no-show-text	\
 self-copy			\
 self-intersecting		\
@@ -205,6 +206,7 @@ romedalen.png						\
 scale-source-surface-paint-ref.png			\
 scale-source-surface-paint-rgb24-ref.png		\
 scale-source-surface-paint-pdf-argb32-ref.png		\
+select-font-face-ref.png				\
 self-copy-ref.png					\
 self-intersecting-ref.png				\
 self-intersecting-rgb24-ref.png				\
diff --git a/test/select-font-face-ref.png b/test/select-font-face-ref.png
new file mode 100644
index 000000000..a4d0670d7
Binary files /dev/null and b/test/select-font-face-ref.png differ
diff --git a/test/select-font-face.c b/test/select-font-face.c
new file mode 100644
index 000000000..50a28ff91
--- /dev/null
+++ b/test/select-font-face.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2006 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"
+
+#define TEXT_SIZE 12
+
+cairo_test_t test = {
+    "select-font-face",
+    "Tests using cairo_select_font_face to draw text in different faces",
+    188, TEXT_SIZE + 4
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_font_options_t *font_options;
+
+    /* We draw in the default black, so paint white first. */
+    cairo_save (cr);
+    cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
+    cairo_paint (cr);
+    cairo_restore (cr);
+
+    font_options = cairo_font_options_create ();
+
+    cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE);
+    cairo_font_options_set_hint_style (font_options, CAIRO_HINT_METRICS_OFF);
+    cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_GRAY);
+
+    cairo_set_font_options (cr, font_options);
+    cairo_font_options_destroy (font_options);
+
+    cairo_set_source_rgb (cr, 0, 0, 0); /* black */
+
+    cairo_select_font_face (cr, "Bitstream Vera Serif",
+			    CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size (cr, TEXT_SIZE);
+
+    cairo_move_to (cr, 0, TEXT_SIZE);
+    cairo_show_text (cr, "i-am-serif");
+
+    cairo_select_font_face (cr, "Bitstream Vera Sans",
+			    CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_show_text (cr, " i-am-sans");
+
+    cairo_select_font_face (cr, "Bitstream Vera Sans Mono",
+			    CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_show_text (cr, " i-am-mono");
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test, draw);
+}