diff --git a/test/bitmap-font-ref.png b/test/bitmap-font-ref.png
index 886c62f31..0718bf96a 100644
Binary files a/test/bitmap-font-ref.png and b/test/bitmap-font-ref.png differ
diff --git a/test/bitmap-font-rgb24-ref.png b/test/bitmap-font-rgb24-ref.png
index abea9b1a5..856906425 100644
Binary files a/test/bitmap-font-rgb24-ref.png and b/test/bitmap-font-rgb24-ref.png differ
diff --git a/test/bitmap-font.c b/test/bitmap-font.c
index 16ad52ca5..594e8135f 100644
--- a/test/bitmap-font.c
+++ b/test/bitmap-font.c
@@ -40,7 +40,7 @@ static cairo_test_draw_function_t draw;
 cairo_test_t test = {
     "bitmap-font",
     "Test drawing with a font consisting only of bitmaps",
-    246 + 1, TEXT_SIZE,
+    246 + 1, 2 * TEXT_SIZE,
     draw
 };
 
@@ -99,6 +99,15 @@ draw (cairo_t *cr, int width, int height)
     cairo_set_source_rgb (cr, 0.0, 0.0, 1.0); /* blue */
     cairo_show_text (cr, "the quick brown fox jumps over a lazy dog");
 
+    /* And test it rotated as well. */
+
+    /* XXX: The math for the vertical positioning here is all wrong,
+     * but it is landing where I want it. Someone who understands
+     * fonts at all should fix this. */
+    cairo_move_to (cr, width -1, 2 * (TEXT_SIZE - 5));
+    cairo_rotate (cr, M_PI);
+    cairo_show_text (cr, "the quick brown fox jumps over a lazy dog");
+
     return CAIRO_TEST_SUCCESS;
 }