diff --git a/test/Makefile.am b/test/Makefile.am
index ec151c57c..5e3c36795 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -184,7 +184,7 @@ unantialiased-shapes$(EXEEXT)				\
 unbounded-operator$(EXEEXT)				\
 user-data$(EXEEXT)					\
 user-font$(EXEEXT)					\
-user-font-image$(EXEEXT)				\
+user-font-mask$(EXEEXT)					\
 user-font-proxy$(EXEEXT)				\
 user-font-rescale$(EXEEXT)				\
 zero-alpha$(EXEEXT)
@@ -937,7 +937,7 @@ REFERENCE_IMAGES = \
 	user-font-ps3-ref.png \
 	user-font-svg12-ref.png	\
 	user-font-svg11-ref.png	\
-	user-font-image-ref.png	\
+	user-font-mask-ref.png	\
 	user-font-proxy-ref.png	\
 	user-font-proxy-pdf-ref.png	\
 	user-font-proxy-ps2-ref.png	\
diff --git a/test/user-font-image-ref.png b/test/user-font-mask-ref.png
similarity index 100%
rename from test/user-font-image-ref.png
rename to test/user-font-mask-ref.png
diff --git a/test/user-font-image.c b/test/user-font-mask.c
similarity index 98%
rename from test/user-font-image.c
rename to test/user-font-mask.c
index 2c5033920..33f9249e0 100644
--- a/test/user-font-image.c
+++ b/test/user-font-mask.c
@@ -42,8 +42,8 @@
 static cairo_test_draw_function_t draw;
 
 static const cairo_test_t test = {
-    "user-font-image",
-    "Tests a user-font using bitmap images",
+    "user-font-mask",
+    "Tests a user-font using cairo_mask with bitmap images",
 #ifndef ROTATED
     WIDTH, HEIGHT,
 #else