[test] Use '.' as the field separator in the names

We frequently use '-' within the test name or format name and so we
encounter confusion as '-' is also used as the field separator. At times
this has caused a new test to break an old test because the new test would
match one of the old test's target specific reference images. So switch
everything over to use '.' between fields (test name, target, format,
subtest, etc.).

715 files changed, 782 insertions, 752 deletions

diff --git a/test/.gitignore b/test/.gitignore
index ad707683d..24ec7a61c 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -17,10 +17,10 @@ pdf2png
 ps2png
 svg2png
 valgrind-log
-*-out.*
-*-pass.*
-*-fail.*
-*-diff.png
+*.out.*
+*.pass.*
+*.fail.*
+*.diff.png
 *.manifest
 *.gcda
 *.gcno
diff --git a/test/Makefile.am b/test/Makefile.am
index 46c68ba88..d49f2abb0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -292,703 +292,703 @@ CLEANFILES += $(BUILT_SOURCES)
 
 # All tests which have a reference image go here.
 REFERENCE_IMAGES = \
-	a1-image-sample-ref.png		\
-	a1-mask-ref.png	\
-	a1-traps-sample-ref.png		\
-	a8-mask-ref.png	\
-	alpha-similar-ref.png	\
-	alpha-similar-rgb24-ref.png	\
-	big-line-ref.png		\
-	big-line-rgb24-ref.png		\
-	big-line-ps2-ref.png		\
-	big-line-ps3-ref.png		\
-	big-line-ps2-rgb24-ref.png	\
-	big-line-ps3-rgb24-ref.png	\
-	big-line-quartz-ref.png		\
-	big-line-quartz-rgb24-ref.png	\
-	bilevel-image-ref.png		\
-	bitmap-font-ref.png	\
-	bitmap-font-rgb24-ref.png	\
-	caps-joins-alpha-quartz-ref.png	\
-	caps-joins-alpha-ref.png	\
-	caps-joins-alpha-svg12-ref.png	\
-	caps-joins-alpha-svg11-ref.png	\
-	caps-joins-ref.png	\
-	caps-joins-ps2-ref.png	\
-	caps-joins-ps3-ref.png	\
-	caps-sub-paths-ref.png	\
-	clip-all-ref.png	\
-	clip-empty-ref.png	\
-	clip-fill-rule-pixel-aligned-ref.png	\
-	clip-fill-rule-pixel-aligned-rgb24-ref.png	\
-	clip-fill-rule-ps2-argb32-ref.png	\
-	clip-fill-rule-ps3-argb32-ref.png	\
-	clip-fill-rule-ps2-rgb24-ref.png		\
-	clip-fill-rule-ps3-rgb24-ref.png		\
-	clip-fill-rule-ref.png	\
-	clip-fill-rule-rgb24-ref.png	\
-	clip-nesting-ps2-argb32-ref.png	\
-	clip-nesting-ps3-argb32-ref.png	\
-	clip-nesting-ps2-rgb24-ref.png	\
-	clip-nesting-ps3-rgb24-ref.png	\
-	clip-nesting-quartz-ref.png	\
-	clip-nesting-quartz-rgb24-ref.png	\
-	clip-nesting-ref.png	\
-	clip-nesting-rgb24-ref.png	\
-	clip-operator-ref.png	\
-	clip-operator-pdf-argb32-ref.png \
-	clip-operator-pdf-rgb24-ref.png \
-	clip-operator-ps2-rgb24-ref.png	\
-	clip-operator-ps3-rgb24-ref.png	\
-	clip-operator-ps3-ref.png	\
-	clip-operator-rgb24-ref.png	\
-	clip-operator-quartz-ref.png	\
-	clip-operator-quartz-rgb24-ref.png	\
-	clip-push-group-ps2-argb32-ref.png	\
-	clip-push-group-ps3-argb32-ref.png	\
-	clip-push-group-ps2-rgb24-ref.png	\
-	clip-push-group-ps3-rgb24-ref.png	\
-	clip-push-group-quartz-ref.png	\
-	clip-push-group-ref.png	\
-	clip-twice-ps2-argb32-ref.png	\
-	clip-twice-ps3-argb32-ref.png	\
-	clip-twice-ps2-rgb24-ref.png	\
-	clip-twice-ps3-rgb24-ref.png	\
-	clip-twice-quartz-ref.png	\
-	clip-twice-quartz-rgb24-ref.png	\
-	clip-twice-ref.png	\
-	clip-twice-rgb24-ref.png	\
-	clipped-group-ref.png	\
-	clipped-group-ps2-ref.png	\
-	clipped-group-ps3-ref.png	\
-	clipped-surface-ref.png	\
-	close-path-ref.png	\
-	close-path-ps2-ref.png	\
-	close-path-ps3-ref.png	\
-	composite-integer-translate-over-ref.png	\
-	composite-integer-translate-over-ps2-ref.png	\
-	composite-integer-translate-over-ps3-ref.png	\
-	composite-integer-translate-over-repeat-ref.png	\
-	composite-integer-translate-over-repeat-ps2-ref.png	\
-	composite-integer-translate-over-repeat-ps3-ref.png	\
-	composite-integer-translate-source-ref.png	\
-	composite-integer-translate-source-ps2-ref.png	\
-	composite-integer-translate-source-ps3-ref.png	\
-	copy-path-ps2-ref.png	\
-	copy-path-ps3-ref.png	\
-	copy-path-ref.png	\
-	create-from-png-ref.png			\
-	create-from-png-alpha-ref.png		\
-	create-from-png-gray-ref.png		\
-	create-from-png-gray-alpha-ref.png	\
-	create-from-png-indexed-ref.png		\
-	create-from-png-indexed-alpha-ref.png	\
-	create-from-png-stream-ref.png	\
-	dash-caps-joins-ps2-argb32-ref.png	\
-	dash-caps-joins-ps3-argb32-ref.png	\
-	dash-caps-joins-ps2-rgb24-ref.png	\
-	dash-caps-joins-ps3-rgb24-ref.png	\
-	dash-caps-joins-quartz-ref.png	\
-	dash-caps-joins-ref.png	\
-	dash-curve-ref.png	\
-	dash-curve-ps2-ref.png \
-	dash-curve-ps3-ref.png \
-	dash-curve-quartz-ref.png \
-	dash-no-dash-ref.png	\
-	dash-offset-negative-ref.png	\
-	dash-scale-ps2-argb32-ref.png	\
-	dash-scale-ps3-argb32-ref.png	\
-	dash-scale-ps2-rgb24-ref.png	\
-	dash-scale-ps3-rgb24-ref.png	\
-	dash-scale-quartz-ref.png	\
-	dash-scale-ref.png	\
-	dash-state-ps2-ref.png	\
-	dash-state-ps3-ref.png	\
-	dash-state-ref.png	\
-	dash-state-quartz-ref.png	\
-	dash-zero-length-ps2-ref.png	\
-	dash-zero-length-ps3-ref.png	\
-	dash-zero-length-ps2-rgb24-ref.png	\
-	dash-zero-length-ps3-rgb24-ref.png	\
-	dash-zero-length-ref.png	\
-	dash-zero-length-rgb24-ref.png	\
-	degenerate-arc-ref.png		\
-	degenerate-arc-ps2-ref.png	\
-	degenerate-arc-ps3-ref.png	\
-	degenerate-dash-ref.png		\
-	degenerate-pen-ref.png		\
-	degenerate-pen-ps2-ref.png	\
-	degenerate-pen-ps3-ref.png	\
-	degenerate-pen-quartz-ref.png	\
-	degenerate-path-ps2-argb32-ref.png	\
-	degenerate-path-ps2-rgb24-ref.png	\
-	degenerate-path-ps3-argb32-ref.png	\
-	degenerate-path-ps3-rgb24-ref.png	\
-	degenerate-path-ref.png	\
-	degenerate-path-rgb24-ref.png	\
-	degenerate-path-quartz-ref.png	\
-	degenerate-path-quartz-rgb24-ref.png	\
-	device-offset-fractional-ref.png	\
-	device-offset-fractional-pdf-ref.png	\
-	device-offset-fractional-ps2-ref.png	\
-	device-offset-fractional-ps3-ref.png	\
-	device-offset-positive-ref.png	\
-	device-offset-positive-rgb24-ref.png	\
-	device-offset-ref.png	\
-	device-offset-rgb24-ref.png	\
-	device-offset-scale-ref.png	\
-	extend-pad-ref.png	\
-	extend-reflect-ref.png	\
-	extend-reflect-similar-ref.png	\
-	extend-reflect-similar-ps2-ref.png	\
-	extend-reflect-similar-ps3-ref.png	\
-	extend-reflect-ps2-ref.png \
-	extend-reflect-ps3-ref.png \
-	extend-repeat-ref.png	\
-	extend-repeat-ps2-ref.png	\
-	extend-repeat-ps3-ref.png	\
-	extend-repeat-similar-ref.png	\
-	extend-repeat-similar-ps2-ref.png	\
-	extend-repeat-similar-ps3-ref.png	\
-	fallback-resolution-ppi37.5x37.5-ref.png \
-	fallback-resolution-ppi37.5x72-ref.png \
-	fallback-resolution-ppi37.5x75-ref.png \
-	fallback-resolution-ppi37.5x150-ref.png \
-	fallback-resolution-ppi37.5x300-ref.png \
-	fallback-resolution-ppi37.5x600-ref.png \
-	fallback-resolution-ppi72x37.5-ref.png \
-	fallback-resolution-ppi72x72-ref.png \
-	fallback-resolution-ppi72x75-ref.png \
-	fallback-resolution-ppi72x150-ref.png \
-	fallback-resolution-ppi72x300-ref.png \
-	fallback-resolution-ppi72x600-ref.png \
-	fallback-resolution-ppi75x37.5-ref.png \
-	fallback-resolution-ppi75x72-ref.png \
-	fallback-resolution-ppi75x75-ref.png \
-	fallback-resolution-ppi75x150-ref.png \
-	fallback-resolution-ppi75x300-ref.png \
-	fallback-resolution-ppi75x600-ref.png \
-	fallback-resolution-ppi150x37.5-ref.png \
-	fallback-resolution-ppi150x72-ref.png \
-	fallback-resolution-ppi150x75-ref.png \
-	fallback-resolution-ppi150x150-ref.png \
-	fallback-resolution-ppi150x300-ref.png \
-	fallback-resolution-ppi150x600-ref.png \
-	fallback-resolution-ppi300x37.5-ref.png \
-	fallback-resolution-ppi300x72-ref.png \
-	fallback-resolution-ppi300x75-ref.png \
-	fallback-resolution-ppi300x150-ref.png \
-	fallback-resolution-ppi300x300-ref.png \
-	fallback-resolution-ppi300x600-ref.png \
-	fallback-resolution-ppi600x37.5-ref.png \
-	fallback-resolution-ppi600x72-ref.png \
-	fallback-resolution-ppi600x75-ref.png \
-	fallback-resolution-ppi600x150-ref.png \
-	fallback-resolution-ppi600x300-ref.png \
-	fallback-resolution-ppi600x600-ref.png \
-	fill-alpha-ref.png	\
-	fill-alpha-pattern-ref.png	\
-	fill-alpha-pattern-pdf-argb32-ref.png	\
-	fill-alpha-pattern-pdf-rgb24-ref.png	\
-	fill-alpha-pattern-ps3-ref.png	\
-	fill-and-stroke-alpha-add-quartz-ref.png	\
-	fill-and-stroke-alpha-add-ref.png	\
-	fill-and-stroke-alpha-quartz-ref.png	\
-	fill-and-stroke-alpha-ref.png	\
-	fill-and-stroke-ps2-argb32-ref.png	\
-	fill-and-stroke-ps3-argb32-ref.png	\
-	fill-and-stroke-ps2-rgb24-ref.png	\
-	fill-and-stroke-ps3-rgb24-ref.png	\
-	fill-and-stroke-quartz-ref.png	\
-	fill-and-stroke-quartz-rgb24-ref.png	\
-	fill-and-stroke-ref.png	\
-	fill-and-stroke-rgb24-ref.png	\
-	fill-degenerate-sort-order-quartz-ref.png	\
-	fill-degenerate-sort-order-quartz-rgb24-ref.png	\
-	fill-degenerate-sort-order-ref.png	\
-	fill-degenerate-sort-order-rgb24-ref.png	\
-	fill-missed-stop-ps2-argb32-ref.png	\
-	fill-missed-stop-ps3-argb32-ref.png	\
-	fill-missed-stop-ps2-rgb24-ref.png	\
-	fill-missed-stop-ps3-rgb24-ref.png	\
-	fill-missed-stop-ref.png	\
-	fill-missed-stop-rgb24-ref.png	\
-	fill-rule-ps2-argb32-ref.png	\
-	fill-rule-ps3-argb32-ref.png	\
-	fill-rule-ps2-rgb24-ref.png \
-	fill-rule-ps3-rgb24-ref.png \
-	fill-rule-quartz-ref.png	\
-	fill-rule-quartz-rgb24-ref.png	\
-	fill-rule-ref.png	\
-	fill-rule-rgb24-ref.png	\
-	filter-bilinear-extents-ref.png \
-	filter-bilinear-extents-pdf-ref.png \
-	filter-bilinear-extents-ps2-ref.png \
-	filter-bilinear-extents-ps3-ref.png \
-	filter-nearest-offset-ref.png	\
-	filter-nearest-offset-pdf-ref.png	\
-	filter-nearest-offset-ps2-ref.png	\
-	filter-nearest-offset-ps3-ref.png	\
-	filter-nearest-offset-svg11-ref.png	\
-	filter-nearest-offset-svg12-ref.png	\
-	filter-nearest-transformed-ref.png	\
-	filter-nearest-transformed-pdf-ref.png	\
-	filter-nearest-transformed-svg11-ref.png	\
-	filter-nearest-transformed-svg12-ref.png	\
-	finer-grained-fallbacks-ref.png			\
-	finer-grained-fallbacks-rgb24-ref.png		\
-	finer-grained-fallbacks-ps2-ref.png	\
-	finer-grained-fallbacks-ps2-rgb24-ref.png	\
-	finer-grained-fallbacks-ps3-ref.png	\
-	finer-grained-fallbacks-ps3-rgb24-ref.png	\
-	font-matrix-translation-ps2-argb32-ref.png	\
-	font-matrix-translation-ps3-argb32-ref.png	\
-	font-matrix-translation-ps2-rgb24-ref.png	\
-	font-matrix-translation-ps3-rgb24-ref.png	\
-	font-matrix-translation-ref.png	\
-	font-matrix-translation-svg12-ref.png	\
-	font-matrix-translation-svg11-ref.png	\
-	font-matrix-translation-quartz-ref.png \
-	ft-text-antialias-none-ps2-argb32-ref.png	\
-	ft-text-antialias-none-ps3-argb32-ref.png	\
-	ft-text-antialias-none-ref.png	\
-	ft-show-glyphs-positioning-ref.png		\
-	ft-show-glyphs-positioning-pdf-ref.png		\
-	ft-show-glyphs-positioning-ps2-ref.png		\
-	ft-show-glyphs-positioning-ps3-ref.png		\
-	ft-show-glyphs-positioning-svg12-ref.png		\
-	ft-show-glyphs-positioning-svg11-ref.png		\
-	ft-show-glyphs-table-ref.png			\
-	ft-show-glyphs-table-ps2-ref.png			\
-	ft-show-glyphs-table-ps3-ref.png			\
-	ft-text-vertical-layout-type1-pdf-ref.png	\
-	ft-text-vertical-layout-type1-ps2-ref.png	\
-	ft-text-vertical-layout-type1-ps3-ref.png	\
-	ft-text-vertical-layout-type1-ref.png	\
-	ft-text-vertical-layout-type1-svg12-ref.png	\
-	ft-text-vertical-layout-type1-svg11-ref.png	\
-	ft-text-vertical-layout-type3-pdf-ref.png	\
-	ft-text-vertical-layout-type3-ps2-ref.png	\
-	ft-text-vertical-layout-type3-ps3-ref.png	\
-	ft-text-vertical-layout-type3-ref.png	\
-	ft-text-vertical-layout-type3-svg12-ref.png	\
-	ft-text-vertical-layout-type3-svg11-ref.png	\
-	get-group-target-ref.png	\
-	glitz-surface-source-ref.png \
-	glyph-cache-pressure-ref.png	\
-	glyph-cache-pressure-ps2-ref.png	\
-	glyph-cache-pressure-ps3-ref.png	\
-	glyph-cache-pressure-quartz-ref.png	\
-	gradient-alpha-pdf-argb32-ref.png	\
-	gradient-alpha-pdf-rgb24-ref.png	\
-	gradient-alpha-ps2-argb32-ref.png	\
-	gradient-alpha-ps3-argb32-ref.png	\
-	gradient-alpha-ps2-rgb24-ref.png	\
-	gradient-alpha-ps3-rgb24-ref.png	\
-	gradient-alpha-ref.png	\
-	gradient-alpha-rgb24-ref.png	\
-	gradient-constant-alpha-pdf-argb32-ref.png	\
-	gradient-constant-alpha-pdf-rgb24-ref.png	\
-	gradient-constant-alpha-ps3-ref.png		\
-	gradient-constant-alpha-ps3-rgb24-ref.png	\
-	gradient-constant-alpha-ref.png	\
-	gradient-constant-alpha-rgb24-ref.png	\
-	gradient-zero-stops-ref.png	\
-	gradient-zero-stops-rgb24-ref.png	\
-	group-paint-ref.png	\
-	huge-pattern-ref.png	\
-	huge-pattern-ps3-ref.png	\
-	huge-pattern-pdf-ref.png	\
-	huge-pattern-pdf-rgb24-ref.png	\
-	image-surface-source-ref.png \
-	image-surface-source-ps2-ref.png \
-	image-surface-source-ps3-ref.png \
-	infinite-join-ref.png	\
-	infinite-join-ps2-ref.png	\
-	infinite-join-ps3-ref.png	\
-	large-clip-ref.png	\
-	large-font-ref.png	\
-	large-source-ref.png	\
-	leaky-dash-ps2-argb32-ref.png	\
-	leaky-dash-ps3-argb32-ref.png	\
-	leaky-dash-ps2-rgb24-ref.png	\
-	leaky-dash-ps3-rgb24-ref.png	\
-	leaky-dash-quartz-ref.png	\
-	leaky-dash-ref.png	\
-	leaky-dashed-rectangle-ref.png		\
-	leaky-dashed-rectangle-ps2-ref.png	\
-	leaky-dashed-rectangle-ps3-ref.png	\
-	leaky-dashed-stroke-ref.png		\
-	leaky-dashed-stroke-ps2-ref.png		\
-	leaky-dashed-stroke-ps3-ref.png		\
-	leaky-polygon-ref.png	\
-	leaky-polygon-ps2-ref.png	\
-	leaky-polygon-ps3-ref.png	\
-	linear-gradient-reflect-ref.png	\
-	linear-gradient-reflect-pdf-argb32-ref.png	\
-	linear-gradient-reflect-pdf-rgb24-ref.png	\
-	linear-gradient-reflect-ps3-ref.png	\
-	linear-gradient-reflect-quartz-ref.png	\
-	linear-gradient-pdf-ref.png	\
-	linear-gradient-ps3-ref.png	\
-	linear-gradient-quartz-ref.png	\
-	linear-gradient-ref.png	\
-	linear-gradient-svg12-ref.png	\
-	linear-gradient-svg11-ref.png	\
-	line-width-ref.png	\
-	line-width-scale-ps2-ref.png	\
-	line-width-scale-ps3-ref.png	\
-	line-width-scale-quartz-ref.png	\
-	line-width-scale-ref.png	\
-	long-dashed-lines-ref.png	\
-	long-dashed-lines-ps2-ref.png	\
-	long-dashed-lines-ps3-ref.png	\
-	long-dashed-lines-quartz-ref.png	\
-	long-lines-ref.png	\
-	mask-alpha-ref.png	\
-	mask-alpha-svg11-argb32-ref.png	\
-	mask-alpha-svg12-argb32-ref.png	\
-	mask-alpha-rgb24-ref.png	\
-	mask-alpha-quartz-argb32-ref.png \
-	mask-ctm-ref.png	\
-	mask-ctm-rgb24-ref.png	\
-	mask-ctm-svg11-argb32-ref.png	\
-	mask-ctm-svg12-argb32-ref.png	\
-	mask-ref.png	\
-	mask-rgb24-ref.png	\
-	mask-pdf-argb32-ref.png	\
-	mask-pdf-rgb24-ref.png	\
-	mask-quartz-ref.png	\
-	mask-quartz-rgb24-ref.png	\
-	mask-surface-ctm-ref.png	\
-	mask-surface-ctm-rgb24-ref.png	\
-	mask-surface-ctm-svg11-argb32-ref.png	\
-	mask-surface-ctm-svg12-argb32-ref.png	\
-	mask-svg11-rgb24-ref.png	\
-	mask-svg11-argb32-ref.png	\
-	mask-svg12-rgb24-ref.png	\
-	mask-svg12-argb32-ref.png	\
-	mask-transformed-image-ref.png	\
-	mask-transformed-similar-ref.png	\
-	mask-transformed-similar-pdf-ref.png	\
-	mask-transformed-similar-svg12-ref.png	\
-	mask-transformed-similar-svg11-ref.png	\
-	meta-surface-pattern-ref.png		\
-	meta-surface-pattern-rgb24-ref.png	\
-	meta-surface-pattern-pdf-ref.png	\
-	meta-surface-pattern-pdf-rgb24-ref.png	\
-	meta-surface-pattern-ps2-argb32-ref.png	\
-	meta-surface-pattern-ps2-rgb24-ref.png	\
-	meta-surface-pattern-ps3-argb32-ref.png	\
-	meta-surface-pattern-ps3-rgb24-ref.png	\
-	meta-surface-pattern-quartz-ref.png	\
-	meta-surface-pattern-quartz-rgb24-ref.png	\
-	meta-surface-pattern-svg11-argb32-ref.png	\
-	meta-surface-pattern-svg11-rgb24-ref.png	\
-	meta-surface-pattern-svg12-argb32-ref.png	\
-	meta-surface-pattern-svg12-rgb24-ref.png	\
-	miter-precision-ref.png \
-	miter-precision-ps2-ref.png	\
-	miter-precision-ps3-ref.png	\
-	move-to-show-surface-ref.png	\
-	new-sub-path-ps2-argb32-ref.png	\
-	new-sub-path-ps3-argb32-ref.png	\
-	new-sub-path-ps2-rgb24-ref.png	\
-	new-sub-path-ps3-rgb24-ref.png	\
-	new-sub-path-quartz-ref.png	\
-	new-sub-path-quartz-rgb24-ref.png	\
-	new-sub-path-ref.png	\
-	new-sub-path-rgb24-ref.png	\
-	nil-surface-ref.png	\
-	nil-surface-rgb24-ref.png	\
-	operator-ref.png	\
-	operator-rgb24-ref.png	\
-	operator-alpha-ref.png	\
-	operator-alpha-rgb24-ref.png	\
-	operator-clear-quartz-ref.png	\
-	operator-clear-quartz-rgb24-ref.png	\
-	operator-clear-ref.png	\
-	operator-clear-rgb24-ref.png	\
-	operator-clear-pdf-argb32-ref.png	\
-	operator-clear-pdf-rgb24-ref.png	\
-	operator-source-pdf-argb32-ref.png	\
-	operator-source-pdf-rgb24-ref.png	\
-	operator-source-ref.png	\
-	operator-source-rgb24-ref.png	\
-	operator-source-quartz-ref.png \
-	operator-source-quartz-rgb24-ref.png \
-	over-above-source-ps2-argb32-ref.png       \
-	over-above-source-ps3-argb32-ref.png       \
-	over-above-source-quartz-ref.png	  \
-	over-above-source-quartz-rgb24-ref.png	  \
-	over-above-source-ref.png                 \
-	over-above-source-rgb24-ref.png           \
-	over-around-source-ps2-argb32-ref.png       \
-	over-around-source-ps3-argb32-ref.png       \
-	over-around-source-ps2-rgb24-ref.png        \
-	over-around-source-ps3-rgb24-ref.png        \
-	over-around-source-quartz-ref.png	   \
-	over-around-source-quartz-rgb24-ref.png	   \
-	over-around-source-ref.png                 \
-	over-around-source-rgb24-ref.png           \
-	over-below-source-ps2-argb32-ref.png       \
-	over-below-source-ps3-argb32-ref.png       \
-	over-below-source-ref.png                 \
-	over-below-source-rgb24-ref.png           \
-	over-between-source-ps2-argb32-ref.png     \
-	over-between-source-ps3-argb32-ref.png     \
-	over-between-source-quartz-ref.png        \
-	over-between-source-quartz-rgb24-ref.png  \
-	over-between-source-ref.png                 \
-	over-between-source-rgb24-ref.png           \
-	paint-ref.png	\
-	paint-repeat-ref.png	\
-	paint-source-alpha-pdf-argb32-ref.png	\
-	paint-source-alpha-ref.png	\
-	paint-source-alpha-svg12-ref.png	\
-	paint-source-alpha-svg11-ref.png	\
-	paint-with-alpha-ref.png	\
-	paint-with-alpha-svg12-ref.png	\
-	paint-with-alpha-svg11-ref.png	\
-	paint-source-alpha-pdf-ref.png \
-	paint-with-alpha-pdf-ref.png \
-	pass-through-ref.png \
-	pass-through-rgb24-ref.png \
-	pattern-getters-ref.png	\
-	pdf-surface-source-ref.png \
-	pixman-rotate-ref.png	\
-	pixman-rotate-rgb24-ref.png	\
-	ps-surface-source-ref.png \
-	push-group-pdf-ref.png \
-	push-group-pdf-rgb24-ref.png \
-	push-group-ref.png	\
-	push-group-rgb24-ref.png	\
-	push-group-svg11-argb32-ref.png	\
-	push-group-svg12-argb32-ref.png	\
-	radial-gradient-ref.png	\
-	radial-gradient-pdf-ref.png \
-	radial-gradient-quartz-ref.png \
-	radial-gradient-svg12-ref.png	\
-	radial-gradient-svg11-ref.png	\
-	random-intersections-ref.png	\
-	random-intersections-ps2-ref.png \
-	random-intersections-ps3-ref.png \
-	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-ps2-ref.png	\
-	rectilinear-miter-limit-ps3-ref.png	\
-	rectilinear-stroke-ref.png	\
-	reflected-stroke-ref.png	\
-	reflected-stroke-ps2-ref.png	\
-	reflected-stroke-ps3-ref.png	\
-	reflected-stroke-quartz-ref.png	\
-	rel-path-quartz-ref.png	\
-	rel-path-quartz-rgb24-ref.png	\
-	rel-path-ps2-rgb24-ref.png	\
-	rel-path-ps3-rgb24-ref.png	\
-	rel-path-ref.png	\
-	rel-path-rgb24-ref.png	\
-	rotate-image-surface-paint-pdf-rgb24-ref.png \
-	rotate-image-surface-paint-ps2-ref.png \
-	rotate-image-surface-paint-ps3-ref.png \
-	rotate-image-surface-paint-pdf-argb32-ref.png	\
-	rotate-image-surface-paint-quartz-ref.png	\
-	rotate-image-surface-paint-ref.png	\
-	rotate-image-surface-paint-svg12-ref.png	\
-	rotate-image-surface-paint-svg11-ref.png	\
-	scale-down-source-surface-paint-ref.png	\
-	scale-source-surface-paint-pdf-argb32-ref.png	\
-	scale-source-surface-paint-ref.png	\
-	scale-source-surface-paint-rgb24-ref.png	\
-	scale-source-surface-paint-svg11-argb32-ref.png	\
-	scale-source-surface-paint-svg11-rgb24-ref.png	\
-	scale-source-surface-paint-svg12-argb32-ref.png	\
-	scale-source-surface-paint-svg12-rgb24-ref.png	\
-	scale-source-surface-paint-pdf-rgb24-ref.png \
-	stroke-ctm-caps-ref.png \
-	stroke-ctm-caps-quartz-ref.png \
-	select-font-face-ref.png	\
-	select-font-face-ps2-ref.png \
-	select-font-face-ps3-ref.png \
-	select-font-face-quartz-ref.png \
-	self-copy-ref.png	\
-	self-copy-ps2-ref.png	\
-	self-copy-ps3-ref.png	\
-	self-copy-overlap-ref.png	\
-	self-copy-overlap-rgb24-ref.png	\
-	self-intersecting-ref.png	\
-	self-intersecting-rgb24-ref.png	\
-	set-source-ref.png	\
-	set-source-rgb24-ref.png	\
-	set-source-svg11-argb32-ref.png	\
-	set-source-svg12-argb32-ref.png	\
-	show-glyphs-many-ref.png	\
-	show-text-current-point-ref.png	\
-	show-text-current-point-ps2-ref.png \
-	show-text-current-point-ps3-ref.png \
-	show-text-current-point-quartz-ref.png \
-	skew-extreme-ref.png \
-	skew-extreme-ps2-ref.png \
-	skew-extreme-ps3-ref.png \
-	smask-ref.png			\
-	smask-pdf-ref.png		\
-	smask-ps2-ref.png		\
-	smask-ps3-ref.png		\
-	smask-svg12-ref.png		\
-	smask-svg11-ref.png		\
-	smask-fill-ref.png		\
-	smask-fill-pdf-ref.png		\
-	smask-fill-svg12-ref.png	\
-	smask-fill-svg11-ref.png	\
-	smask-image-mask-ref.png	\
-	smask-image-mask-pdf-ref.png	\
-	smask-mask-ref.png		\
-	smask-mask-pdf-ref.png		\
-	smask-mask-svg12-ref.png	\
-	smask-mask-svg11-ref.png	\
-	smask-paint-ref.png		\
-	smask-paint-pdf-ref.png		\
-	smask-paint-svg12-ref.png	\
-	smask-paint-svg11-ref.png	\
-	smask-stroke-ref.png		\
-	smask-stroke-pdf-ref.png	\
-	smask-text-ref.png		\
-	smask-text-pdf-ref.png		\
-	smask-text-ps2-ref.png		\
-	smask-text-ps3-ref.png		\
-	smask-text-svg12-ref.png	\
-	smask-text-svg11-ref.png	\
-	stroke-image-ref.png \
-	stroke-image-pdf-ref.png \
-	stroke-image-ps2-ref.png \
-	stroke-image-ps3-ref.png \
-	stroke-image-quartz-ref.png \
-	solid-pattern-cache-stress-ref.png	\
-	source-clip-ref.png	\
-	source-clip-scale-quartz-ref.png	\
-	source-clip-scale-ps2-argb32-ref.png	\
-	source-clip-scale-ps3-argb32-ref.png	\
-	source-clip-scale-ps2-rgb24-ref.png	\
-	source-clip-scale-ps3-rgb24-ref.png	\
-	source-clip-scale-ref.png	\
-	source-clip-scale-svg12-ref.png	\
-	source-clip-scale-svg11-ref.png	\
-	source-clip-scale-pdf-ref.png \
-	source-surface-scale-paint-ref.png	\
-	source-surface-scale-paint-rgb24-ref.png	\
-	spline-decomposition-ref.png \
-	spline-decomposition-ps2-ref.png \
-	spline-decomposition-ps3-ref.png \
-	spline-decomposition-pdf-ref.png \
-	spline-decomposition-svg11-ref.png \
-	spline-decomposition-svg12-ref.png \
-	stroke-ctm-caps-ps2-ref.png \
-	stroke-ctm-caps-ps3-ref.png \
-	surface-pattern-big-scale-down-ref.png	\
-	surface-pattern-pdf-ref.png	\
-	surface-pattern-ps2-ref.png	\
-	surface-pattern-ps3-ref.png	\
-	surface-pattern-ref.png	\
-	surface-pattern-scale-down-pdf-argb32-ref.png	\
-	surface-pattern-scale-down-pdf-rgb24-ref.png	\
-	surface-pattern-scale-down-ps2-ref.png	\
-	surface-pattern-scale-down-ps3-ref.png	\
-	surface-pattern-scale-down-ref.png	\
-	surface-pattern-scale-down-quartz-ref.png	\
-	surface-pattern-scale-up-pdf-argb32-ref.png	\
-	surface-pattern-scale-up-pdf-rgb24-ref.png	\
-	surface-pattern-scale-up-ps2-ref.png	\
-	surface-pattern-scale-up-ps3-ref.png	\
-	surface-pattern-scale-up-ref.png	\
-	surface-pattern-svg12-ref.png	\
-	surface-pattern-svg11-ref.png	\
-	svg-surface-source-ref.png \
-	text-antialias-gray-ref.png	\
-	text-antialias-gray-quartz-ref.png	\
-	text-antialias-none-ref.png	\
-	text-antialias-none-quartz-ref.png	\
-	text-antialias-subpixel-ref.png	\
-	text-antialias-subpixel-quartz-ref.png	\
-	text-glyph-range-ref.png	\
-	text-glyph-range-ps2-ref.png	\
-	text-glyph-range-ps3-ref.png	\
-	text-pattern-ps3-argb32-ref.png	\
-	text-pattern-ps3-rgb24-ref.png	\
-	text-pattern-ref.png	\
-	text-pattern-rgb24-ref.png	\
-	text-pattern-svg11-argb32-ref.png	\
-	text-pattern-svg11-rgb24-ref.png	\
-	text-pattern-svg12-argb32-ref.png	\
-	text-pattern-svg12-rgb24-ref.png	\
-	text-pattern-pdf-argb32-ref.png \
-	text-pattern-pdf-rgb24-ref.png \
-	text-pattern-quartz-ref.png \
-	text-pattern-quartz-rgb24-ref.png \
-	text-rotate-ref.png	\
-	text-rotate-pdf-ref.png \
-	text-rotate-ps2-ref.png	\
-	text-rotate-ps3-ref.png	\
-	text-rotate-svg12-ref.png \
-	text-rotate-svg11-ref.png \
-	text-rotate-quartz-ref.png \
-	text-transform-ref.png		\
-	text-transform-pdf-ref.png	\
-	text-transform-ps2-ref.png	\
-	text-transform-ps3-ref.png	\
-	transforms-ref.png	\
-	transforms-ps2-ref.png	\
-	transforms-ps3-ref.png	\
-	translate-show-surface-ref.png	\
-	trap-clip-quartz-ref.png	\
-	trap-clip-quartz-rgb24-ref.png	\
-	trap-clip-ps3-argb32-ref.png	\
-	trap-clip-ps3-rgb24-ref.png	\
-	trap-clip-ref.png	\
-	trap-clip-rgb24-ref.png	\
-	trap-clip-pdf-argb32-ref.png \
-	trap-clip-pdf-rgb24-ref.png \
-	trap-clip-ps2-argb32-ref.png \
-	trap-clip-ps2-rgb24-ref.png \
-	twin-ref.png \
-	twin-ps2-ref.png \
-	twin-ps3-ref.png \
-	twin-svg11-ref.png \
-	twin-svg12-ref.png \
-	unantialiased-shapes-ref.png	\
-	unantialiased-shapes-quartz-ref.png \
-	unbounded-operator-ref.png	\
-	unbounded-operator-rgb24-ref.png	\
-	user-font-ref.png	\
-	user-font-ps2-ref.png \
-	user-font-ps3-ref.png \
-	user-font-svg12-ref.png	\
-	user-font-svg11-ref.png	\
-	user-font-mask-ref.png		\
-	user-font-mask-pdf-ref.png	\
-	user-font-mask-ps2-ref.png	\
-	user-font-mask-ps3-ref.png	\
-	user-font-mask-svg11-ref.png	\
-	user-font-proxy-ref.png	\
-	user-font-proxy-pdf-ref.png	\
-	user-font-proxy-ps2-ref.png	\
-	user-font-proxy-ps3-ref.png	\
-	user-font-proxy-svg12-ref.png	\
-	user-font-proxy-svg11-ref.png	\
-	user-font-rescale-ref.png	\
-	user-font-rescale-ps2-ref.png	\
-	user-font-rescale-ps3-ref.png	\
-	user-font-rescale-svg12-ref.png	\
-	user-font-rescale-svg11-ref.png	\
-	unbounded-operator-quartz-ref.png	\
-	unbounded-operator-quartz-rgb24-ref.png	\
-	xlib-expose-event-ref.png \
-	xlib-surface-source-ref.png \
-	xlib-surface-source-ps2-ref.png \
-	xlib-surface-source-ps3-ref.png \
-	zero-alpha-ref.png
+	a1-image-sample.ref.png		\
+	a1-mask.ref.png	\
+	a1-traps-sample.ref.png		\
+	a8-mask.ref.png	\
+	alpha-similar.ref.png	\
+	alpha-similar.rgb24.ref.png	\
+	big-line.ref.png		\
+	big-line.rgb24.ref.png		\
+	big-line.ps2.ref.png		\
+	big-line.ps3.ref.png		\
+	big-line.ps2.rgb24.ref.png	\
+	big-line.ps3.rgb24.ref.png	\
+	big-line.quartz.ref.png		\
+	big-line.quartz.rgb24.ref.png	\
+	bilevel-image.ref.png		\
+	bitmap-font.ref.png	\
+	bitmap-font.rgb24.ref.png	\
+	caps-joins-alpha.quartz.ref.png	\
+	caps-joins-alpha.ref.png	\
+	caps-joins-alpha.svg12.ref.png	\
+	caps-joins-alpha.svg11.ref.png	\
+	caps-joins.ref.png	\
+	caps-joins.ps2.ref.png	\
+	caps-joins.ps3.ref.png	\
+	caps-sub-paths.ref.png	\
+	clip-all.ref.png	\
+	clip-empty.ref.png	\
+	clip-fill-rule-pixel-aligned.ref.png	\
+	clip-fill-rule-pixel-aligned.rgb24.ref.png	\
+	clip-fill-rule.ps2.argb32.ref.png	\
+	clip-fill-rule.ps3.argb32.ref.png	\
+	clip-fill-rule.ps2.rgb24.ref.png		\
+	clip-fill-rule.ps3.rgb24.ref.png		\
+	clip-fill-rule.ref.png	\
+	clip-fill-rule.rgb24.ref.png	\
+	clip-nesting.ps2.argb32.ref.png	\
+	clip-nesting.ps3.argb32.ref.png	\
+	clip-nesting.ps2.rgb24.ref.png	\
+	clip-nesting.ps3.rgb24.ref.png	\
+	clip-nesting.quartz.ref.png	\
+	clip-nesting.quartz.rgb24.ref.png	\
+	clip-nesting.ref.png	\
+	clip-nesting.rgb24.ref.png	\
+	clip-operator.ref.png	\
+	clip-operator.pdf.argb32.ref.png \
+	clip-operator.pdf.rgb24.ref.png \
+	clip-operator.ps2.rgb24.ref.png	\
+	clip-operator.ps3.rgb24.ref.png	\
+	clip-operator.ps3.ref.png	\
+	clip-operator.rgb24.ref.png	\
+	clip-operator.quartz.ref.png	\
+	clip-operator.quartz.rgb24.ref.png	\
+	clip-push-group.ps2.argb32.ref.png	\
+	clip-push-group.ps3.argb32.ref.png	\
+	clip-push-group.ps2.rgb24.ref.png	\
+	clip-push-group.ps3.rgb24.ref.png	\
+	clip-push-group.quartz.ref.png	\
+	clip-push-group.ref.png	\
+	clip-twice.ps2.argb32.ref.png	\
+	clip-twice.ps3.argb32.ref.png	\
+	clip-twice.ps2.rgb24.ref.png	\
+	clip-twice.ps3.rgb24.ref.png	\
+	clip-twice.quartz.ref.png	\
+	clip-twice.quartz.rgb24.ref.png	\
+	clip-twice.ref.png	\
+	clip-twice.rgb24.ref.png	\
+	clipped-group.ref.png	\
+	clipped-group.ps2.ref.png	\
+	clipped-group.ps3.ref.png	\
+	clipped-surface.ref.png	\
+	close-path.ref.png	\
+	close-path.ps2.ref.png	\
+	close-path.ps3.ref.png	\
+	composite-integer-translate-over.ref.png	\
+	composite-integer-translate-over.ps2.ref.png	\
+	composite-integer-translate-over.ps3.ref.png	\
+	composite-integer-translate-over-repeat.ref.png	\
+	composite-integer-translate-over-repeat.ps2.ref.png	\
+	composite-integer-translate-over-repeat.ps3.ref.png	\
+	composite-integer-translate-source.ref.png	\
+	composite-integer-translate-source.ps2.ref.png	\
+	composite-integer-translate-source.ps3.ref.png	\
+	copy-path.ps2.ref.png	\
+	copy-path.ps3.ref.png	\
+	copy-path.ref.png	\
+	create-from-png.ref.png			\
+	create-from-png.alpha.ref.png		\
+	create-from-png.gray.ref.png		\
+	create-from-png.gray-alpha.ref.png	\
+	create-from-png.indexed.ref.png		\
+	create-from-png.indexed-alpha.ref.png	\
+	create-from-png-stream.ref.png	\
+	dash-caps-joins.ps2.argb32.ref.png	\
+	dash-caps-joins.ps3.argb32.ref.png	\
+	dash-caps-joins.ps2.rgb24.ref.png	\
+	dash-caps-joins.ps3.rgb24.ref.png	\
+	dash-caps-joins.quartz.ref.png	\
+	dash-caps-joins.ref.png	\
+	dash-curve.ref.png	\
+	dash-curve.ps2.ref.png \
+	dash-curve.ps3.ref.png \
+	dash-curve.quartz.ref.png \
+	dash-no-dash.ref.png	\
+	dash-offset-negative.ref.png	\
+	dash-scale.ps2.argb32.ref.png	\
+	dash-scale.ps3.argb32.ref.png	\
+	dash-scale.ps2.rgb24.ref.png	\
+	dash-scale.ps3.rgb24.ref.png	\
+	dash-scale.quartz.ref.png	\
+	dash-scale.ref.png	\
+	dash-state.ps2.ref.png	\
+	dash-state.ps3.ref.png	\
+	dash-state.ref.png	\
+	dash-state.quartz.ref.png	\
+	dash-zero-length.ps2.ref.png	\
+	dash-zero-length.ps3.ref.png	\
+	dash-zero-length.ps2.rgb24.ref.png	\
+	dash-zero-length.ps3.rgb24.ref.png	\
+	dash-zero-length.ref.png	\
+	dash-zero-length.rgb24.ref.png	\
+	degenerate-arc.ref.png		\
+	degenerate-arc.ps2.ref.png	\
+	degenerate-arc.ps3.ref.png	\
+	degenerate-dash.ref.png		\
+	degenerate-pen.ref.png		\
+	degenerate-pen.ps2.ref.png	\
+	degenerate-pen.ps3.ref.png	\
+	degenerate-pen.quartz.ref.png	\
+	degenerate-path.ps2.argb32.ref.png	\
+	degenerate-path.ps2.rgb24.ref.png	\
+	degenerate-path.ps3.argb32.ref.png	\
+	degenerate-path.ps3.rgb24.ref.png	\
+	degenerate-path.ref.png	\
+	degenerate-path.rgb24.ref.png	\
+	degenerate-path.quartz.ref.png	\
+	degenerate-path.quartz.rgb24.ref.png	\
+	device-offset-fractional.ref.png	\
+	device-offset-fractional.pdf.ref.png	\
+	device-offset-fractional.ps2.ref.png	\
+	device-offset-fractional.ps3.ref.png	\
+	device-offset-positive.ref.png	\
+	device-offset-positive.rgb24.ref.png	\
+	device-offset.ref.png	\
+	device-offset.rgb24.ref.png	\
+	device-offset-scale.ref.png	\
+	extend-pad.ref.png	\
+	extend-reflect.ref.png	\
+	extend-reflect-similar.ref.png	\
+	extend-reflect-similar.ps2.ref.png	\
+	extend-reflect-similar.ps3.ref.png	\
+	extend-reflect.ps2.ref.png \
+	extend-reflect.ps3.ref.png \
+	extend-repeat.ref.png	\
+	extend-repeat.ps2.ref.png	\
+	extend-repeat.ps3.ref.png	\
+	extend-repeat-similar.ref.png	\
+	extend-repeat-similar.ps2.ref.png	\
+	extend-repeat-similar.ps3.ref.png	\
+	fallback-resolution.ppi37.5x37.5.ref.png \
+	fallback-resolution.ppi37.5x72.ref.png \
+	fallback-resolution.ppi37.5x75.ref.png \
+	fallback-resolution.ppi37.5x150.ref.png \
+	fallback-resolution.ppi37.5x300.ref.png \
+	fallback-resolution.ppi37.5x600.ref.png \
+	fallback-resolution.ppi72x37.5.ref.png \
+	fallback-resolution.ppi72x72.ref.png \
+	fallback-resolution.ppi72x75.ref.png \
+	fallback-resolution.ppi72x150.ref.png \
+	fallback-resolution.ppi72x300.ref.png \
+	fallback-resolution.ppi72x600.ref.png \
+	fallback-resolution.ppi75x37.5.ref.png \
+	fallback-resolution.ppi75x72.ref.png \
+	fallback-resolution.ppi75x75.ref.png \
+	fallback-resolution.ppi75x150.ref.png \
+	fallback-resolution.ppi75x300.ref.png \
+	fallback-resolution.ppi75x600.ref.png \
+	fallback-resolution.ppi150x37.5.ref.png \
+	fallback-resolution.ppi150x72.ref.png \
+	fallback-resolution.ppi150x75.ref.png \
+	fallback-resolution.ppi150x150.ref.png \
+	fallback-resolution.ppi150x300.ref.png \
+	fallback-resolution.ppi150x600.ref.png \
+	fallback-resolution.ppi300x37.5.ref.png \
+	fallback-resolution.ppi300x72.ref.png \
+	fallback-resolution.ppi300x75.ref.png \
+	fallback-resolution.ppi300x150.ref.png \
+	fallback-resolution.ppi300x300.ref.png \
+	fallback-resolution.ppi300x600.ref.png \
+	fallback-resolution.ppi600x37.5.ref.png \
+	fallback-resolution.ppi600x72.ref.png \
+	fallback-resolution.ppi600x75.ref.png \
+	fallback-resolution.ppi600x150.ref.png \
+	fallback-resolution.ppi600x300.ref.png \
+	fallback-resolution.ppi600x600.ref.png \
+	fill-alpha.ref.png	\
+	fill-alpha-pattern.ref.png	\
+	fill-alpha-pattern.pdf.argb32.ref.png	\
+	fill-alpha-pattern.pdf.rgb24.ref.png	\
+	fill-alpha-pattern.ps3.ref.png	\
+	fill-and-stroke-alpha-add.quartz.ref.png	\
+	fill-and-stroke-alpha-add.ref.png	\
+	fill-and-stroke-alpha.quartz.ref.png	\
+	fill-and-stroke-alpha.ref.png	\
+	fill-and-stroke.ps2.argb32.ref.png	\
+	fill-and-stroke.ps3.argb32.ref.png	\
+	fill-and-stroke.ps2.rgb24.ref.png	\
+	fill-and-stroke.ps3.rgb24.ref.png	\
+	fill-and-stroke.quartz.ref.png	\
+	fill-and-stroke.quartz.rgb24.ref.png	\
+	fill-and-stroke.ref.png	\
+	fill-and-stroke.rgb24.ref.png	\
+	fill-degenerate-sort-order.quartz.ref.png	\
+	fill-degenerate-sort-order.quartz.rgb24.ref.png	\
+	fill-degenerate-sort-order.ref.png	\
+	fill-degenerate-sort-order.rgb24.ref.png	\
+	fill-missed-stop.ps2.argb32.ref.png	\
+	fill-missed-stop.ps3.argb32.ref.png	\
+	fill-missed-stop.ps2.rgb24.ref.png	\
+	fill-missed-stop.ps3.rgb24.ref.png	\
+	fill-missed-stop.ref.png	\
+	fill-missed-stop.rgb24.ref.png	\
+	fill-rule.ps2.argb32.ref.png	\
+	fill-rule.ps3.argb32.ref.png	\
+	fill-rule.ps2.rgb24.ref.png \
+	fill-rule.ps3.rgb24.ref.png \
+	fill-rule.quartz.ref.png	\
+	fill-rule.quartz.rgb24.ref.png	\
+	fill-rule.ref.png	\
+	fill-rule.rgb24.ref.png	\
+	filter-bilinear-extents.ref.png \
+	filter-bilinear-extents.pdf.ref.png \
+	filter-bilinear-extents.ps2.ref.png \
+	filter-bilinear-extents.ps3.ref.png \
+	filter-nearest-offset.ref.png	\
+	filter-nearest-offset.pdf.ref.png	\
+	filter-nearest-offset.ps2.ref.png	\
+	filter-nearest-offset.ps3.ref.png	\
+	filter-nearest-offset.svg11.ref.png	\
+	filter-nearest-offset.svg12.ref.png	\
+	filter-nearest-transformed.ref.png	\
+	filter-nearest-transformed.pdf.ref.png	\
+	filter-nearest-transformed.svg11.ref.png	\
+	filter-nearest-transformed.svg12.ref.png	\
+	finer-grained-fallbacks.ref.png			\
+	finer-grained-fallbacks.rgb24.ref.png		\
+	finer-grained-fallbacks.ps2.ref.png	\
+	finer-grained-fallbacks.ps2.rgb24.ref.png	\
+	finer-grained-fallbacks.ps3.ref.png	\
+	finer-grained-fallbacks.ps3.rgb24.ref.png	\
+	font-matrix-translation.ps2.argb32.ref.png	\
+	font-matrix-translation.ps3.argb32.ref.png	\
+	font-matrix-translation.ps2.rgb24.ref.png	\
+	font-matrix-translation.ps3.rgb24.ref.png	\
+	font-matrix-translation.ref.png	\
+	font-matrix-translation.svg12.ref.png	\
+	font-matrix-translation.svg11.ref.png	\
+	font-matrix-translation.quartz.ref.png \
+	ft-text-antialias-none.ps2.argb32.ref.png	\
+	ft-text-antialias-none.ps3.argb32.ref.png	\
+	ft-text-antialias-none.ref.png	\
+	ft-show-glyphs-positioning.ref.png		\
+	ft-show-glyphs-positioning.pdf.ref.png		\
+	ft-show-glyphs-positioning.ps2.ref.png		\
+	ft-show-glyphs-positioning.ps3.ref.png		\
+	ft-show-glyphs-positioning.svg12.ref.png		\
+	ft-show-glyphs-positioning.svg11.ref.png		\
+	ft-show-glyphs-table.ref.png			\
+	ft-show-glyphs-table.ps2.ref.png			\
+	ft-show-glyphs-table.ps3.ref.png			\
+	ft-text-vertical-layout-type1.pdf.ref.png	\
+	ft-text-vertical-layout-type1.ps2.ref.png	\
+	ft-text-vertical-layout-type1.ps3.ref.png	\
+	ft-text-vertical-layout-type1.ref.png	\
+	ft-text-vertical-layout-type1.svg12.ref.png	\
+	ft-text-vertical-layout-type1.svg11.ref.png	\
+	ft-text-vertical-layout-type3.pdf.ref.png	\
+	ft-text-vertical-layout-type3.ps2.ref.png	\
+	ft-text-vertical-layout-type3.ps3.ref.png	\
+	ft-text-vertical-layout-type3.ref.png	\
+	ft-text-vertical-layout-type3.svg12.ref.png	\
+	ft-text-vertical-layout-type3.svg11.ref.png	\
+	get-group-target.ref.png	\
+	glitz-surface-source.ref.png \
+	glyph-cache-pressure.ref.png	\
+	glyph-cache-pressure.ps2.ref.png	\
+	glyph-cache-pressure.ps3.ref.png	\
+	glyph-cache-pressure.quartz.ref.png	\
+	gradient-alpha.pdf.argb32.ref.png	\
+	gradient-alpha.pdf.rgb24.ref.png	\
+	gradient-alpha.ps2.argb32.ref.png	\
+	gradient-alpha.ps3.argb32.ref.png	\
+	gradient-alpha.ps2.rgb24.ref.png	\
+	gradient-alpha.ps3.rgb24.ref.png	\
+	gradient-alpha.ref.png	\
+	gradient-alpha.rgb24.ref.png	\
+	gradient-constant-alpha.pdf.argb32.ref.png	\
+	gradient-constant-alpha.pdf.rgb24.ref.png	\
+	gradient-constant-alpha.ps3.ref.png		\
+	gradient-constant-alpha.ps3.rgb24.ref.png	\
+	gradient-constant-alpha.ref.png	\
+	gradient-constant-alpha.rgb24.ref.png	\
+	gradient-zero-stops.ref.png	\
+	gradient-zero-stops.rgb24.ref.png	\
+	group-paint.ref.png	\
+	huge-pattern.ref.png	\
+	huge-pattern.ps3.ref.png	\
+	huge-pattern.pdf.ref.png	\
+	huge-pattern.pdf.rgb24.ref.png	\
+	image-surface-source.ref.png \
+	image-surface-source.ps2.ref.png \
+	image-surface-source.ps3.ref.png \
+	infinite-join.ref.png	\
+	infinite-join.ps2.ref.png	\
+	infinite-join.ps3.ref.png	\
+	large-clip.ref.png	\
+	large-font.ref.png	\
+	large-source.ref.png	\
+	leaky-dash.ps2.argb32.ref.png	\
+	leaky-dash.ps3.argb32.ref.png	\
+	leaky-dash.ps2.rgb24.ref.png	\
+	leaky-dash.ps3.rgb24.ref.png	\
+	leaky-dash.quartz.ref.png	\
+	leaky-dash.ref.png	\
+	leaky-dashed-rectangle.ref.png		\
+	leaky-dashed-rectangle.ps2.ref.png	\
+	leaky-dashed-rectangle.ps3.ref.png	\
+	leaky-dashed-stroke.ref.png		\
+	leaky-dashed-stroke.ps2.ref.png		\
+	leaky-dashed-stroke.ps3.ref.png		\
+	leaky-polygon.ref.png	\
+	leaky-polygon.ps2.ref.png	\
+	leaky-polygon.ps3.ref.png	\
+	linear-gradient-reflect.ref.png	\
+	linear-gradient-reflect.pdf.argb32.ref.png	\
+	linear-gradient-reflect.pdf.rgb24.ref.png	\
+	linear-gradient-reflect.ps3.ref.png	\
+	linear-gradient-reflect.quartz.ref.png	\
+	linear-gradient.pdf.ref.png	\
+	linear-gradient.ps3.ref.png	\
+	linear-gradient.quartz.ref.png	\
+	linear-gradient.ref.png	\
+	linear-gradient.svg12.ref.png	\
+	linear-gradient.svg11.ref.png	\
+	line-width.ref.png	\
+	line-width-scale.ps2.ref.png	\
+	line-width-scale.ps3.ref.png	\
+	line-width-scale.quartz.ref.png	\
+	line-width-scale.ref.png	\
+	long-dashed-lines.ref.png	\
+	long-dashed-lines.ps2.ref.png	\
+	long-dashed-lines.ps3.ref.png	\
+	long-dashed-lines.quartz.ref.png	\
+	long-lines.ref.png	\
+	mask-alpha.ref.png	\
+	mask-alpha.svg11.argb32.ref.png	\
+	mask-alpha.svg12.argb32.ref.png	\
+	mask-alpha.rgb24.ref.png	\
+	mask-alpha.quartz.argb32.ref.png \
+	mask-ctm.ref.png	\
+	mask-ctm.rgb24.ref.png	\
+	mask-ctm.svg11.argb32.ref.png	\
+	mask-ctm.svg12.argb32.ref.png	\
+	mask.ref.png	\
+	mask.rgb24.ref.png	\
+	mask.pdf.argb32.ref.png	\
+	mask.pdf.rgb24.ref.png	\
+	mask.quartz.ref.png	\
+	mask.quartz.rgb24.ref.png	\
+	mask-surface-ctm.ref.png	\
+	mask-surface-ctm.rgb24.ref.png	\
+	mask-surface-ctm.svg11.argb32.ref.png	\
+	mask-surface-ctm.svg12.argb32.ref.png	\
+	mask.svg11.rgb24.ref.png	\
+	mask.svg11.argb32.ref.png	\
+	mask.svg12.rgb24.ref.png	\
+	mask.svg12.argb32.ref.png	\
+	mask-transformed-image.ref.png	\
+	mask-transformed-similar.ref.png	\
+	mask-transformed-similar.pdf.ref.png	\
+	mask-transformed-similar.svg12.ref.png	\
+	mask-transformed-similar.svg11.ref.png	\
+	meta-surface-pattern.ref.png		\
+	meta-surface-pattern.rgb24.ref.png	\
+	meta-surface-pattern.pdf.ref.png	\
+	meta-surface-pattern.pdf.rgb24.ref.png	\
+	meta-surface-pattern.ps2.argb32.ref.png	\
+	meta-surface-pattern.ps2.rgb24.ref.png	\
+	meta-surface-pattern.ps3.argb32.ref.png	\
+	meta-surface-pattern.ps3.rgb24.ref.png	\
+	meta-surface-pattern.quartz.ref.png	\
+	meta-surface-pattern.quartz.rgb24.ref.png	\
+	meta-surface-pattern.svg11.argb32.ref.png	\
+	meta-surface-pattern.svg11.rgb24.ref.png	\
+	meta-surface-pattern.svg12.argb32.ref.png	\
+	meta-surface-pattern.svg12.rgb24.ref.png	\
+	miter-precision.ref.png \
+	miter-precision.ps2.ref.png	\
+	miter-precision.ps3.ref.png	\
+	move-to-show-surface.ref.png	\
+	new-sub-path.ps2.argb32.ref.png	\
+	new-sub-path.ps3.argb32.ref.png	\
+	new-sub-path.ps2.rgb24.ref.png	\
+	new-sub-path.ps3.rgb24.ref.png	\
+	new-sub-path.quartz.ref.png	\
+	new-sub-path.quartz.rgb24.ref.png	\
+	new-sub-path.ref.png	\
+	new-sub-path.rgb24.ref.png	\
+	nil-surface.ref.png	\
+	nil-surface.rgb24.ref.png	\
+	operator.ref.png	\
+	operator.rgb24.ref.png	\
+	operator-alpha.ref.png	\
+	operator-alpha.rgb24.ref.png	\
+	operator-clear.quartz.ref.png	\
+	operator-clear.quartz.rgb24.ref.png	\
+	operator-clear.ref.png	\
+	operator-clear.rgb24.ref.png	\
+	operator-clear.pdf.argb32.ref.png	\
+	operator-clear.pdf.rgb24.ref.png	\
+	operator-source.pdf.argb32.ref.png	\
+	operator-source.pdf.rgb24.ref.png	\
+	operator-source.ref.png	\
+	operator-source.rgb24.ref.png	\
+	operator-source.quartz.ref.png \
+	operator-source.quartz.rgb24.ref.png \
+	over-above-source.ps2.argb32.ref.png       \
+	over-above-source.ps3.argb32.ref.png       \
+	over-above-source.quartz.ref.png	  \
+	over-above-source.quartz.rgb24.ref.png	  \
+	over-above-source.ref.png                 \
+	over-above-source.rgb24.ref.png           \
+	over-around-source.ps2.argb32.ref.png       \
+	over-around-source.ps3.argb32.ref.png       \
+	over-around-source.ps2.rgb24.ref.png        \
+	over-around-source.ps3.rgb24.ref.png        \
+	over-around-source.quartz.ref.png	   \
+	over-around-source.quartz.rgb24.ref.png	   \
+	over-around-source.ref.png                 \
+	over-around-source.rgb24.ref.png           \
+	over-below-source.ps2.argb32.ref.png       \
+	over-below-source.ps3.argb32.ref.png       \
+	over-below-source.ref.png                 \
+	over-below-source.rgb24.ref.png           \
+	over-between-source.ps2.argb32.ref.png     \
+	over-between-source.ps3.argb32.ref.png     \
+	over-between-source.quartz.ref.png        \
+	over-between-source.quartz.rgb24.ref.png  \
+	over-between-source.ref.png                 \
+	over-between-source.rgb24.ref.png           \
+	paint.ref.png	\
+	paint-repeat.ref.png	\
+	paint-source-alpha.pdf.argb32.ref.png	\
+	paint-source-alpha.ref.png	\
+	paint-source-alpha.svg12.ref.png	\
+	paint-source-alpha.svg11.ref.png	\
+	paint-with-alpha.ref.png	\
+	paint-with-alpha.svg12.ref.png	\
+	paint-with-alpha.svg11.ref.png	\
+	paint-source-alpha.pdf.ref.png \
+	paint-with-alpha.pdf.ref.png \
+	pass-through.ref.png \
+	pass-through.rgb24.ref.png \
+	pattern-getters.ref.png	\
+	pdf-surface-source.ref.png \
+	pixman-rotate.ref.png	\
+	pixman-rotate.rgb24.ref.png	\
+	ps-surface-source.ref.png \
+	push-group.pdf.ref.png \
+	push-group.pdf.rgb24.ref.png \
+	push-group.ref.png	\
+	push-group.rgb24.ref.png	\
+	push-group.svg11.argb32.ref.png	\
+	push-group.svg12.argb32.ref.png	\
+	radial-gradient.ref.png	\
+	radial-gradient.pdf.ref.png \
+	radial-gradient.quartz.ref.png \
+	radial-gradient.svg12.ref.png	\
+	radial-gradient.svg11.ref.png	\
+	random-intersections.ref.png	\
+	random-intersections.ps2.ref.png \
+	random-intersections.ps3.ref.png \
+	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.ps2.ref.png	\
+	rectilinear-miter-limit.ps3.ref.png	\
+	rectilinear-stroke.ref.png	\
+	reflected-stroke.ref.png	\
+	reflected-stroke.ps2.ref.png	\
+	reflected-stroke.ps3.ref.png	\
+	reflected-stroke.quartz.ref.png	\
+	rel-path.quartz.ref.png	\
+	rel-path.quartz.rgb24.ref.png	\
+	rel-path.ps2.rgb24.ref.png	\
+	rel-path.ps3.rgb24.ref.png	\
+	rel-path.ref.png	\
+	rel-path.rgb24.ref.png	\
+	rotate-image-surface-paint.pdf.rgb24.ref.png \
+	rotate-image-surface-paint.ps2.ref.png \
+	rotate-image-surface-paint.ps3.ref.png \
+	rotate-image-surface-paint.pdf.argb32.ref.png	\
+	rotate-image-surface-paint.quartz.ref.png	\
+	rotate-image-surface-paint.ref.png	\
+	rotate-image-surface-paint.svg12.ref.png	\
+	rotate-image-surface-paint.svg11.ref.png	\
+	scale-down-source-surface-paint.ref.png	\
+	scale-source-surface-paint.pdf.argb32.ref.png	\
+	scale-source-surface-paint.ref.png	\
+	scale-source-surface-paint.rgb24.ref.png	\
+	scale-source-surface-paint.svg11.argb32.ref.png	\
+	scale-source-surface-paint.svg11.rgb24.ref.png	\
+	scale-source-surface-paint.svg12.argb32.ref.png	\
+	scale-source-surface-paint.svg12.rgb24.ref.png	\
+	scale-source-surface-paint.pdf.rgb24.ref.png \
+	stroke-ctm-caps.ref.png \
+	stroke-ctm-caps.quartz.ref.png \
+	select-font-face.ref.png	\
+	select-font-face.ps2.ref.png \
+	select-font-face.ps3.ref.png \
+	select-font-face.quartz.ref.png \
+	self-copy.ref.png	\
+	self-copy.ps2.ref.png	\
+	self-copy.ps3.ref.png	\
+	self-copy-overlap.ref.png	\
+	self-copy-overlap.rgb24.ref.png	\
+	self-intersecting.ref.png	\
+	self-intersecting.rgb24.ref.png	\
+	set-source.ref.png	\
+	set-source.rgb24.ref.png	\
+	set-source.svg11.argb32.ref.png	\
+	set-source.svg12.argb32.ref.png	\
+	show-glyphs-many.ref.png	\
+	show-text-current-point.ref.png	\
+	show-text-current-point.ps2.ref.png \
+	show-text-current-point.ps3.ref.png \
+	show-text-current-point.quartz.ref.png \
+	skew-extreme.ref.png \
+	skew-extreme.ps2.ref.png \
+	skew-extreme.ps3.ref.png \
+	smask.ref.png			\
+	smask.pdf.ref.png		\
+	smask.ps2.ref.png		\
+	smask.ps3.ref.png		\
+	smask.svg12.ref.png		\
+	smask.svg11.ref.png		\
+	smask-fill.ref.png		\
+	smask-fill.pdf.ref.png		\
+	smask-fill.svg12.ref.png	\
+	smask-fill.svg11.ref.png	\
+	smask-image-mask.ref.png	\
+	smask-image-mask.pdf.ref.png	\
+	smask-mask.ref.png		\
+	smask-mask.pdf.ref.png		\
+	smask-mask.svg12.ref.png	\
+	smask-mask.svg11.ref.png	\
+	smask-paint.ref.png		\
+	smask-paint.pdf.ref.png		\
+	smask-paint.svg12.ref.png	\
+	smask-paint.svg11.ref.png	\
+	smask-stroke.ref.png		\
+	smask-stroke.pdf.ref.png	\
+	smask-text.ref.png		\
+	smask-text.pdf.ref.png		\
+	smask-text.ps2.ref.png		\
+	smask-text.ps3.ref.png		\
+	smask-text.svg12.ref.png	\
+	smask-text.svg11.ref.png	\
+	stroke-image.ref.png \
+	stroke-image.pdf.ref.png \
+	stroke-image.ps2.ref.png \
+	stroke-image.ps3.ref.png \
+	stroke-image.quartz.ref.png \
+	solid-pattern-cache-stress.ref.png	\
+	source-clip.ref.png	\
+	source-clip-scale.quartz.ref.png	\
+	source-clip-scale.ps2.argb32.ref.png	\
+	source-clip-scale.ps3.argb32.ref.png	\
+	source-clip-scale.ps2.rgb24.ref.png	\
+	source-clip-scale.ps3.rgb24.ref.png	\
+	source-clip-scale.ref.png	\
+	source-clip-scale.svg12.ref.png	\
+	source-clip-scale.svg11.ref.png	\
+	source-clip-scale.pdf.ref.png \
+	source-surface-scale-paint.ref.png	\
+	source-surface-scale-paint.rgb24.ref.png	\
+	spline-decomposition.ref.png \
+	spline-decomposition.ps2.ref.png \
+	spline-decomposition.ps3.ref.png \
+	spline-decomposition.pdf.ref.png \
+	spline-decomposition.svg11.ref.png \
+	spline-decomposition.svg12.ref.png \
+	stroke-ctm-caps.ps2.ref.png \
+	stroke-ctm-caps.ps3.ref.png \
+	surface-pattern-big-scale-down.ref.png	\
+	surface-pattern.pdf.ref.png	\
+	surface-pattern.ps2.ref.png	\
+	surface-pattern.ps3.ref.png	\
+	surface-pattern.ref.png	\
+	surface-pattern-scale-down.pdf.argb32.ref.png	\
+	surface-pattern-scale-down.pdf.rgb24.ref.png	\
+	surface-pattern-scale-down.ps2.ref.png	\
+	surface-pattern-scale-down.ps3.ref.png	\
+	surface-pattern-scale-down.ref.png	\
+	surface-pattern-scale-down.quartz.ref.png	\
+	surface-pattern-scale-up.pdf.argb32.ref.png	\
+	surface-pattern-scale-up.pdf.rgb24.ref.png	\
+	surface-pattern-scale-up.ps2.ref.png	\
+	surface-pattern-scale-up.ps3.ref.png	\
+	surface-pattern-scale-up.ref.png	\
+	surface-pattern.svg12.ref.png	\
+	surface-pattern.svg11.ref.png	\
+	svg-surface-source.ref.png \
+	text-antialias-gray.ref.png	\
+	text-antialias-gray.quartz.ref.png	\
+	text-antialias-none.ref.png	\
+	text-antialias-none.quartz.ref.png	\
+	text-antialias-subpixel.ref.png	\
+	text-antialias-subpixel.quartz.ref.png	\
+	text-glyph-range.ref.png	\
+	text-glyph-range.ps2.ref.png	\
+	text-glyph-range.ps3.ref.png	\
+	text-pattern.ps3.argb32.ref.png	\
+	text-pattern.ps3.rgb24.ref.png	\
+	text-pattern.ref.png	\
+	text-pattern.rgb24.ref.png	\
+	text-pattern.svg11.argb32.ref.png	\
+	text-pattern.svg11.rgb24.ref.png	\
+	text-pattern.svg12.argb32.ref.png	\
+	text-pattern.svg12.rgb24.ref.png	\
+	text-pattern.pdf.argb32.ref.png \
+	text-pattern.pdf.rgb24.ref.png \
+	text-pattern.quartz.ref.png \
+	text-pattern.quartz.rgb24.ref.png \
+	text-rotate.ref.png	\
+	text-rotate.pdf.ref.png \
+	text-rotate.ps2.ref.png	\
+	text-rotate.ps3.ref.png	\
+	text-rotate.svg12.ref.png \
+	text-rotate.svg11.ref.png \
+	text-rotate.quartz.ref.png \
+	text-transform.ref.png		\
+	text-transform.pdf.ref.png	\
+	text-transform.ps2.ref.png	\
+	text-transform.ps3.ref.png	\
+	transforms.ref.png	\
+	transforms.ps2.ref.png	\
+	transforms.ps3.ref.png	\
+	translate-show-surface.ref.png	\
+	trap-clip.quartz.ref.png	\
+	trap-clip.quartz.rgb24.ref.png	\
+	trap-clip.ps3.argb32.ref.png	\
+	trap-clip.ps3.rgb24.ref.png	\
+	trap-clip.ref.png	\
+	trap-clip.rgb24.ref.png	\
+	trap-clip.pdf.argb32.ref.png \
+	trap-clip.pdf.rgb24.ref.png \
+	trap-clip.ps2.argb32.ref.png \
+	trap-clip.ps2.rgb24.ref.png \
+	twin.ref.png \
+	twin.ps2.ref.png \
+	twin.ps3.ref.png \
+	twin.svg11.ref.png \
+	twin.svg12.ref.png \
+	unantialiased-shapes.ref.png	\
+	unantialiased-shapes.quartz.ref.png \
+	unbounded-operator.ref.png	\
+	unbounded-operator.rgb24.ref.png	\
+	user-font.ref.png	\
+	user-font.ps2.ref.png \
+	user-font.ps3.ref.png \
+	user-font.svg12.ref.png	\
+	user-font.svg11.ref.png	\
+	user-font-mask.ref.png		\
+	user-font-mask.pdf.ref.png	\
+	user-font-mask.ps2.ref.png	\
+	user-font-mask.ps3.ref.png	\
+	user-font-mask.svg11.ref.png	\
+	user-font-proxy.ref.png	\
+	user-font-proxy.pdf.ref.png	\
+	user-font-proxy.ps2.ref.png	\
+	user-font-proxy.ps3.ref.png	\
+	user-font-proxy.svg12.ref.png	\
+	user-font-proxy.svg11.ref.png	\
+	user-font-rescale.ref.png	\
+	user-font-rescale.ps2.ref.png	\
+	user-font-rescale.ps3.ref.png	\
+	user-font-rescale.svg12.ref.png	\
+	user-font-rescale.svg11.ref.png	\
+	unbounded-operator.quartz.ref.png	\
+	unbounded-operator.quartz.rgb24.ref.png	\
+	xlib-expose-event.ref.png \
+	xlib-surface-source.ref.png \
+	xlib-surface-source.ps2.ref.png \
+	xlib-surface-source.ps3.ref.png \
+	zero-alpha.ref.png
 
 EXTRA_DIST +=		\
 6x13.pcf		\
@@ -1286,13 +1286,13 @@ index.html: $(srcdir)/make-html.pl $(test_sources:.c=.log)
 # Identify identical reference images
 check-ref-dups:
 	@LANG=C; \
-	( cd "$(scrdir)" && sha1sum *-ref.png | sort ) > ref.hash; \
-	join ref.hash ref.hash | grep -v -E '( .*-ref.png).*\1' | cut -d' ' -f 1-2 | sort -u
+	( cd "$(scrdir)" && sha1sum *.ref.png | sort ) > ref.hash; \
+	join ref.hash ref.hash | grep -v -E '( .*.ref.png).*\1' | cut -d' ' -f 1-2 | sort -u
 
 # Not exactly the best script in the world...
 check-ref-missing:
 	@cd "$(srcdir)"; \
-	REFS=`git ls-files "*-ref.png"`; \
+	REFS=`git ls-files "*.ref.png"`; \
 	ret=true; \
 	missing=""; \
 	for i in $$REFS; do \
@@ -1306,7 +1306,7 @@ check-ref-missing:
 		ret=false; \
 	fi >&2; \
 	if $$ret; then \
-	    REFS=`ls *-ref.png`; \
+	    REFS=`ls *.ref.png`; \
 	    for i in $$REFS; do \
 		echo "" $(REFERENCE_IMAGES) "" | grep -sq " $$i " || missing="$$missing $$i" ; \
 	    done ; \
diff --git a/test/a1-image-sample-ref.png b/test/a1-image-sample.ref.png
index b4e81eb35..b4e81eb35 100644
--- a/test/a1-image-sample-ref.png
+++ b/test/a1-image-sample.ref.png
diff --git a/test/a1-mask-ref.png b/test/a1-mask.ref.png
index ac4d97aca..ac4d97aca 100644
--- a/test/a1-mask-ref.png
+++ b/test/a1-mask.ref.png
diff --git a/test/a1-traps-sample-ref.png b/test/a1-traps-sample.ref.png
index b4e81eb35..b4e81eb35 100644
--- a/test/a1-traps-sample-ref.png
+++ b/test/a1-traps-sample.ref.png
diff --git a/test/a8-mask-ref.png b/test/a8-mask.ref.png
index 38556156c..38556156c 100644
--- a/test/a8-mask-ref.png
+++ b/test/a8-mask.ref.png
diff --git a/test/alpha-similar-ref.png b/test/alpha-similar.ref.png
index 9e1bfaace..9e1bfaace 100644
--- a/test/alpha-similar-ref.png
+++ b/test/alpha-similar.ref.png
diff --git a/test/alpha-similar-rgb24-ref.png b/test/alpha-similar.rgb24.ref.png
index 4085d60ff..4085d60ff 100644
--- a/test/alpha-similar-rgb24-ref.png
+++ b/test/alpha-similar.rgb24.ref.png
diff --git a/test/big-line-ps2-ref.png b/test/big-line.ps2.ref.png
index 2a4f57c9d..2a4f57c9d 100644
--- a/test/big-line-ps2-ref.png
+++ b/test/big-line.ps2.ref.png
diff --git a/test/big-line-ps2-rgb24-ref.png b/test/big-line.ps2.rgb24.ref.png
index d3d2356ca..d3d2356ca 100644
--- a/test/big-line-ps2-rgb24-ref.png
+++ b/test/big-line.ps2.rgb24.ref.png
diff --git a/test/big-line-ps3-ref.png b/test/big-line.ps3.ref.png
index 2a4f57c9d..2a4f57c9d 100644
--- a/test/big-line-ps3-ref.png
+++ b/test/big-line.ps3.ref.png
diff --git a/test/big-line-ps3-rgb24-ref.png b/test/big-line.ps3.rgb24.ref.png
index d3d2356ca..d3d2356ca 100644
--- a/test/big-line-ps3-rgb24-ref.png
+++ b/test/big-line.ps3.rgb24.ref.png
diff --git a/test/big-line-quartz-ref.png b/test/big-line.quartz.ref.png
index b8dfe8b97..b8dfe8b97 100644
--- a/test/big-line-quartz-ref.png
+++ b/test/big-line.quartz.ref.png
diff --git a/test/big-line-quartz-rgb24-ref.png b/test/big-line.quartz.rgb24.ref.png
index c4fc15877..c4fc15877 100644
--- a/test/big-line-quartz-rgb24-ref.png
+++ b/test/big-line.quartz.rgb24.ref.png
diff --git a/test/big-line-ref.png b/test/big-line.ref.png
index 7bfb379ca..7bfb379ca 100644
--- a/test/big-line-ref.png
+++ b/test/big-line.ref.png
diff --git a/test/big-line-rgb24-ref.png b/test/big-line.rgb24.ref.png
index f1fc49d64..f1fc49d64 100644
--- a/test/big-line-rgb24-ref.png
+++ b/test/big-line.rgb24.ref.png
diff --git a/test/bilevel-image-ref.png b/test/bilevel-image.ref.png
index cae76d69d..cae76d69d 100644
--- a/test/bilevel-image-ref.png
+++ b/test/bilevel-image.ref.png
diff --git a/test/bitmap-font-ref.png b/test/bitmap-font.ref.png
index 0718bf96a..0718bf96a 100644
--- a/test/bitmap-font-ref.png
+++ b/test/bitmap-font.ref.png
diff --git a/test/bitmap-font-rgb24-ref.png b/test/bitmap-font.rgb24.ref.png
index 856906425..856906425 100644
--- a/test/bitmap-font-rgb24-ref.png
+++ b/test/bitmap-font.rgb24.ref.png
diff --git a/test/cairo-test.c b/test/cairo-test.c
index 4802a1802..11ca650de 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -95,9 +95,9 @@ static const char *fail_face = "", *xfail_face="", *normal_face = "";
 static cairo_bool_t print_fail_on_stdout;
 
 #define CAIRO_TEST_LOG_SUFFIX ".log"
-#define CAIRO_TEST_PNG_SUFFIX "-out.png"
-#define CAIRO_TEST_REF_SUFFIX "-ref.png"
-#define CAIRO_TEST_DIFF_SUFFIX "-diff.png"
+#define CAIRO_TEST_PNG_SUFFIX ".out.png"
+#define CAIRO_TEST_REF_SUFFIX ".ref.png"
+#define CAIRO_TEST_DIFF_SUFFIX ".diff.png"
 #define CAIRO_TEST_OUTPUT_DIR "output"
 
 #define NUM_DEVICE_OFFSETS 2
@@ -325,6 +325,7 @@ cairo_test_reference_image_filename (const cairo_test_context_t *ctx,
 	                             const char *base_name,
 				     const char *test_name,
 				     const char *target_name,
+				     const char *base_target_name,
 				     const char *format)
 {
     char *ref_name = NULL;
@@ -342,7 +343,8 @@ cairo_test_reference_image_filename (const cairo_test_context_t *ctx,
     }
 
     /* Next look for a target/format-specific reference image. */
-    xasprintf (&ref_name, "%s/%s-%s-%s%s", ctx->srcdir,
+    xasprintf (&ref_name, "%s/%s.%s.%s%s",
+	       ctx->srcdir,
 	       test_name,
 	       target_name,
 	       format,
@@ -353,7 +355,8 @@ cairo_test_reference_image_filename (const cairo_test_context_t *ctx,
 	goto done;
 
     /* Next, look for target-specific reference image. */
-    xasprintf (&ref_name, "%s/%s-%s%s", ctx->srcdir,
+    xasprintf (&ref_name, "%s/%s.%s%s",
+	       ctx->srcdir,
 	       test_name,
 	       target_name,
 	       CAIRO_TEST_REF_SUFFIX);
@@ -362,8 +365,32 @@ cairo_test_reference_image_filename (const cairo_test_context_t *ctx,
     else
 	goto done;
 
+    /* Next look for a base/format-specific reference image. */
+    xasprintf (&ref_name, "%s/%s.%s.%s%s",
+	       ctx->srcdir,
+	       test_name,
+	       base_target_name,
+	       format,
+	       CAIRO_TEST_REF_SUFFIX);
+    if (access (ref_name, F_OK) != 0)
+	free (ref_name);
+    else
+	goto done;
+
+    /* Next, look for base-specific reference image. */
+    xasprintf (&ref_name, "%s/%s.%s%s",
+	       ctx->srcdir,
+	       test_name,
+	       base_target_name,
+	       CAIRO_TEST_REF_SUFFIX);
+    if (access (ref_name, F_OK) != 0)
+	free (ref_name);
+    else
+	goto done;
+
     /* Next, look for format-specific reference image. */
-    xasprintf (&ref_name, "%s/%s-%s%s", ctx->srcdir,
+    xasprintf (&ref_name, "%s/%s.%s%s",
+	       ctx->srcdir,
 	       test_name,
 	       format,
 	       CAIRO_TEST_REF_SUFFIX);
@@ -641,19 +668,19 @@ cairo_test_for_target (cairo_test_context_t		 *ctx,
     /* Get the strings ready that we'll need. */
     format = cairo_boilerplate_content_name (target->content);
     if (dev_offset)
-	xasprintf (&offset_str, "-%d", dev_offset);
+	xasprintf (&offset_str, ".%d", dev_offset);
     else
 	offset_str = (char *) empty_str;
     if (ctx->thread)
-	xasprintf (&thread_str, "-thread%d", ctx->thread);
+	xasprintf (&thread_str, ".thread%d", ctx->thread);
     else
 	thread_str = (char *) empty_str;
 
-    xasprintf (&base_name, "%s-%s-%s%s%s%s",
+    xasprintf (&base_name, "%s.%s.%s%s%s%s",
 	       ctx->test_name,
 	       target->name,
 	       format,
-	       similar ? "-similar" : "",
+	       similar ? ".similar" : "",
 	       offset_str,
 	       thread_str);
 
@@ -667,6 +694,7 @@ cairo_test_for_target (cairo_test_context_t		 *ctx,
 						    base_name,
 						    ctx->test_name,
 						    target->name,
+						    target->basename,
 						    format);
     have_output_dir = _cairo_test_mkdir (CAIRO_TEST_OUTPUT_DIR);
     xasprintf (&base_path, "%s/%s",
@@ -890,11 +918,11 @@ REPEAT:
 	}
 
 	if (target->file_extension != NULL) { /* compare vector surfaces */
-	    xasprintf (&test_filename, "%s-out%s",
+	    xasprintf (&test_filename, "%s.out%s",
 		       base_path, target->file_extension);
-	    xasprintf (&pass_filename, "%s-pass%s",
+	    xasprintf (&pass_filename, "%s.pass%s",
 		       base_path, target->file_extension);
-	    xasprintf (&fail_filename, "%s-fail%s",
+	    xasprintf (&fail_filename, "%s.fail%s",
 		       base_path, target->file_extension);
 
 	    if (cairo_test_file_is_older (pass_filename, ref_path))
@@ -944,8 +972,8 @@ REPEAT:
 	/* binary compare png files (no decompression) */
 	if (target->file_extension == NULL) {
 	    xasprintf (&test_filename, "%s", png_path);
-	    xasprintf (&pass_filename, "%s-pass.png", base_path);
-	    xasprintf (&fail_filename, "%s-fail.png", base_path);
+	    xasprintf (&pass_filename, "%s.pass.png", base_path);
+	    xasprintf (&fail_filename, "%s.fail.png", base_path);
 
 	    if (cairo_test_files_equal (test_filename, pass_filename)) {
 		/* identical output as last known PASS, pass */
@@ -1133,7 +1161,7 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
 		    dev_offset);
 
     if (ctx->thread == 0) {
-	printf ("%s-%s-%s [%d]%s:\t", ctx->test_name, target->name,
+	printf ("%s.%s.%s [%d]%s:\t", ctx->test_name, target->name,
 		cairo_boilerplate_content_name (target->content),
 		dev_offset,
 		similar ? " (similar)": "");
@@ -1200,7 +1228,7 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
 		fflush (stdout);
 	    }
 	    cairo_test_log (ctx, "CRASHED\n");
-	    fprintf (stderr, "%s-%s-%s [%d]%s:\t%s!!!CRASHED!!!%s\n",
+	    fprintf (stderr, "%s.%s.%s [%d]%s:\t%s!!!CRASHED!!!%s\n",
 		     ctx->test_name, target->name,
 		     cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "",
 		     fail_face, normal_face);
@@ -1216,7 +1244,7 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
 		    printf ("\r");
 		    fflush (stdout);
 		}
-		fprintf (stderr, "%s-%s-%s [%d]%s:\t%sXFAIL%s\n",
+		fprintf (stderr, "%s.%s.%s [%d]%s:\t%sXFAIL%s\n",
 			 ctx->test_name, target->name,
 			 cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "",
 			 xfail_face, normal_face);
@@ -1229,7 +1257,7 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
 		    printf ("\r");
 		    fflush (stdout);
 		}
-		fprintf (stderr, "%s-%s-%s [%d]%s:\t%sFAIL%s\n",
+		fprintf (stderr, "%s.%s.%s [%d]%s:\t%sFAIL%s\n",
 			 ctx->test_name, target->name,
 			 cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "",
 			 fail_face, normal_face);
@@ -1242,7 +1270,7 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
 #if _POSIX_THREAD_SAFE_FUNCTIONS
 	flockfile (stdout);
 #endif
-	printf ("%s-%s-%s %d [%d]:\t",
+	printf ("%s.%s.%s %d [%d]:\t",
 		ctx->test_name, target->name,
 		cairo_boilerplate_content_name (target->content),
 		ctx->thread,
diff --git a/test/cairo-test.h b/test/cairo-test.h
index f1b57cc18..5bb23ae99 100644
--- a/test/cairo-test.h
+++ b/test/cairo-test.h
@@ -232,6 +232,7 @@ cairo_test_reference_image_filename (const cairo_test_context_t *ctx,
 	                             const char *base_name,
 				     const char *test_name,
 				     const char *target_name,
+				     const char *base_target_name,
 				     const char *format);
 
 cairo_surface_t *
diff --git a/test/caps-joins-alpha-quartz-ref.png b/test/caps-joins-alpha.quartz.ref.png
index 190c1e96c..190c1e96c 100644
--- a/test/caps-joins-alpha-quartz-ref.png
+++ b/test/caps-joins-alpha.quartz.ref.png
diff --git a/test/caps-joins-alpha-ref.png b/test/caps-joins-alpha.ref.png
index 1d34c73b6..1d34c73b6 100644
--- a/test/caps-joins-alpha-ref.png
+++ b/test/caps-joins-alpha.ref.png
diff --git a/test/caps-joins-alpha-svg11-ref.png b/test/caps-joins-alpha.svg11.ref.png
index 24689364f..24689364f 100644
--- a/test/caps-joins-alpha-svg11-ref.png
+++ b/test/caps-joins-alpha.svg11.ref.png
diff --git a/test/caps-joins-alpha-svg12-ref.png b/test/caps-joins-alpha.svg12.ref.png
index 24689364f..24689364f 100644
--- a/test/caps-joins-alpha-svg12-ref.png
+++ b/test/caps-joins-alpha.svg12.ref.png
diff --git a/test/caps-joins-ps2-ref.png b/test/caps-joins.ps2.ref.png
index 1d473ac7d..1d473ac7d 100644
--- a/test/caps-joins-ps2-ref.png
+++ b/test/caps-joins.ps2.ref.png
diff --git a/test/caps-joins-ps3-ref.png b/test/caps-joins.ps3.ref.png
index 1d473ac7d..1d473ac7d 100644
--- a/test/caps-joins-ps3-ref.png
+++ b/test/caps-joins.ps3.ref.png
diff --git a/test/caps-joins-ref.png b/test/caps-joins.ref.png
index 9297ac4d5..9297ac4d5 100644
--- a/test/caps-joins-ref.png
+++ b/test/caps-joins.ref.png
diff --git a/test/caps-sub-paths-ref.png b/test/caps-sub-paths.ref.png
index 1da16e8b0..1da16e8b0 100644
--- a/test/caps-sub-paths-ref.png
+++ b/test/caps-sub-paths.ref.png
diff --git a/test/clip-all-ref.png b/test/clip-all.ref.png
index 6c14df51f..6c14df51f 100644
--- a/test/clip-all-ref.png
+++ b/test/clip-all.ref.png
diff --git a/test/clip-empty-ref.png b/test/clip-empty.ref.png
index 6c14df51f..6c14df51f 100644
--- a/test/clip-empty-ref.png
+++ b/test/clip-empty.ref.png
diff --git a/test/clip-fill-rule-pixel-aligned-ref.png b/test/clip-fill-rule-pixel-aligned.ref.png
index 66eb6852e..66eb6852e 100644
--- a/test/clip-fill-rule-pixel-aligned-ref.png
+++ b/test/clip-fill-rule-pixel-aligned.ref.png
diff --git a/test/clip-fill-rule-pixel-aligned-rgb24-ref.png b/test/clip-fill-rule-pixel-aligned.rgb24.ref.png
index 1970c4768..1970c4768 100644
--- a/test/clip-fill-rule-pixel-aligned-rgb24-ref.png
+++ b/test/clip-fill-rule-pixel-aligned.rgb24.ref.png
diff --git a/test/clip-fill-rule-ps2-argb32-ref.png b/test/clip-fill-rule.ps2.argb32.ref.png
index 67a898892..67a898892 100644
--- a/test/clip-fill-rule-ps2-argb32-ref.png
+++ b/test/clip-fill-rule.ps2.argb32.ref.png
diff --git a/test/clip-fill-rule-ps2-rgb24-ref.png b/test/clip-fill-rule.ps2.rgb24.ref.png
index 0697a42f4..0697a42f4 100644
--- a/test/clip-fill-rule-ps2-rgb24-ref.png
+++ b/test/clip-fill-rule.ps2.rgb24.ref.png
diff --git a/test/clip-fill-rule-ps3-argb32-ref.png b/test/clip-fill-rule.ps3.argb32.ref.png
index 67a898892..67a898892 100644
--- a/test/clip-fill-rule-ps3-argb32-ref.png
+++ b/test/clip-fill-rule.ps3.argb32.ref.png
diff --git a/test/clip-fill-rule-ps3-rgb24-ref.png b/test/clip-fill-rule.ps3.rgb24.ref.png
index 0697a42f4..0697a42f4 100644
--- a/test/clip-fill-rule-ps3-rgb24-ref.png
+++ b/test/clip-fill-rule.ps3.rgb24.ref.png
diff --git a/test/clip-fill-rule-ref.png b/test/clip-fill-rule.ref.png
index 27ae1229c..27ae1229c 100644
--- a/test/clip-fill-rule-ref.png
+++ b/test/clip-fill-rule.ref.png
diff --git a/test/clip-fill-rule-rgb24-ref.png b/test/clip-fill-rule.rgb24.ref.png
index a969e367d..a969e367d 100644
--- a/test/clip-fill-rule-rgb24-ref.png
+++ b/test/clip-fill-rule.rgb24.ref.png
diff --git a/test/clip-nesting-ps2-argb32-ref.png b/test/clip-nesting.ps2.argb32.ref.png
index 41f7160c3..41f7160c3 100644
--- a/test/clip-nesting-ps2-argb32-ref.png
+++ b/test/clip-nesting.ps2.argb32.ref.png
diff --git a/test/clip-nesting-ps2-rgb24-ref.png b/test/clip-nesting.ps2.rgb24.ref.png
index 8238deba8..8238deba8 100644
--- a/test/clip-nesting-ps2-rgb24-ref.png
+++ b/test/clip-nesting.ps2.rgb24.ref.png
diff --git a/test/clip-nesting-ps3-argb32-ref.png b/test/clip-nesting.ps3.argb32.ref.png
index 41f7160c3..41f7160c3 100644
--- a/test/clip-nesting-ps3-argb32-ref.png
+++ b/test/clip-nesting.ps3.argb32.ref.png
diff --git a/test/clip-nesting-ps3-rgb24-ref.png b/test/clip-nesting.ps3.rgb24.ref.png
index 8238deba8..8238deba8 100644
--- a/test/clip-nesting-ps3-rgb24-ref.png
+++ b/test/clip-nesting.ps3.rgb24.ref.png
diff --git a/test/clip-nesting-quartz-ref.png b/test/clip-nesting.quartz.ref.png
index 5a3db7b3a..5a3db7b3a 100644
--- a/test/clip-nesting-quartz-ref.png
+++ b/test/clip-nesting.quartz.ref.png
diff --git a/test/clip-nesting-quartz-rgb24-ref.png b/test/clip-nesting.quartz.rgb24.ref.png
index b55d116b4..b55d116b4 100644
--- a/test/clip-nesting-quartz-rgb24-ref.png
+++ b/test/clip-nesting.quartz.rgb24.ref.png
diff --git a/test/clip-nesting-ref.png b/test/clip-nesting.ref.png
index 6b7e1cd50..6b7e1cd50 100644
--- a/test/clip-nesting-ref.png
+++ b/test/clip-nesting.ref.png
diff --git a/test/clip-nesting-rgb24-ref.png b/test/clip-nesting.rgb24.ref.png
index e2488f34e..e2488f34e 100644
--- a/test/clip-nesting-rgb24-ref.png
+++ b/test/clip-nesting.rgb24.ref.png
diff --git a/test/clip-operator-pdf-argb32-ref.png b/test/clip-operator.pdf.argb32.ref.png
index b3ee1437d..b3ee1437d 100644
--- a/test/clip-operator-pdf-argb32-ref.png
+++ b/test/clip-operator.pdf.argb32.ref.png
diff --git a/test/clip-operator-pdf-rgb24-ref.png b/test/clip-operator.pdf.rgb24.ref.png
index b420f385e..b420f385e 100644
--- a/test/clip-operator-pdf-rgb24-ref.png
+++ b/test/clip-operator.pdf.rgb24.ref.png
diff --git a/test/clip-operator-ps2-rgb24-ref.png b/test/clip-operator.ps2.rgb24.ref.png
index 6ed9fc456..6ed9fc456 100644
--- a/test/clip-operator-ps2-rgb24-ref.png
+++ b/test/clip-operator.ps2.rgb24.ref.png
diff --git a/test/clip-operator-ps3-ref.png b/test/clip-operator.ps3.ref.png
index dee12ca8c..dee12ca8c 100644
--- a/test/clip-operator-ps3-ref.png
+++ b/test/clip-operator.ps3.ref.png
diff --git a/test/clip-operator-ps3-rgb24-ref.png b/test/clip-operator.ps3.rgb24.ref.png
index 6ed9fc456..6ed9fc456 100644
--- a/test/clip-operator-ps3-rgb24-ref.png
+++ b/test/clip-operator.ps3.rgb24.ref.png
diff --git a/test/clip-operator-quartz-ref.png b/test/clip-operator.quartz.ref.png
index 1726944d0..1726944d0 100644
--- a/test/clip-operator-quartz-ref.png
+++ b/test/clip-operator.quartz.ref.png
diff --git a/test/clip-operator-quartz-rgb24-ref.png b/test/clip-operator.quartz.rgb24.ref.png
index a18c6f214..a18c6f214 100644
--- a/test/clip-operator-quartz-rgb24-ref.png
+++ b/test/clip-operator.quartz.rgb24.ref.png
diff --git a/test/clip-operator-ref.png b/test/clip-operator.ref.png
index 4ea1842e2..4ea1842e2 100644
--- a/test/clip-operator-ref.png
+++ b/test/clip-operator.ref.png
diff --git a/test/clip-operator-rgb24-ref.png b/test/clip-operator.rgb24.ref.png
index 7ab964c30..7ab964c30 100644
--- a/test/clip-operator-rgb24-ref.png
+++ b/test/clip-operator.rgb24.ref.png
diff --git a/test/clip-push-group-ps2-argb32-ref.png b/test/clip-push-group.ps2.argb32.ref.png
index 31b328425..31b328425 100644
--- a/test/clip-push-group-ps2-argb32-ref.png
+++ b/test/clip-push-group.ps2.argb32.ref.png
diff --git a/test/clip-push-group-ps2-rgb24-ref.png b/test/clip-push-group.ps2.rgb24.ref.png
index 31b328425..31b328425 100644
--- a/test/clip-push-group-ps2-rgb24-ref.png
+++ b/test/clip-push-group.ps2.rgb24.ref.png
diff --git a/test/clip-push-group-ps3-argb32-ref.png b/test/clip-push-group.ps3.argb32.ref.png
index 31b328425..31b328425 100644
--- a/test/clip-push-group-ps3-argb32-ref.png
+++ b/test/clip-push-group.ps3.argb32.ref.png
diff --git a/test/clip-push-group-ps3-rgb24-ref.png b/test/clip-push-group.ps3.rgb24.ref.png
index 31b328425..31b328425 100644
--- a/test/clip-push-group-ps3-rgb24-ref.png
+++ b/test/clip-push-group.ps3.rgb24.ref.png
diff --git a/test/clip-push-group-quartz-ref.png b/test/clip-push-group.quartz.ref.png
index 93c526809..93c526809 100644
--- a/test/clip-push-group-quartz-ref.png
+++ b/test/clip-push-group.quartz.ref.png
diff --git a/test/clip-push-group-ref.png b/test/clip-push-group.ref.png
index 327cc90bd..327cc90bd 100644
--- a/test/clip-push-group-ref.png
+++ b/test/clip-push-group.ref.png
diff --git a/test/clip-twice-ps2-argb32-ref.png b/test/clip-twice.ps2.argb32.ref.png
index 0cb618622..0cb618622 100644
--- a/test/clip-twice-ps2-argb32-ref.png
+++ b/test/clip-twice.ps2.argb32.ref.png
diff --git a/test/clip-twice-ps2-rgb24-ref.png b/test/clip-twice.ps2.rgb24.ref.png
index 8a121c408..8a121c408 100644
--- a/test/clip-twice-ps2-rgb24-ref.png
+++ b/test/clip-twice.ps2.rgb24.ref.png
diff --git a/test/clip-twice-ps3-argb32-ref.png b/test/clip-twice.ps3.argb32.ref.png
index 0cb618622..0cb618622 100644
--- a/test/clip-twice-ps3-argb32-ref.png
+++ b/test/clip-twice.ps3.argb32.ref.png
diff --git a/test/clip-twice-ps3-rgb24-ref.png b/test/clip-twice.ps3.rgb24.ref.png
index 8a121c408..8a121c408 100644
--- a/test/clip-twice-ps3-rgb24-ref.png
+++ b/test/clip-twice.ps3.rgb24.ref.png
diff --git a/test/clip-twice-quartz-ref.png b/test/clip-twice.quartz.ref.png
index f8231b31a..f8231b31a 100644
--- a/test/clip-twice-quartz-ref.png
+++ b/test/clip-twice.quartz.ref.png
diff --git a/test/clip-twice-quartz-rgb24-ref.png b/test/clip-twice.quartz.rgb24.ref.png
index 65cd80fa7..65cd80fa7 100644
--- a/test/clip-twice-quartz-rgb24-ref.png
+++ b/test/clip-twice.quartz.rgb24.ref.png
diff --git a/test/clip-twice-ref.png b/test/clip-twice.ref.png
index 8dc86f302..8dc86f302 100644
--- a/test/clip-twice-ref.png
+++ b/test/clip-twice.ref.png
diff --git a/test/clip-twice-rgb24-ref.png b/test/clip-twice.rgb24.ref.png
index 3f1c013bc..3f1c013bc 100644
--- a/test/clip-twice-rgb24-ref.png
+++ b/test/clip-twice.rgb24.ref.png
diff --git a/test/clipped-group-ps2-ref.png b/test/clipped-group.ps2.ref.png
index 6ce367090..6ce367090 100644
--- a/test/clipped-group-ps2-ref.png
+++ b/test/clipped-group.ps2.ref.png
diff --git a/test/clipped-group-ps3-ref.png b/test/clipped-group.ps3.ref.png
index 6ce367090..6ce367090 100644
--- a/test/clipped-group-ps3-ref.png
+++ b/test/clipped-group.ps3.ref.png
diff --git a/test/clipped-group-ref.png b/test/clipped-group.ref.png
index 89a7b1842..89a7b1842 100644
--- a/test/clipped-group-ref.png
+++ b/test/clipped-group.ref.png
diff --git a/test/clipped-surface-ref.png b/test/clipped-surface.ref.png
index 7fed5a3e0..7fed5a3e0 100644
--- a/test/clipped-surface-ref.png
+++ b/test/clipped-surface.ref.png
diff --git a/test/close-path-ps2-ref.png b/test/close-path.ps2.ref.png
index e43821c86..e43821c86 100644
--- a/test/close-path-ps2-ref.png
+++ b/test/close-path.ps2.ref.png
diff --git a/test/close-path-ps3-ref.png b/test/close-path.ps3.ref.png
index e43821c86..e43821c86 100644
--- a/test/close-path-ps3-ref.png
+++ b/test/close-path.ps3.ref.png
diff --git a/test/close-path-ref.png b/test/close-path.ref.png
index 538d9c6b6..538d9c6b6 100644
--- a/test/close-path-ref.png
+++ b/test/close-path.ref.png
diff --git a/test/composite-integer-translate-over-repeat-ps2-ref.png b/test/composite-integer-translate-over-repeat.ps2.ref.png
index f0e7b8401..f0e7b8401 100644
--- a/test/composite-integer-translate-over-repeat-ps2-ref.png
+++ b/test/composite-integer-translate-over-repeat.ps2.ref.png
diff --git a/test/composite-integer-translate-over-repeat-ps3-ref.png b/test/composite-integer-translate-over-repeat.ps3.ref.png
index f0e7b8401..f0e7b8401 100644
--- a/test/composite-integer-translate-over-repeat-ps3-ref.png
+++ b/test/composite-integer-translate-over-repeat.ps3.ref.png
diff --git a/test/composite-integer-translate-over-repeat-ref.png b/test/composite-integer-translate-over-repeat.ref.png
index c04db2631..c04db2631 100644
--- a/test/composite-integer-translate-over-repeat-ref.png
+++ b/test/composite-integer-translate-over-repeat.ref.png
diff --git a/test/composite-integer-translate-over-ps2-ref.png b/test/composite-integer-translate-over.ps2.ref.png
index 8c8cc0de0..8c8cc0de0 100644
--- a/test/composite-integer-translate-over-ps2-ref.png
+++ b/test/composite-integer-translate-over.ps2.ref.png
diff --git a/test/composite-integer-translate-over-ps3-ref.png b/test/composite-integer-translate-over.ps3.ref.png
index 8c8cc0de0..8c8cc0de0 100644
--- a/test/composite-integer-translate-over-ps3-ref.png
+++ b/test/composite-integer-translate-over.ps3.ref.png
diff --git a/test/composite-integer-translate-over-ref.png b/test/composite-integer-translate-over.ref.png
index 630d99351..630d99351 100644
--- a/test/composite-integer-translate-over-ref.png
+++ b/test/composite-integer-translate-over.ref.png
diff --git a/test/composite-integer-translate-source-ps2-ref.png b/test/composite-integer-translate-source.ps2.ref.png
index 8c8cc0de0..8c8cc0de0 100644
--- a/test/composite-integer-translate-source-ps2-ref.png
+++ b/test/composite-integer-translate-source.ps2.ref.png
diff --git a/test/composite-integer-translate-source-ps3-ref.png b/test/composite-integer-translate-source.ps3.ref.png
index 8c8cc0de0..8c8cc0de0 100644
--- a/test/composite-integer-translate-source-ps3-ref.png
+++ b/test/composite-integer-translate-source.ps3.ref.png
diff --git a/test/composite-integer-translate-source-ref.png b/test/composite-integer-translate-source.ref.png
index da9a3986a..da9a3986a 100644
--- a/test/composite-integer-translate-source-ref.png
+++ b/test/composite-integer-translate-source.ref.png
diff --git a/test/copy-path-ps2-ref.png b/test/copy-path.ps2.ref.png
index f66015b2e..f66015b2e 100644
--- a/test/copy-path-ps2-ref.png
+++ b/test/copy-path.ps2.ref.png
diff --git a/test/copy-path-ps3-ref.png b/test/copy-path.ps3.ref.png
index f66015b2e..f66015b2e 100644
--- a/test/copy-path-ps3-ref.png
+++ b/test/copy-path.ps3.ref.png
diff --git a/test/copy-path-ref.png b/test/copy-path.ref.png
index 3e9c30487..3e9c30487 100644
--- a/test/copy-path-ref.png
+++ b/test/copy-path.ref.png
diff --git a/test/create-for-stream.c b/test/create-for-stream.c
index f39e9cfb5..3dde378c0 100644
--- a/test/create-for-stream.c
+++ b/test/create-for-stream.c
@@ -57,7 +57,7 @@
 #define WIDTH_IN_POINTS  (WIDTH_IN_INCHES  * 72.0)
 #define HEIGHT_IN_POINTS (HEIGHT_IN_INCHES * 72.0)
 
-#define BASENAME "create-for-stream-out"
+#define BASENAME "create-for-stream.out"
 
 static cairo_test_status_t
 draw (cairo_t *cr, int width, int height)
diff --git a/test/create-from-png-stream.c b/test/create-from-png-stream.c
index e03ccc748..3d1957dba 100644
--- a/test/create-from-png-stream.c
+++ b/test/create-from-png-stream.c
@@ -53,7 +53,7 @@ draw (cairo_t *cr, int width, int height)
     cairo_surface_t *surface;
 
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-stream-ref.png");
+	       "create-from-png-stream.ref.png");
 
     file = fopen (filename, "rb");
     if (file == NULL) {
diff --git a/test/create-from-png-stream-ref.png b/test/create-from-png-stream.ref.png
index 765adc4a4..765adc4a4 100644
--- a/test/create-from-png-stream-ref.png
+++ b/test/create-from-png-stream.ref.png
diff --git a/test/create-from-png-alpha-ref.png b/test/create-from-png.alpha.ref.png
index a5175a1eb..a5175a1eb 100644
--- a/test/create-from-png-alpha-ref.png
+++ b/test/create-from-png.alpha.ref.png
diff --git a/test/create-from-png.c b/test/create-from-png.c
index 647ef1395..d9d2e548b 100644
--- a/test/create-from-png.c
+++ b/test/create-from-png.c
@@ -50,7 +50,7 @@ draw (cairo_t *cr, int width, int height)
     cairo_surface_t *surface;
 
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-ref.png");
+	       "create-from-png.ref.png");
 
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
@@ -105,7 +105,7 @@ preamble (cairo_test_context_t *ctx)
 
     /* cheekily test error propagation from the user write funcs as well ... */
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-ref.png");
+	       "create-from-png.ref.png");
 
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
@@ -144,7 +144,7 @@ preamble (cairo_test_context_t *ctx)
 
     /* check that loading alpha/opaque PNGs generate the correct surfaces */
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-alpha-ref.png");
+	       "create-from-png.alpha.ref.png");
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
 	cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
@@ -160,7 +160,7 @@ preamble (cairo_test_context_t *ctx)
     cairo_surface_destroy (surface);
 
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-ref.png");
+	       "create-from-png.ref.png");
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
 	cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
@@ -177,7 +177,7 @@ preamble (cairo_test_context_t *ctx)
 
     /* check paletted PNGs */
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-indexed-alpha-ref.png");
+	       "create-from-png.indexed-alpha.ref.png");
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
 	cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
@@ -193,7 +193,7 @@ preamble (cairo_test_context_t *ctx)
     cairo_surface_destroy (surface);
 
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-indexed-ref.png");
+	       "create-from-png.indexed.ref.png");
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
 	cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
@@ -210,7 +210,7 @@ preamble (cairo_test_context_t *ctx)
 
     /* check grayscale PNGs */
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-gray-alpha-ref.png");
+	       "create-from-png.gray-alpha.ref.png");
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
 	cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
@@ -226,7 +226,7 @@ preamble (cairo_test_context_t *ctx)
     cairo_surface_destroy (surface);
 
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-gray-ref.png");
+	       "create-from-png.gray.ref.png");
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
 	cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
diff --git a/test/create-from-png-gray-alpha-ref.png b/test/create-from-png.gray-alpha.ref.png
index f5d47dc4b..f5d47dc4b 100644
--- a/test/create-from-png-gray-alpha-ref.png
+++ b/test/create-from-png.gray-alpha.ref.png
diff --git a/test/create-from-png-gray-ref.png b/test/create-from-png.gray.ref.png
index 12dc90bc3..12dc90bc3 100644
--- a/test/create-from-png-gray-ref.png
+++ b/test/create-from-png.gray.ref.png
diff --git a/test/create-from-png-indexed-alpha-ref.png b/test/create-from-png.indexed-alpha.ref.png
index 9f32c6986..9f32c6986 100644
--- a/test/create-from-png-indexed-alpha-ref.png
+++ b/test/create-from-png.indexed-alpha.ref.png
diff --git a/test/create-from-png-indexed-ref.png b/test/create-from-png.indexed.ref.png
index 6b1d71316..6b1d71316 100644
--- a/test/create-from-png-indexed-ref.png
+++ b/test/create-from-png.indexed.ref.png
diff --git a/test/create-from-png-ref.png b/test/create-from-png.ref.png
index 5753560a7..5753560a7 100644
--- a/test/create-from-png-ref.png
+++ b/test/create-from-png.ref.png
diff --git a/test/dash-caps-joins-ps2-argb32-ref.png b/test/dash-caps-joins.ps2.argb32.ref.png
index baadcb4ef..baadcb4ef 100644
--- a/test/dash-caps-joins-ps2-argb32-ref.png
+++ b/test/dash-caps-joins.ps2.argb32.ref.png
diff --git a/test/dash-caps-joins-ps2-rgb24-ref.png b/test/dash-caps-joins.ps2.rgb24.ref.png
index baadcb4ef..baadcb4ef 100644
--- a/test/dash-caps-joins-ps2-rgb24-ref.png
+++ b/test/dash-caps-joins.ps2.rgb24.ref.png
diff --git a/test/dash-caps-joins-ps3-argb32-ref.png b/test/dash-caps-joins.ps3.argb32.ref.png
index baadcb4ef..baadcb4ef 100644
--- a/test/dash-caps-joins-ps3-argb32-ref.png
+++ b/test/dash-caps-joins.ps3.argb32.ref.png
diff --git a/test/dash-caps-joins-ps3-rgb24-ref.png b/test/dash-caps-joins.ps3.rgb24.ref.png
index baadcb4ef..baadcb4ef 100644
--- a/test/dash-caps-joins-ps3-rgb24-ref.png
+++ b/test/dash-caps-joins.ps3.rgb24.ref.png
diff --git a/test/dash-caps-joins-quartz-ref.png b/test/dash-caps-joins.quartz.ref.png
index 5e4aa76cf..5e4aa76cf 100644
--- a/test/dash-caps-joins-quartz-ref.png
+++ b/test/dash-caps-joins.quartz.ref.png
diff --git a/test/dash-caps-joins-ref.png b/test/dash-caps-joins.ref.png
index 15a067988..15a067988 100644
--- a/test/dash-caps-joins-ref.png
+++ b/test/dash-caps-joins.ref.png
diff --git a/test/dash-curve-ps2-ref.png b/test/dash-curve.ps2.ref.png
index 25a768be1..25a768be1 100644
--- a/test/dash-curve-ps2-ref.png
+++ b/test/dash-curve.ps2.ref.png
diff --git a/test/dash-curve-ps3-ref.png b/test/dash-curve.ps3.ref.png
index 25a768be1..25a768be1 100644
--- a/test/dash-curve-ps3-ref.png
+++ b/test/dash-curve.ps3.ref.png
diff --git a/test/dash-curve-quartz-ref.png b/test/dash-curve.quartz.ref.png
index 18a506e60..18a506e60 100644
--- a/test/dash-curve-quartz-ref.png
+++ b/test/dash-curve.quartz.ref.png
diff --git a/test/dash-curve-ref.png b/test/dash-curve.ref.png
index 542b2d827..542b2d827 100644
--- a/test/dash-curve-ref.png
+++ b/test/dash-curve.ref.png
diff --git a/test/dash-no-dash-ref.png b/test/dash-no-dash.ref.png
index 9afd045db..9afd045db 100644
--- a/test/dash-no-dash-ref.png
+++ b/test/dash-no-dash.ref.png
diff --git a/test/dash-offset-negative-ref.png b/test/dash-offset-negative.ref.png
index f2b8007af..f2b8007af 100644
--- a/test/dash-offset-negative-ref.png
+++ b/test/dash-offset-negative.ref.png
diff --git a/test/dash-scale-ps2-argb32-ref.png b/test/dash-scale.ps2.argb32.ref.png
index efe8b1191..efe8b1191 100644
--- a/test/dash-scale-ps2-argb32-ref.png
+++ b/test/dash-scale.ps2.argb32.ref.png
diff --git a/test/dash-scale-ps2-rgb24-ref.png b/test/dash-scale.ps2.rgb24.ref.png
index 5a92f55ca..5a92f55ca 100644
--- a/test/dash-scale-ps2-rgb24-ref.png
+++ b/test/dash-scale.ps2.rgb24.ref.png
diff --git a/test/dash-scale-ps3-argb32-ref.png b/test/dash-scale.ps3.argb32.ref.png
index efe8b1191..efe8b1191 100644
--- a/test/dash-scale-ps3-argb32-ref.png
+++ b/test/dash-scale.ps3.argb32.ref.png
diff --git a/test/dash-scale-ps3-rgb24-ref.png b/test/dash-scale.ps3.rgb24.ref.png
index 5a92f55ca..5a92f55ca 100644
--- a/test/dash-scale-ps3-rgb24-ref.png
+++ b/test/dash-scale.ps3.rgb24.ref.png
diff --git a/test/dash-scale-quartz-ref.png b/test/dash-scale.quartz.ref.png
index 8fc897ba6..8fc897ba6 100644
--- a/test/dash-scale-quartz-ref.png
+++ b/test/dash-scale.quartz.ref.png
diff --git a/test/dash-scale-ref.png b/test/dash-scale.ref.png
index a0f004b38..a0f004b38 100644
--- a/test/dash-scale-ref.png
+++ b/test/dash-scale.ref.png
diff --git a/test/dash-state-ps2-ref.png b/test/dash-state.ps2.ref.png
index ec6904ea7..ec6904ea7 100644
--- a/test/dash-state-ps2-ref.png
+++ b/test/dash-state.ps2.ref.png
diff --git a/test/dash-state-ps3-ref.png b/test/dash-state.ps3.ref.png
index ec6904ea7..ec6904ea7 100644
--- a/test/dash-state-ps3-ref.png
+++ b/test/dash-state.ps3.ref.png
diff --git a/test/dash-state-quartz-ref.png b/test/dash-state.quartz.ref.png
index f5f712a74..f5f712a74 100644
--- a/test/dash-state-quartz-ref.png
+++ b/test/dash-state.quartz.ref.png
diff --git a/test/dash-state-ref.png b/test/dash-state.ref.png
index d195ab03b..d195ab03b 100644
--- a/test/dash-state-ref.png
+++ b/test/dash-state.ref.png
diff --git a/test/dash-zero-length-ps2-ref.png b/test/dash-zero-length.ps2.ref.png
index 68fd3fb2e..68fd3fb2e 100644
--- a/test/dash-zero-length-ps2-ref.png
+++ b/test/dash-zero-length.ps2.ref.png
diff --git a/test/dash-zero-length-ps2-rgb24-ref.png b/test/dash-zero-length.ps2.rgb24.ref.png
index 8a4a40fd4..8a4a40fd4 100644
--- a/test/dash-zero-length-ps2-rgb24-ref.png
+++ b/test/dash-zero-length.ps2.rgb24.ref.png
diff --git a/test/dash-zero-length-ps3-ref.png b/test/dash-zero-length.ps3.ref.png
index 68fd3fb2e..68fd3fb2e 100644
--- a/test/dash-zero-length-ps3-ref.png
+++ b/test/dash-zero-length.ps3.ref.png
diff --git a/test/dash-zero-length-ps3-rgb24-ref.png b/test/dash-zero-length.ps3.rgb24.ref.png
index 8a4a40fd4..8a4a40fd4 100644
--- a/test/dash-zero-length-ps3-rgb24-ref.png
+++ b/test/dash-zero-length.ps3.rgb24.ref.png
diff --git a/test/dash-zero-length-ref.png b/test/dash-zero-length.ref.png
index 16024f467..16024f467 100644
--- a/test/dash-zero-length-ref.png
+++ b/test/dash-zero-length.ref.png
diff --git a/test/dash-zero-length-rgb24-ref.png b/test/dash-zero-length.rgb24.ref.png
index 41b595c34..41b595c34 100644
--- a/test/dash-zero-length-rgb24-ref.png
+++ b/test/dash-zero-length.rgb24.ref.png
diff --git a/test/degenerate-arc-ps2-ref.png b/test/degenerate-arc.ps2.ref.png
index 3cbf4dabf..3cbf4dabf 100644
--- a/test/degenerate-arc-ps2-ref.png
+++ b/test/degenerate-arc.ps2.ref.png
diff --git a/test/degenerate-arc-ps3-ref.png b/test/degenerate-arc.ps3.ref.png
index 3cbf4dabf..3cbf4dabf 100644
--- a/test/degenerate-arc-ps3-ref.png
+++ b/test/degenerate-arc.ps3.ref.png
diff --git a/test/degenerate-arc-ref.png b/test/degenerate-arc.ref.png
index 5112d7f91..5112d7f91 100644
--- a/test/degenerate-arc-ref.png
+++ b/test/degenerate-arc.ref.png
diff --git a/test/degenerate-dash-ref.png b/test/degenerate-dash.ref.png
index ec51a3ce4..ec51a3ce4 100644
--- a/test/degenerate-dash-ref.png
+++ b/test/degenerate-dash.ref.png
diff --git a/test/degenerate-path-ps2-argb32-ref.png b/test/degenerate-path.ps2.argb32.ref.png
index 85b9d4ba9..85b9d4ba9 100644
--- a/test/degenerate-path-ps2-argb32-ref.png
+++ b/test/degenerate-path.ps2.argb32.ref.png
diff --git a/test/degenerate-path-ps2-rgb24-ref.png b/test/degenerate-path.ps2.rgb24.ref.png
index 99e6c661d..99e6c661d 100644
--- a/test/degenerate-path-ps2-rgb24-ref.png
+++ b/test/degenerate-path.ps2.rgb24.ref.png
diff --git a/test/degenerate-path-ps3-argb32-ref.png b/test/degenerate-path.ps3.argb32.ref.png
index 85b9d4ba9..85b9d4ba9 100644
--- a/test/degenerate-path-ps3-argb32-ref.png
+++ b/test/degenerate-path.ps3.argb32.ref.png
diff --git a/test/degenerate-path-ps3-rgb24-ref.png b/test/degenerate-path.ps3.rgb24.ref.png
index 99e6c661d..99e6c661d 100644
--- a/test/degenerate-path-ps3-rgb24-ref.png
+++ b/test/degenerate-path.ps3.rgb24.ref.png
diff --git a/test/degenerate-path-quartz-ref.png b/test/degenerate-path.quartz.ref.png
index d1d8f2f20..d1d8f2f20 100644
--- a/test/degenerate-path-quartz-ref.png
+++ b/test/degenerate-path.quartz.ref.png
diff --git a/test/degenerate-path-quartz-rgb24-ref.png b/test/degenerate-path.quartz.rgb24.ref.png
index d6ff7ebca..d6ff7ebca 100644
--- a/test/degenerate-path-quartz-rgb24-ref.png
+++ b/test/degenerate-path.quartz.rgb24.ref.png
diff --git a/test/degenerate-path-ref.png b/test/degenerate-path.ref.png
index 102e8905d..102e8905d 100644
--- a/test/degenerate-path-ref.png
+++ b/test/degenerate-path.ref.png
diff --git a/test/degenerate-path-rgb24-ref.png b/test/degenerate-path.rgb24.ref.png
index 881c0194e..881c0194e 100644
--- a/test/degenerate-path-rgb24-ref.png
+++ b/test/degenerate-path.rgb24.ref.png
diff --git a/test/degenerate-pen-ps2-ref.png b/test/degenerate-pen.ps2.ref.png
index 2d0f07b70..2d0f07b70 100644
--- a/test/degenerate-pen-ps2-ref.png
+++ b/test/degenerate-pen.ps2.ref.png
diff --git a/test/degenerate-pen-ps3-ref.png b/test/degenerate-pen.ps3.ref.png
index 2d0f07b70..2d0f07b70 100644
--- a/test/degenerate-pen-ps3-ref.png
+++ b/test/degenerate-pen.ps3.ref.png
diff --git a/test/degenerate-pen-quartz-ref.png b/test/degenerate-pen.quartz.ref.png
index cc25b88b0..cc25b88b0 100644
--- a/test/degenerate-pen-quartz-ref.png
+++ b/test/degenerate-pen.quartz.ref.png
diff --git a/test/degenerate-pen-ref.png b/test/degenerate-pen.ref.png
index 5961ddd4d..5961ddd4d 100644
--- a/test/degenerate-pen-ref.png
+++ b/test/degenerate-pen.ref.png
diff --git a/test/device-offset-fractional-pdf-ref.png b/test/device-offset-fractional.pdf.ref.png
index 9ff2b8d51..9ff2b8d51 100644
--- a/test/device-offset-fractional-pdf-ref.png
+++ b/test/device-offset-fractional.pdf.ref.png
diff --git a/test/device-offset-fractional-ps2-ref.png b/test/device-offset-fractional.ps2.ref.png
index 5b44082c2..5b44082c2 100644
--- a/test/device-offset-fractional-ps2-ref.png
+++ b/test/device-offset-fractional.ps2.ref.png
diff --git a/test/device-offset-fractional-ps3-ref.png b/test/device-offset-fractional.ps3.ref.png
index 5b44082c2..5b44082c2 100644
--- a/test/device-offset-fractional-ps3-ref.png
+++ b/test/device-offset-fractional.ps3.ref.png
diff --git a/test/device-offset-fractional-ref.png b/test/device-offset-fractional.ref.png
index 9250d33d3..9250d33d3 100644
--- a/test/device-offset-fractional-ref.png
+++ b/test/device-offset-fractional.ref.png
diff --git a/test/device-offset-positive-ref.png b/test/device-offset-positive.ref.png
index bdf63afdd..bdf63afdd 100644
--- a/test/device-offset-positive-ref.png
+++ b/test/device-offset-positive.ref.png
diff --git a/test/device-offset-positive-rgb24-ref.png b/test/device-offset-positive.rgb24.ref.png
index 3281f4931..3281f4931 100644
--- a/test/device-offset-positive-rgb24-ref.png
+++ b/test/device-offset-positive.rgb24.ref.png
diff --git a/test/device-offset-scale-ref.png b/test/device-offset-scale.ref.png
index 66b29732e..66b29732e 100644
--- a/test/device-offset-scale-ref.png
+++ b/test/device-offset-scale.ref.png
diff --git a/test/device-offset-ref.png b/test/device-offset.ref.png
index 22cbfb4d7..22cbfb4d7 100644
--- a/test/device-offset-ref.png
+++ b/test/device-offset.ref.png
diff --git a/test/device-offset-rgb24-ref.png b/test/device-offset.rgb24.ref.png
index 634388fe6..634388fe6 100644
--- a/test/device-offset-rgb24-ref.png
+++ b/test/device-offset.rgb24.ref.png
diff --git a/test/extend-pad-ref.png b/test/extend-pad.ref.png
index 9292f8bbf..9292f8bbf 100644
--- a/test/extend-pad-ref.png
+++ b/test/extend-pad.ref.png
diff --git a/test/extend-reflect-ps2-ref.png b/test/extend-reflect-similar.ps2.ref.png
index acaee1b5a..acaee1b5a 100644
--- a/test/extend-reflect-ps2-ref.png
+++ b/test/extend-reflect-similar.ps2.ref.png
diff --git a/test/extend-reflect-ps3-ref.png b/test/extend-reflect-similar.ps3.ref.png
index acaee1b5a..acaee1b5a 100644
--- a/test/extend-reflect-ps3-ref.png
+++ b/test/extend-reflect-similar.ps3.ref.png
diff --git a/test/extend-reflect-ref.png b/test/extend-reflect-similar.ref.png
index 93a8b001b..93a8b001b 100644
--- a/test/extend-reflect-ref.png
+++ b/test/extend-reflect-similar.ref.png
diff --git a/test/extend-reflect-similar-ps2-ref.png b/test/extend-reflect.ps2.ref.png
index acaee1b5a..acaee1b5a 100644
--- a/test/extend-reflect-similar-ps2-ref.png
+++ b/test/extend-reflect.ps2.ref.png
diff --git a/test/extend-reflect-similar-ps3-ref.png b/test/extend-reflect.ps3.ref.png
index acaee1b5a..acaee1b5a 100644
--- a/test/extend-reflect-similar-ps3-ref.png
+++ b/test/extend-reflect.ps3.ref.png
diff --git a/test/extend-reflect-similar-ref.png b/test/extend-reflect.ref.png
index 93a8b001b..93a8b001b 100644
--- a/test/extend-reflect-similar-ref.png
+++ b/test/extend-reflect.ref.png
diff --git a/test/extend-repeat-ps2-ref.png b/test/extend-repeat-similar.ps2.ref.png
index 8218211ee..8218211ee 100644
--- a/test/extend-repeat-ps2-ref.png
+++ b/test/extend-repeat-similar.ps2.ref.png
diff --git a/test/extend-repeat-ps3-ref.png b/test/extend-repeat-similar.ps3.ref.png
index 8218211ee..8218211ee 100644
--- a/test/extend-repeat-ps3-ref.png
+++ b/test/extend-repeat-similar.ps3.ref.png
diff --git a/test/extend-repeat-ref.png b/test/extend-repeat-similar.ref.png
index ee2527fad..ee2527fad 100644
--- a/test/extend-repeat-ref.png
+++ b/test/extend-repeat-similar.ref.png
diff --git a/test/extend-repeat-similar-ps2-ref.png b/test/extend-repeat.ps2.ref.png
index 8218211ee..8218211ee 100644
--- a/test/extend-repeat-similar-ps2-ref.png
+++ b/test/extend-repeat.ps2.ref.png
diff --git a/test/extend-repeat-similar-ps3-ref.png b/test/extend-repeat.ps3.ref.png
index 8218211ee..8218211ee 100644
--- a/test/extend-repeat-similar-ps3-ref.png
+++ b/test/extend-repeat.ps3.ref.png
diff --git a/test/extend-repeat-similar-ref.png b/test/extend-repeat.ref.png
index ee2527fad..ee2527fad 100644
--- a/test/extend-repeat-similar-ref.png
+++ b/test/extend-repeat.ref.png
diff --git a/test/fallback-resolution.c b/test/fallback-resolution.c
index ab6a0edec..c8b994498 100644
--- a/test/fallback-resolution.c
+++ b/test/fallback-resolution.c
@@ -165,8 +165,8 @@ check_result (cairo_test_context_t *ctx,
 	}
     }
 
-    xasprintf (&png_name,  "%s-out.png", base_name);
-    xasprintf (&diff_name, "%s-diff.png", base_name);
+    xasprintf (&png_name,  "%s.out.png", base_name);
+    xasprintf (&diff_name, "%s.diff.png", base_name);
 
     test_image = target->get_image_surface (surface, 0, SIZE, SIZE);
     if (cairo_surface_status (test_image)) {
@@ -194,6 +194,7 @@ check_result (cairo_test_context_t *ctx,
 	                                            base_name,
 						    test_name,
 						    target->name,
+						    target->basename,
 						    format);
     if (ref_name == NULL) {
 	cairo_test_log (ctx, "Error: Cannot find reference image for %s\n",
@@ -310,7 +311,7 @@ preamble (cairo_test_context_t *ctx)
     for (ppi_x = 0; ppi_x < num_ppi; ppi_x++) {
 	for (ppi_y = 0; ppi_y < num_ppi; ppi_y++) {
 	    char *ref_name;
-	    xasprintf (&ref_name, "fallback-resolution-ppi%gx%g-ref.png",
+	    xasprintf (&ref_name, "fallback-resolution.ppi%gx%g.ref.png",
 		       ppi[ppi_x], ppi[ppi_y]);
 	    generate_reference (ppi[ppi_x], ppi[ppi_y], ref_name);
 	    free (ref_name);
@@ -330,7 +331,7 @@ preamble (cairo_test_context_t *ctx)
 	    continue;
 
 	format = cairo_boilerplate_content_name (target->content);
-	xasprintf (&base_name, "fallback-resolution-%s-%s",
+	xasprintf (&base_name, "fallback-resolution.%s-%s",
 		   target->name,
 		   format);
 
@@ -363,7 +364,7 @@ preamble (cairo_test_context_t *ctx)
 		char *test_name;
 		cairo_bool_t pass;
 
-		xasprintf (&test_name, "fallback-resolution-ppi%gx%g",
+		xasprintf (&test_name, "fallback-resolution.ppi%gx%g",
 			   ppi[ppi_x], ppi[ppi_y]);
 		xasprintf (&base_name, "%s-%s-%s",
 			   test_name,
diff --git a/test/fallback-resolution-ppi150x150-ref.png b/test/fallback-resolution.ppi150x150.ref.png
index 8a69481fc..8a69481fc 100644
--- a/test/fallback-resolution-ppi150x150-ref.png
+++ b/test/fallback-resolution.ppi150x150.ref.png
diff --git a/test/fallback-resolution-ppi150x300-ref.png b/test/fallback-resolution.ppi150x300.ref.png
index a23c62fdf..a23c62fdf 100644
--- a/test/fallback-resolution-ppi150x300-ref.png
+++ b/test/fallback-resolution.ppi150x300.ref.png
diff --git a/test/fallback-resolution-ppi150x37.5-ref.png b/test/fallback-resolution.ppi150x37.5.ref.png
index 640046ea7..640046ea7 100644
--- a/test/fallback-resolution-ppi150x37.5-ref.png
+++ b/test/fallback-resolution.ppi150x37.5.ref.png
diff --git a/test/fallback-resolution-ppi150x600-ref.png b/test/fallback-resolution.ppi150x600.ref.png
index baae3567c..baae3567c 100644
--- a/test/fallback-resolution-ppi150x600-ref.png
+++ b/test/fallback-resolution.ppi150x600.ref.png
diff --git a/test/fallback-resolution-ppi150x72-ref.png b/test/fallback-resolution.ppi150x72.ref.png
index beee81d42..beee81d42 100644
--- a/test/fallback-resolution-ppi150x72-ref.png
+++ b/test/fallback-resolution.ppi150x72.ref.png
diff --git a/test/fallback-resolution-ppi150x75-ref.png b/test/fallback-resolution.ppi150x75.ref.png
index 93328190b..93328190b 100644
--- a/test/fallback-resolution-ppi150x75-ref.png
+++ b/test/fallback-resolution.ppi150x75.ref.png
diff --git a/test/fallback-resolution-ppi300x150-ref.png b/test/fallback-resolution.ppi300x150.ref.png
index 30c0e72a5..30c0e72a5 100644
--- a/test/fallback-resolution-ppi300x150-ref.png
+++ b/test/fallback-resolution.ppi300x150.ref.png
diff --git a/test/fallback-resolution-ppi300x300-ref.png b/test/fallback-resolution.ppi300x300.ref.png
index 66ed3ebee..66ed3ebee 100644
--- a/test/fallback-resolution-ppi300x300-ref.png
+++ b/test/fallback-resolution.ppi300x300.ref.png
diff --git a/test/fallback-resolution-ppi300x37.5-ref.png b/test/fallback-resolution.ppi300x37.5.ref.png
index 42acb2de7..42acb2de7 100644
--- a/test/fallback-resolution-ppi300x37.5-ref.png
+++ b/test/fallback-resolution.ppi300x37.5.ref.png
diff --git a/test/fallback-resolution-ppi300x600-ref.png b/test/fallback-resolution.ppi300x600.ref.png
index 5be379352..5be379352 100644
--- a/test/fallback-resolution-ppi300x600-ref.png
+++ b/test/fallback-resolution.ppi300x600.ref.png
diff --git a/test/fallback-resolution-ppi300x72-ref.png b/test/fallback-resolution.ppi300x72.ref.png
index a96fb72c7..a96fb72c7 100644
--- a/test/fallback-resolution-ppi300x72-ref.png
+++ b/test/fallback-resolution.ppi300x72.ref.png
diff --git a/test/fallback-resolution-ppi300x75-ref.png b/test/fallback-resolution.ppi300x75.ref.png
index 9500328a5..9500328a5 100644
--- a/test/fallback-resolution-ppi300x75-ref.png
+++ b/test/fallback-resolution.ppi300x75.ref.png
diff --git a/test/fallback-resolution-ppi37.5x150-ref.png b/test/fallback-resolution.ppi37.5x150.ref.png
index 181434661..181434661 100644
--- a/test/fallback-resolution-ppi37.5x150-ref.png
+++ b/test/fallback-resolution.ppi37.5x150.ref.png
diff --git a/test/fallback-resolution-ppi37.5x300-ref.png b/test/fallback-resolution.ppi37.5x300.ref.png
index 823ff01ef..823ff01ef 100644
--- a/test/fallback-resolution-ppi37.5x300-ref.png
+++ b/test/fallback-resolution.ppi37.5x300.ref.png
diff --git a/test/fallback-resolution-ppi37.5x37.5-ref.png b/test/fallback-resolution.ppi37.5x37.5.ref.png
index fe87bc18c..fe87bc18c 100644
--- a/test/fallback-resolution-ppi37.5x37.5-ref.png
+++ b/test/fallback-resolution.ppi37.5x37.5.ref.png
diff --git a/test/fallback-resolution-ppi37.5x600-ref.png b/test/fallback-resolution.ppi37.5x600.ref.png
index 614f6074c..614f6074c 100644
--- a/test/fallback-resolution-ppi37.5x600-ref.png
+++ b/test/fallback-resolution.ppi37.5x600.ref.png
diff --git a/test/fallback-resolution-ppi37.5x72-ref.png b/test/fallback-resolution.ppi37.5x72.ref.png
index 5156dd62a..5156dd62a 100644
--- a/test/fallback-resolution-ppi37.5x72-ref.png
+++ b/test/fallback-resolution.ppi37.5x72.ref.png
diff --git a/test/fallback-resolution-ppi37.5x75-ref.png b/test/fallback-resolution.ppi37.5x75.ref.png
index 8d3b82803..8d3b82803 100644
--- a/test/fallback-resolution-ppi37.5x75-ref.png
+++ b/test/fallback-resolution.ppi37.5x75.ref.png
diff --git a/test/fallback-resolution-ppi600x150-ref.png b/test/fallback-resolution.ppi600x150.ref.png
index 0173c0c6a..0173c0c6a 100644
--- a/test/fallback-resolution-ppi600x150-ref.png
+++ b/test/fallback-resolution.ppi600x150.ref.png
diff --git a/test/fallback-resolution-ppi600x300-ref.png b/test/fallback-resolution.ppi600x300.ref.png
index 4b91a2e50..4b91a2e50 100644
--- a/test/fallback-resolution-ppi600x300-ref.png
+++ b/test/fallback-resolution.ppi600x300.ref.png
diff --git a/test/fallback-resolution-ppi600x37.5-ref.png b/test/fallback-resolution.ppi600x37.5.ref.png
index a65688f7e..a65688f7e 100644
--- a/test/fallback-resolution-ppi600x37.5-ref.png
+++ b/test/fallback-resolution.ppi600x37.5.ref.png
diff --git a/test/fallback-resolution-ppi600x600-ref.png b/test/fallback-resolution.ppi600x600.ref.png
index c5694a3a0..c5694a3a0 100644
--- a/test/fallback-resolution-ppi600x600-ref.png
+++ b/test/fallback-resolution.ppi600x600.ref.png
diff --git a/test/fallback-resolution-ppi600x72-ref.png b/test/fallback-resolution.ppi600x72.ref.png
index e1faae5ec..e1faae5ec 100644
--- a/test/fallback-resolution-ppi600x72-ref.png
+++ b/test/fallback-resolution.ppi600x72.ref.png
diff --git a/test/fallback-resolution-ppi600x75-ref.png b/test/fallback-resolution.ppi600x75.ref.png
index 23065b108..23065b108 100644
--- a/test/fallback-resolution-ppi600x75-ref.png
+++ b/test/fallback-resolution.ppi600x75.ref.png
diff --git a/test/fallback-resolution-ppi72x150-ref.png b/test/fallback-resolution.ppi72x150.ref.png
index a8662300e..a8662300e 100644
--- a/test/fallback-resolution-ppi72x150-ref.png
+++ b/test/fallback-resolution.ppi72x150.ref.png
diff --git a/test/fallback-resolution-ppi72x300-ref.png b/test/fallback-resolution.ppi72x300.ref.png
index 119c1a29d..119c1a29d 100644
--- a/test/fallback-resolution-ppi72x300-ref.png
+++ b/test/fallback-resolution.ppi72x300.ref.png
diff --git a/test/fallback-resolution-ppi72x37.5-ref.png b/test/fallback-resolution.ppi72x37.5.ref.png
index 8260c1041..8260c1041 100644
--- a/test/fallback-resolution-ppi72x37.5-ref.png
+++ b/test/fallback-resolution.ppi72x37.5.ref.png
diff --git a/test/fallback-resolution-ppi72x600-ref.png b/test/fallback-resolution.ppi72x600.ref.png
index 82f6ad293..82f6ad293 100644
--- a/test/fallback-resolution-ppi72x600-ref.png
+++ b/test/fallback-resolution.ppi72x600.ref.png
diff --git a/test/fallback-resolution-ppi72x72-ref.png b/test/fallback-resolution.ppi72x72.ref.png
index b9b38031b..b9b38031b 100644
--- a/test/fallback-resolution-ppi72x72-ref.png
+++ b/test/fallback-resolution.ppi72x72.ref.png
diff --git a/test/fallback-resolution-ppi72x75-ref.png b/test/fallback-resolution.ppi72x75.ref.png
index 2d6c598d0..2d6c598d0 100644
--- a/test/fallback-resolution-ppi72x75-ref.png
+++ b/test/fallback-resolution.ppi72x75.ref.png
diff --git a/test/fallback-resolution-ppi75x150-ref.png b/test/fallback-resolution.ppi75x150.ref.png
index b23395d7f..b23395d7f 100644
--- a/test/fallback-resolution-ppi75x150-ref.png
+++ b/test/fallback-resolution.ppi75x150.ref.png
diff --git a/test/fallback-resolution-ppi75x300-ref.png b/test/fallback-resolution.ppi75x300.ref.png
index 73971ca7b..73971ca7b 100644
--- a/test/fallback-resolution-ppi75x300-ref.png
+++ b/test/fallback-resolution.ppi75x300.ref.png
diff --git a/test/fallback-resolution-ppi75x37.5-ref.png b/test/fallback-resolution.ppi75x37.5.ref.png
index c4481eeef..c4481eeef 100644
--- a/test/fallback-resolution-ppi75x37.5-ref.png
+++ b/test/fallback-resolution.ppi75x37.5.ref.png
diff --git a/test/fallback-resolution-ppi75x600-ref.png b/test/fallback-resolution.ppi75x600.ref.png
index 01a33248d..01a33248d 100644
--- a/test/fallback-resolution-ppi75x600-ref.png
+++ b/test/fallback-resolution.ppi75x600.ref.png
diff --git a/test/fallback-resolution-ppi75x72-ref.png b/test/fallback-resolution.ppi75x72.ref.png
index 323e0e4dd..323e0e4dd 100644
--- a/test/fallback-resolution-ppi75x72-ref.png
+++ b/test/fallback-resolution.ppi75x72.ref.png
diff --git a/test/fallback-resolution-ppi75x75-ref.png b/test/fallback-resolution.ppi75x75.ref.png
index 03aa6c266..03aa6c266 100644
--- a/test/fallback-resolution-ppi75x75-ref.png
+++ b/test/fallback-resolution.ppi75x75.ref.png
diff --git a/test/fill-alpha-pattern-pdf-argb32-ref.png b/test/fill-alpha-pattern.pdf.argb32.ref.png
index d786c86ad..d786c86ad 100644
--- a/test/fill-alpha-pattern-pdf-argb32-ref.png
+++ b/test/fill-alpha-pattern.pdf.argb32.ref.png
diff --git a/test/fill-alpha-pattern-pdf-rgb24-ref.png b/test/fill-alpha-pattern.pdf.rgb24.ref.png
index 75e580fb6..75e580fb6 100644
--- a/test/fill-alpha-pattern-pdf-rgb24-ref.png
+++ b/test/fill-alpha-pattern.pdf.rgb24.ref.png
diff --git a/test/fill-alpha-pattern-ps3-ref.png b/test/fill-alpha-pattern.ps3.ref.png
index c8d14b111..c8d14b111 100644
--- a/test/fill-alpha-pattern-ps3-ref.png
+++ b/test/fill-alpha-pattern.ps3.ref.png
diff --git a/test/fill-alpha-pattern-ref.png b/test/fill-alpha-pattern.ref.png
index 0031c04ce..0031c04ce 100644
--- a/test/fill-alpha-pattern-ref.png
+++ b/test/fill-alpha-pattern.ref.png
diff --git a/test/fill-alpha-ref.png b/test/fill-alpha.ref.png
index 61aaac29d..61aaac29d 100644
--- a/test/fill-alpha-ref.png
+++ b/test/fill-alpha.ref.png
diff --git a/test/fill-and-stroke-alpha-add-quartz-ref.png b/test/fill-and-stroke-alpha-add.quartz.ref.png
index d648eec33..d648eec33 100644
--- a/test/fill-and-stroke-alpha-add-quartz-ref.png
+++ b/test/fill-and-stroke-alpha-add.quartz.ref.png
diff --git a/test/fill-and-stroke-alpha-add-ref.png b/test/fill-and-stroke-alpha-add.ref.png
index 412dd4f5a..412dd4f5a 100644
--- a/test/fill-and-stroke-alpha-add-ref.png
+++ b/test/fill-and-stroke-alpha-add.ref.png
diff --git a/test/fill-and-stroke-alpha-quartz-ref.png b/test/fill-and-stroke-alpha.quartz.ref.png
index 012147905..012147905 100644
--- a/test/fill-and-stroke-alpha-quartz-ref.png
+++ b/test/fill-and-stroke-alpha.quartz.ref.png
diff --git a/test/fill-and-stroke-alpha-ref.png b/test/fill-and-stroke-alpha.ref.png
index fd4b81bef..fd4b81bef 100644
--- a/test/fill-and-stroke-alpha-ref.png
+++ b/test/fill-and-stroke-alpha.ref.png
diff --git a/test/fill-and-stroke-ps2-argb32-ref.png b/test/fill-and-stroke.ps2.argb32.ref.png
index 850f0cbba..850f0cbba 100644
--- a/test/fill-and-stroke-ps2-argb32-ref.png
+++ b/test/fill-and-stroke.ps2.argb32.ref.png
diff --git a/test/fill-and-stroke-ps2-rgb24-ref.png b/test/fill-and-stroke.ps2.rgb24.ref.png
index 41e399169..41e399169 100644
--- a/test/fill-and-stroke-ps2-rgb24-ref.png
+++ b/test/fill-and-stroke.ps2.rgb24.ref.png
diff --git a/test/fill-and-stroke-ps3-argb32-ref.png b/test/fill-and-stroke.ps3.argb32.ref.png
index 850f0cbba..850f0cbba 100644
--- a/test/fill-and-stroke-ps3-argb32-ref.png
+++ b/test/fill-and-stroke.ps3.argb32.ref.png
diff --git a/test/fill-and-stroke-ps3-rgb24-ref.png b/test/fill-and-stroke.ps3.rgb24.ref.png
index 41e399169..41e399169 100644
--- a/test/fill-and-stroke-ps3-rgb24-ref.png
+++ b/test/fill-and-stroke.ps3.rgb24.ref.png
diff --git a/test/fill-and-stroke-quartz-ref.png b/test/fill-and-stroke.quartz.ref.png
index 4c48d2426..4c48d2426 100644
--- a/test/fill-and-stroke-quartz-ref.png
+++ b/test/fill-and-stroke.quartz.ref.png
diff --git a/test/fill-and-stroke-quartz-rgb24-ref.png b/test/fill-and-stroke.quartz.rgb24.ref.png
index 5972d5604..5972d5604 100644
--- a/test/fill-and-stroke-quartz-rgb24-ref.png
+++ b/test/fill-and-stroke.quartz.rgb24.ref.png
diff --git a/test/fill-and-stroke-ref.png b/test/fill-and-stroke.ref.png
index 298f6945f..298f6945f 100644
--- a/test/fill-and-stroke-ref.png
+++ b/test/fill-and-stroke.ref.png
diff --git a/test/fill-and-stroke-rgb24-ref.png b/test/fill-and-stroke.rgb24.ref.png
index ff886eb25..ff886eb25 100644
--- a/test/fill-and-stroke-rgb24-ref.png
+++ b/test/fill-and-stroke.rgb24.ref.png
diff --git a/test/fill-degenerate-sort-order-quartz-ref.png b/test/fill-degenerate-sort-order.quartz.ref.png
index 0ea4a67cc..0ea4a67cc 100644
--- a/test/fill-degenerate-sort-order-quartz-ref.png
+++ b/test/fill-degenerate-sort-order.quartz.ref.png
diff --git a/test/fill-degenerate-sort-order-quartz-rgb24-ref.png b/test/fill-degenerate-sort-order.quartz.rgb24.ref.png
index 59e1cb6c8..59e1cb6c8 100644
--- a/test/fill-degenerate-sort-order-quartz-rgb24-ref.png
+++ b/test/fill-degenerate-sort-order.quartz.rgb24.ref.png
diff --git a/test/fill-degenerate-sort-order-ref.png b/test/fill-degenerate-sort-order.ref.png
index 8278d76e2..8278d76e2 100644
--- a/test/fill-degenerate-sort-order-ref.png
+++ b/test/fill-degenerate-sort-order.ref.png
diff --git a/test/fill-degenerate-sort-order-rgb24-ref.png b/test/fill-degenerate-sort-order.rgb24.ref.png
index 6c76eaf40..6c76eaf40 100644
--- a/test/fill-degenerate-sort-order-rgb24-ref.png
+++ b/test/fill-degenerate-sort-order.rgb24.ref.png
diff --git a/test/fill-missed-stop-ps2-argb32-ref.png b/test/fill-missed-stop.ps2.argb32.ref.png
index b94a70899..b94a70899 100644
--- a/test/fill-missed-stop-ps2-argb32-ref.png
+++ b/test/fill-missed-stop.ps2.argb32.ref.png
diff --git a/test/fill-missed-stop-ps2-rgb24-ref.png b/test/fill-missed-stop.ps2.rgb24.ref.png
index fd54c7b1e..fd54c7b1e 100644
--- a/test/fill-missed-stop-ps2-rgb24-ref.png
+++ b/test/fill-missed-stop.ps2.rgb24.ref.png
diff --git a/test/fill-missed-stop-ps3-argb32-ref.png b/test/fill-missed-stop.ps3.argb32.ref.png
index b94a70899..b94a70899 100644
--- a/test/fill-missed-stop-ps3-argb32-ref.png
+++ b/test/fill-missed-stop.ps3.argb32.ref.png
diff --git a/test/fill-missed-stop-ps3-rgb24-ref.png b/test/fill-missed-stop.ps3.rgb24.ref.png
index fd54c7b1e..fd54c7b1e 100644
--- a/test/fill-missed-stop-ps3-rgb24-ref.png
+++ b/test/fill-missed-stop.ps3.rgb24.ref.png
diff --git a/test/fill-missed-stop-ref.png b/test/fill-missed-stop.ref.png
index 241d725db..241d725db 100644
--- a/test/fill-missed-stop-ref.png
+++ b/test/fill-missed-stop.ref.png
diff --git a/test/fill-missed-stop-rgb24-ref.png b/test/fill-missed-stop.rgb24.ref.png
index 4f9b38193..4f9b38193 100644
--- a/test/fill-missed-stop-rgb24-ref.png
+++ b/test/fill-missed-stop.rgb24.ref.png
diff --git a/test/fill-rule-ps2-argb32-ref.png b/test/fill-rule.ps2.argb32.ref.png
index 971b5601a..971b5601a 100644
--- a/test/fill-rule-ps2-argb32-ref.png
+++ b/test/fill-rule.ps2.argb32.ref.png
diff --git a/test/fill-rule-ps2-rgb24-ref.png b/test/fill-rule.ps2.rgb24.ref.png
index 8e1efc242..8e1efc242 100644
--- a/test/fill-rule-ps2-rgb24-ref.png
+++ b/test/fill-rule.ps2.rgb24.ref.png
diff --git a/test/fill-rule-ps3-argb32-ref.png b/test/fill-rule.ps3.argb32.ref.png
index 971b5601a..971b5601a 100644
--- a/test/fill-rule-ps3-argb32-ref.png
+++ b/test/fill-rule.ps3.argb32.ref.png
diff --git a/test/fill-rule-ps3-rgb24-ref.png b/test/fill-rule.ps3.rgb24.ref.png
index 8e1efc242..8e1efc242 100644
--- a/test/fill-rule-ps3-rgb24-ref.png
+++ b/test/fill-rule.ps3.rgb24.ref.png
diff --git a/test/fill-rule-quartz-ref.png b/test/fill-rule.quartz.ref.png
index f7e616c9f..f7e616c9f 100644
--- a/test/fill-rule-quartz-ref.png
+++ b/test/fill-rule.quartz.ref.png
diff --git a/test/fill-rule-quartz-rgb24-ref.png b/test/fill-rule.quartz.rgb24.ref.png
index 8b180c534..8b180c534 100644
--- a/test/fill-rule-quartz-rgb24-ref.png
+++ b/test/fill-rule.quartz.rgb24.ref.png
diff --git a/test/fill-rule-ref.png b/test/fill-rule.ref.png
index e2e10d4a8..e2e10d4a8 100644
--- a/test/fill-rule-ref.png
+++ b/test/fill-rule.ref.png
diff --git a/test/fill-rule-rgb24-ref.png b/test/fill-rule.rgb24.ref.png
index 68d2b9b8b..68d2b9b8b 100644
--- a/test/fill-rule-rgb24-ref.png
+++ b/test/fill-rule.rgb24.ref.png
diff --git a/test/filter-bilinear-extents-pdf-ref.png b/test/filter-bilinear-extents.pdf.ref.png
index 014b71521..014b71521 100644
--- a/test/filter-bilinear-extents-pdf-ref.png
+++ b/test/filter-bilinear-extents.pdf.ref.png
diff --git a/test/filter-bilinear-extents-ps2-ref.png b/test/filter-bilinear-extents.ps2.ref.png
index 97c105c9d..97c105c9d 100644
--- a/test/filter-bilinear-extents-ps2-ref.png
+++ b/test/filter-bilinear-extents.ps2.ref.png
diff --git a/test/filter-bilinear-extents-ps3-ref.png b/test/filter-bilinear-extents.ps3.ref.png
index 97c105c9d..97c105c9d 100644
--- a/test/filter-bilinear-extents-ps3-ref.png
+++ b/test/filter-bilinear-extents.ps3.ref.png
diff --git a/test/filter-bilinear-extents-ref.png b/test/filter-bilinear-extents.ref.png
index 61e416b39..61e416b39 100644
--- a/test/filter-bilinear-extents-ref.png
+++ b/test/filter-bilinear-extents.ref.png
diff --git a/test/filter-nearest-offset-pdf-ref.png b/test/filter-nearest-offset.pdf.ref.png
index 4dcfbedb5..4dcfbedb5 100644
--- a/test/filter-nearest-offset-pdf-ref.png
+++ b/test/filter-nearest-offset.pdf.ref.png
diff --git a/test/filter-nearest-offset-ps2-ref.png b/test/filter-nearest-offset.ps2.ref.png
index 185f77939..185f77939 100644
--- a/test/filter-nearest-offset-ps2-ref.png
+++ b/test/filter-nearest-offset.ps2.ref.png
diff --git a/test/filter-nearest-offset-ps3-ref.png b/test/filter-nearest-offset.ps3.ref.png
index 185f77939..185f77939 100644
--- a/test/filter-nearest-offset-ps3-ref.png
+++ b/test/filter-nearest-offset.ps3.ref.png
diff --git a/test/filter-nearest-offset-ref.png b/test/filter-nearest-offset.ref.png
index af81aeea1..af81aeea1 100644
--- a/test/filter-nearest-offset-ref.png
+++ b/test/filter-nearest-offset.ref.png
diff --git a/test/filter-nearest-offset-svg11-ref.png b/test/filter-nearest-offset.svg11.ref.png
index df468f4b6..df468f4b6 100644
--- a/test/filter-nearest-offset-svg11-ref.png
+++ b/test/filter-nearest-offset.svg11.ref.png
diff --git a/test/filter-nearest-offset-svg12-ref.png b/test/filter-nearest-offset.svg12.ref.png
index df468f4b6..df468f4b6 100644
--- a/test/filter-nearest-offset-svg12-ref.png
+++ b/test/filter-nearest-offset.svg12.ref.png
diff --git a/test/filter-nearest-transformed-pdf-ref.png b/test/filter-nearest-transformed.pdf.ref.png
index 960ccc690..960ccc690 100644
--- a/test/filter-nearest-transformed-pdf-ref.png
+++ b/test/filter-nearest-transformed.pdf.ref.png
diff --git a/test/filter-nearest-transformed-ref.png b/test/filter-nearest-transformed.ref.png
index dc413b47e..dc413b47e 100644
--- a/test/filter-nearest-transformed-ref.png
+++ b/test/filter-nearest-transformed.ref.png
diff --git a/test/filter-nearest-transformed-svg11-ref.png b/test/filter-nearest-transformed.svg11.ref.png
index 4f18c0d66..4f18c0d66 100644
--- a/test/filter-nearest-transformed-svg11-ref.png
+++ b/test/filter-nearest-transformed.svg11.ref.png
diff --git a/test/filter-nearest-transformed-svg12-ref.png b/test/filter-nearest-transformed.svg12.ref.png
index 4f18c0d66..4f18c0d66 100644
--- a/test/filter-nearest-transformed-svg12-ref.png
+++ b/test/filter-nearest-transformed.svg12.ref.png
diff --git a/test/finer-grained-fallbacks-ps2-ref.png b/test/finer-grained-fallbacks.ps2.ref.png
index 1744100c9..1744100c9 100644
--- a/test/finer-grained-fallbacks-ps2-ref.png
+++ b/test/finer-grained-fallbacks.ps2.ref.png
diff --git a/test/finer-grained-fallbacks-ps2-rgb24-ref.png b/test/finer-grained-fallbacks.ps2.rgb24.ref.png
index de4828607..de4828607 100644
--- a/test/finer-grained-fallbacks-ps2-rgb24-ref.png
+++ b/test/finer-grained-fallbacks.ps2.rgb24.ref.png
diff --git a/test/finer-grained-fallbacks-ps3-ref.png b/test/finer-grained-fallbacks.ps3.ref.png
index 1744100c9..1744100c9 100644
--- a/test/finer-grained-fallbacks-ps3-ref.png
+++ b/test/finer-grained-fallbacks.ps3.ref.png
diff --git a/test/finer-grained-fallbacks-ps3-rgb24-ref.png b/test/finer-grained-fallbacks.ps3.rgb24.ref.png
index de4828607..de4828607 100644
--- a/test/finer-grained-fallbacks-ps3-rgb24-ref.png
+++ b/test/finer-grained-fallbacks.ps3.rgb24.ref.png
diff --git a/test/finer-grained-fallbacks-ref.png b/test/finer-grained-fallbacks.ref.png
index c7eb113d8..c7eb113d8 100644
--- a/test/finer-grained-fallbacks-ref.png
+++ b/test/finer-grained-fallbacks.ref.png
diff --git a/test/finer-grained-fallbacks-rgb24-ref.png b/test/finer-grained-fallbacks.rgb24.ref.png
index 3b8e9c38d..3b8e9c38d 100644
--- a/test/finer-grained-fallbacks-rgb24-ref.png
+++ b/test/finer-grained-fallbacks.rgb24.ref.png
diff --git a/test/font-matrix-translation-ps2-argb32-ref.png b/test/font-matrix-translation.ps2.argb32.ref.png
index 41d05a07d..41d05a07d 100644
--- a/test/font-matrix-translation-ps2-argb32-ref.png
+++ b/test/font-matrix-translation.ps2.argb32.ref.png
diff --git a/test/font-matrix-translation-ps2-rgb24-ref.png b/test/font-matrix-translation.ps2.rgb24.ref.png
index 41d05a07d..41d05a07d 100644
--- a/test/font-matrix-translation-ps2-rgb24-ref.png
+++ b/test/font-matrix-translation.ps2.rgb24.ref.png
diff --git a/test/font-matrix-translation-ps3-argb32-ref.png b/test/font-matrix-translation.ps3.argb32.ref.png
index 41d05a07d..41d05a07d 100644
--- a/test/font-matrix-translation-ps3-argb32-ref.png
+++ b/test/font-matrix-translation.ps3.argb32.ref.png
diff --git a/test/font-matrix-translation-ps3-rgb24-ref.png b/test/font-matrix-translation.ps3.rgb24.ref.png
index 41d05a07d..41d05a07d 100644
--- a/test/font-matrix-translation-ps3-rgb24-ref.png
+++ b/test/font-matrix-translation.ps3.rgb24.ref.png
diff --git a/test/font-matrix-translation-quartz-ref.png b/test/font-matrix-translation.quartz.ref.png
index 90fd9624e..90fd9624e 100644
--- a/test/font-matrix-translation-quartz-ref.png
+++ b/test/font-matrix-translation.quartz.ref.png
diff --git a/test/font-matrix-translation-ref.png b/test/font-matrix-translation.ref.png
index a7aeb5987..a7aeb5987 100644
--- a/test/font-matrix-translation-ref.png
+++ b/test/font-matrix-translation.ref.png
diff --git a/test/font-matrix-translation-svg11-ref.png b/test/font-matrix-translation.svg11.ref.png
index 92ad17b2d..92ad17b2d 100644
--- a/test/font-matrix-translation-svg11-ref.png
+++ b/test/font-matrix-translation.svg11.ref.png
diff --git a/test/font-matrix-translation-svg12-ref.png b/test/font-matrix-translation.svg12.ref.png
index 92ad17b2d..92ad17b2d 100644
--- a/test/font-matrix-translation-svg12-ref.png
+++ b/test/font-matrix-translation.svg12.ref.png
diff --git a/test/ft-show-glyphs-positioning-pdf-ref.png b/test/ft-show-glyphs-positioning.pdf.ref.png
index 796d4eb06..796d4eb06 100644
--- a/test/ft-show-glyphs-positioning-pdf-ref.png
+++ b/test/ft-show-glyphs-positioning.pdf.ref.png
diff --git a/test/ft-show-glyphs-positioning-ps2-ref.png b/test/ft-show-glyphs-positioning.ps2.ref.png
index c5fbf30b5..c5fbf30b5 100644
--- a/test/ft-show-glyphs-positioning-ps2-ref.png
+++ b/test/ft-show-glyphs-positioning.ps2.ref.png
diff --git a/test/ft-show-glyphs-positioning-ps3-ref.png b/test/ft-show-glyphs-positioning.ps3.ref.png
index c5fbf30b5..c5fbf30b5 100644
--- a/test/ft-show-glyphs-positioning-ps3-ref.png
+++ b/test/ft-show-glyphs-positioning.ps3.ref.png
diff --git a/test/ft-show-glyphs-positioning-ref.png b/test/ft-show-glyphs-positioning.ref.png
index 21b9a4e1d..21b9a4e1d 100644
--- a/test/ft-show-glyphs-positioning-ref.png
+++ b/test/ft-show-glyphs-positioning.ref.png
diff --git a/test/ft-show-glyphs-positioning-svg11-ref.png b/test/ft-show-glyphs-positioning.svg11.ref.png
index 43b83cbec..43b83cbec 100644
--- a/test/ft-show-glyphs-positioning-svg11-ref.png
+++ b/test/ft-show-glyphs-positioning.svg11.ref.png
diff --git a/test/ft-show-glyphs-positioning-svg12-ref.png b/test/ft-show-glyphs-positioning.svg12.ref.png
index 43b83cbec..43b83cbec 100644
--- a/test/ft-show-glyphs-positioning-svg12-ref.png
+++ b/test/ft-show-glyphs-positioning.svg12.ref.png
diff --git a/test/ft-show-glyphs-table-ps2-ref.png b/test/ft-show-glyphs-table.ps2.ref.png
index 5143663fc..5143663fc 100644
--- a/test/ft-show-glyphs-table-ps2-ref.png
+++ b/test/ft-show-glyphs-table.ps2.ref.png
diff --git a/test/ft-show-glyphs-table-ps3-ref.png b/test/ft-show-glyphs-table.ps3.ref.png
index 5143663fc..5143663fc 100644
--- a/test/ft-show-glyphs-table-ps3-ref.png
+++ b/test/ft-show-glyphs-table.ps3.ref.png
diff --git a/test/ft-show-glyphs-table-ref.png b/test/ft-show-glyphs-table.ref.png
index 92a3527c2..92a3527c2 100644
--- a/test/ft-show-glyphs-table-ref.png
+++ b/test/ft-show-glyphs-table.ref.png
diff --git a/test/ft-text-antialias-none-ps2-argb32-ref.png b/test/ft-text-antialias-none.ps2.argb32.ref.png
index 4f7ee8324..4f7ee8324 100644
--- a/test/ft-text-antialias-none-ps2-argb32-ref.png
+++ b/test/ft-text-antialias-none.ps2.argb32.ref.png
diff --git a/test/ft-text-antialias-none-ps3-argb32-ref.png b/test/ft-text-antialias-none.ps3.argb32.ref.png
index 4f7ee8324..4f7ee8324 100644
--- a/test/ft-text-antialias-none-ps3-argb32-ref.png
+++ b/test/ft-text-antialias-none.ps3.argb32.ref.png
diff --git a/test/ft-text-antialias-none-ref.png b/test/ft-text-antialias-none.ref.png
index cb0c13222..cb0c13222 100644
--- a/test/ft-text-antialias-none-ref.png
+++ b/test/ft-text-antialias-none.ref.png
diff --git a/test/ft-text-vertical-layout-type1-pdf-ref.png b/test/ft-text-vertical-layout-type1.pdf.ref.png
index ab6de47a8..ab6de47a8 100644
--- a/test/ft-text-vertical-layout-type1-pdf-ref.png
+++ b/test/ft-text-vertical-layout-type1.pdf.ref.png
diff --git a/test/ft-text-vertical-layout-type1-ps2-ref.png b/test/ft-text-vertical-layout-type1.ps2.ref.png
index 4523495bb..4523495bb 100644
--- a/test/ft-text-vertical-layout-type1-ps2-ref.png
+++ b/test/ft-text-vertical-layout-type1.ps2.ref.png
diff --git a/test/ft-text-vertical-layout-type1-ps3-ref.png b/test/ft-text-vertical-layout-type1.ps3.ref.png
index 4523495bb..4523495bb 100644
--- a/test/ft-text-vertical-layout-type1-ps3-ref.png
+++ b/test/ft-text-vertical-layout-type1.ps3.ref.png
diff --git a/test/ft-text-vertical-layout-type1-ref.png b/test/ft-text-vertical-layout-type1.ref.png
index 2b74aa608..2b74aa608 100644
--- a/test/ft-text-vertical-layout-type1-ref.png
+++ b/test/ft-text-vertical-layout-type1.ref.png
diff --git a/test/ft-text-vertical-layout-type1-svg11-ref.png b/test/ft-text-vertical-layout-type1.svg11.ref.png
index 4ad4268bf..4ad4268bf 100644
--- a/test/ft-text-vertical-layout-type1-svg11-ref.png
+++ b/test/ft-text-vertical-layout-type1.svg11.ref.png
diff --git a/test/ft-text-vertical-layout-type1-svg12-ref.png b/test/ft-text-vertical-layout-type1.svg12.ref.png
index 4ad4268bf..4ad4268bf 100644
--- a/test/ft-text-vertical-layout-type1-svg12-ref.png
+++ b/test/ft-text-vertical-layout-type1.svg12.ref.png
diff --git a/test/ft-text-vertical-layout-type3-pdf-ref.png b/test/ft-text-vertical-layout-type3.pdf.ref.png
index 04e679b48..04e679b48 100644
--- a/test/ft-text-vertical-layout-type3-pdf-ref.png
+++ b/test/ft-text-vertical-layout-type3.pdf.ref.png
diff --git a/test/ft-text-vertical-layout-type3-ps2-ref.png b/test/ft-text-vertical-layout-type3.ps2.ref.png
index e6ad8fc0b..e6ad8fc0b 100644
--- a/test/ft-text-vertical-layout-type3-ps2-ref.png
+++ b/test/ft-text-vertical-layout-type3.ps2.ref.png
diff --git a/test/ft-text-vertical-layout-type3-ps3-ref.png b/test/ft-text-vertical-layout-type3.ps3.ref.png
index e6ad8fc0b..e6ad8fc0b 100644
--- a/test/ft-text-vertical-layout-type3-ps3-ref.png
+++ b/test/ft-text-vertical-layout-type3.ps3.ref.png
diff --git a/test/ft-text-vertical-layout-type3-ref.png b/test/ft-text-vertical-layout-type3.ref.png
index 8ec2ebec2..8ec2ebec2 100644
--- a/test/ft-text-vertical-layout-type3-ref.png
+++ b/test/ft-text-vertical-layout-type3.ref.png
diff --git a/test/ft-text-vertical-layout-type3-svg11-ref.png b/test/ft-text-vertical-layout-type3.svg11.ref.png
index 7aa322db2..7aa322db2 100644
--- a/test/ft-text-vertical-layout-type3-svg11-ref.png
+++ b/test/ft-text-vertical-layout-type3.svg11.ref.png
diff --git a/test/ft-text-vertical-layout-type3-svg12-ref.png b/test/ft-text-vertical-layout-type3.svg12.ref.png
index 7aa322db2..7aa322db2 100644
--- a/test/ft-text-vertical-layout-type3-svg12-ref.png
+++ b/test/ft-text-vertical-layout-type3.svg12.ref.png
diff --git a/test/get-group-target-ref.png b/test/get-group-target.ref.png
index 316a93f31..316a93f31 100644
--- a/test/get-group-target-ref.png
+++ b/test/get-group-target.ref.png
diff --git a/test/glitz-surface-source-ref.png b/test/glitz-surface-source.ref.png
index 3fa8bbe55..3fa8bbe55 100644
--- a/test/glitz-surface-source-ref.png
+++ b/test/glitz-surface-source.ref.png
diff --git a/test/glyph-cache-pressure-ps2-ref.png b/test/glyph-cache-pressure.ps2.ref.png
index 88fa4478b..88fa4478b 100644
--- a/test/glyph-cache-pressure-ps2-ref.png
+++ b/test/glyph-cache-pressure.ps2.ref.png
diff --git a/test/glyph-cache-pressure-ps3-ref.png b/test/glyph-cache-pressure.ps3.ref.png
index 88fa4478b..88fa4478b 100644
--- a/test/glyph-cache-pressure-ps3-ref.png
+++ b/test/glyph-cache-pressure.ps3.ref.png
diff --git a/test/glyph-cache-pressure-quartz-ref.png b/test/glyph-cache-pressure.quartz.ref.png
index 88d3db685..88d3db685 100644
--- a/test/glyph-cache-pressure-quartz-ref.png
+++ b/test/glyph-cache-pressure.quartz.ref.png
diff --git a/test/glyph-cache-pressure-ref.png b/test/glyph-cache-pressure.ref.png
index 0947a67dc..0947a67dc 100644
--- a/test/glyph-cache-pressure-ref.png
+++ b/test/glyph-cache-pressure.ref.png
diff --git a/test/gradient-alpha-pdf-argb32-ref.png b/test/gradient-alpha.pdf.argb32.ref.png
index bf9c69ab5..bf9c69ab5 100644
--- a/test/gradient-alpha-pdf-argb32-ref.png
+++ b/test/gradient-alpha.pdf.argb32.ref.png
diff --git a/test/gradient-alpha-pdf-rgb24-ref.png b/test/gradient-alpha.pdf.rgb24.ref.png
index 798527384..798527384 100644
--- a/test/gradient-alpha-pdf-rgb24-ref.png
+++ b/test/gradient-alpha.pdf.rgb24.ref.png
diff --git a/test/gradient-alpha-ps2-argb32-ref.png b/test/gradient-alpha.ps2.argb32.ref.png
index 37eafba3c..37eafba3c 100644
--- a/test/gradient-alpha-ps2-argb32-ref.png
+++ b/test/gradient-alpha.ps2.argb32.ref.png
diff --git a/test/gradient-alpha-ps2-rgb24-ref.png b/test/gradient-alpha.ps2.rgb24.ref.png
index 2432c2996..2432c2996 100644
--- a/test/gradient-alpha-ps2-rgb24-ref.png
+++ b/test/gradient-alpha.ps2.rgb24.ref.png
diff --git a/test/gradient-alpha-ps3-argb32-ref.png b/test/gradient-alpha.ps3.argb32.ref.png
index 37eafba3c..37eafba3c 100644
--- a/test/gradient-alpha-ps3-argb32-ref.png
+++ b/test/gradient-alpha.ps3.argb32.ref.png
diff --git a/test/gradient-alpha-ps3-rgb24-ref.png b/test/gradient-alpha.ps3.rgb24.ref.png
index 2432c2996..2432c2996 100644
--- a/test/gradient-alpha-ps3-rgb24-ref.png
+++ b/test/gradient-alpha.ps3.rgb24.ref.png
diff --git a/test/gradient-alpha-ref.png b/test/gradient-alpha.ref.png
index 43a0509bc..43a0509bc 100644
--- a/test/gradient-alpha-ref.png
+++ b/test/gradient-alpha.ref.png
diff --git a/test/gradient-alpha-rgb24-ref.png b/test/gradient-alpha.rgb24.ref.png
index 93ce8f592..93ce8f592 100644
--- a/test/gradient-alpha-rgb24-ref.png
+++ b/test/gradient-alpha.rgb24.ref.png
diff --git a/test/gradient-constant-alpha-pdf-argb32-ref.png b/test/gradient-constant-alpha.pdf.argb32.ref.png
index 056fcb2df..056fcb2df 100644
--- a/test/gradient-constant-alpha-pdf-argb32-ref.png
+++ b/test/gradient-constant-alpha.pdf.argb32.ref.png
diff --git a/test/gradient-constant-alpha-pdf-rgb24-ref.png b/test/gradient-constant-alpha.pdf.rgb24.ref.png
index 60c02630a..60c02630a 100644
--- a/test/gradient-constant-alpha-pdf-rgb24-ref.png
+++ b/test/gradient-constant-alpha.pdf.rgb24.ref.png
diff --git a/test/gradient-constant-alpha-ps3-ref.png b/test/gradient-constant-alpha.ps3.ref.png
index 7089f4fdc..7089f4fdc 100644
--- a/test/gradient-constant-alpha-ps3-ref.png
+++ b/test/gradient-constant-alpha.ps3.ref.png
diff --git a/test/gradient-constant-alpha-ps3-rgb24-ref.png b/test/gradient-constant-alpha.ps3.rgb24.ref.png
index 5962925f2..5962925f2 100644
--- a/test/gradient-constant-alpha-ps3-rgb24-ref.png
+++ b/test/gradient-constant-alpha.ps3.rgb24.ref.png
diff --git a/test/gradient-constant-alpha-ref.png b/test/gradient-constant-alpha.ref.png
index 9a24e8cda..9a24e8cda 100644
--- a/test/gradient-constant-alpha-ref.png
+++ b/test/gradient-constant-alpha.ref.png
diff --git a/test/gradient-constant-alpha-rgb24-ref.png b/test/gradient-constant-alpha.rgb24.ref.png
index f190009dd..f190009dd 100644
--- a/test/gradient-constant-alpha-rgb24-ref.png
+++ b/test/gradient-constant-alpha.rgb24.ref.png
diff --git a/test/gradient-zero-stops-ref.png b/test/gradient-zero-stops.ref.png
index 3f1867037..3f1867037 100644
--- a/test/gradient-zero-stops-ref.png
+++ b/test/gradient-zero-stops.ref.png
diff --git a/test/gradient-zero-stops-rgb24-ref.png b/test/gradient-zero-stops.rgb24.ref.png
index eb24e4b6e..eb24e4b6e 100644
--- a/test/gradient-zero-stops-rgb24-ref.png
+++ b/test/gradient-zero-stops.rgb24.ref.png
diff --git a/test/group-paint-ref.png b/test/group-paint.ref.png
index f2e111b88..f2e111b88 100644
--- a/test/group-paint-ref.png
+++ b/test/group-paint.ref.png
diff --git a/test/huge-pattern-pdf-ref.png b/test/huge-pattern.pdf.ref.png
index dfa8c5b7d..dfa8c5b7d 100644
--- a/test/huge-pattern-pdf-ref.png
+++ b/test/huge-pattern.pdf.ref.png
diff --git a/test/huge-pattern-pdf-rgb24-ref.png b/test/huge-pattern.pdf.rgb24.ref.png
index a950f8bb1..a950f8bb1 100644
--- a/test/huge-pattern-pdf-rgb24-ref.png
+++ b/test/huge-pattern.pdf.rgb24.ref.png
diff --git a/test/huge-pattern-ps3-ref.png b/test/huge-pattern.ps3.ref.png
index d55239bf4..d55239bf4 100644
--- a/test/huge-pattern-ps3-ref.png
+++ b/test/huge-pattern.ps3.ref.png
diff --git a/test/huge-pattern-ref.png b/test/huge-pattern.ref.png
index 68f86b40e..68f86b40e 100644
--- a/test/huge-pattern-ref.png
+++ b/test/huge-pattern.ref.png
diff --git a/test/image-surface-source-ps2-ref.png b/test/image-surface-source.ps2.ref.png
index 10231581b..10231581b 100644
--- a/test/image-surface-source-ps2-ref.png
+++ b/test/image-surface-source.ps2.ref.png
diff --git a/test/image-surface-source-ps3-ref.png b/test/image-surface-source.ps3.ref.png
index 10231581b..10231581b 100644
--- a/test/image-surface-source-ps3-ref.png
+++ b/test/image-surface-source.ps3.ref.png
diff --git a/test/image-surface-source-ref.png b/test/image-surface-source.ref.png
index 9fbbedd53..9fbbedd53 100644
--- a/test/image-surface-source-ref.png
+++ b/test/image-surface-source.ref.png
diff --git a/test/infinite-join-ps2-ref.png b/test/infinite-join.ps2.ref.png
index 6fba8f4b1..6fba8f4b1 100644
--- a/test/infinite-join-ps2-ref.png
+++ b/test/infinite-join.ps2.ref.png
diff --git a/test/infinite-join-ps3-ref.png b/test/infinite-join.ps3.ref.png
index 6fba8f4b1..6fba8f4b1 100644
--- a/test/infinite-join-ps3-ref.png
+++ b/test/infinite-join.ps3.ref.png
diff --git a/test/infinite-join-ref.png b/test/infinite-join.ref.png
index 5347d3bc3..5347d3bc3 100644
--- a/test/infinite-join-ref.png
+++ b/test/infinite-join.ref.png
diff --git a/test/large-clip-ref.png b/test/large-clip.ref.png
index 9e46d2d5f..9e46d2d5f 100644
--- a/test/large-clip-ref.png
+++ b/test/large-clip.ref.png
diff --git a/test/large-font-ref.png b/test/large-font.ref.png
index da5c43114..da5c43114 100644
--- a/test/large-font-ref.png
+++ b/test/large-font.ref.png
diff --git a/test/large-source-ref.png b/test/large-source.ref.png
index 5d96dd323..5d96dd323 100644
--- a/test/large-source-ref.png
+++ b/test/large-source.ref.png
diff --git a/test/leaky-dash-ps2-argb32-ref.png b/test/leaky-dash.ps2.argb32.ref.png
index 93b8640a9..93b8640a9 100644
--- a/test/leaky-dash-ps2-argb32-ref.png
+++ b/test/leaky-dash.ps2.argb32.ref.png
diff --git a/test/leaky-dash-ps2-rgb24-ref.png b/test/leaky-dash.ps2.rgb24.ref.png
index c11eb4807..c11eb4807 100644
--- a/test/leaky-dash-ps2-rgb24-ref.png
+++ b/test/leaky-dash.ps2.rgb24.ref.png
diff --git a/test/leaky-dash-ps3-argb32-ref.png b/test/leaky-dash.ps3.argb32.ref.png
index 93b8640a9..93b8640a9 100644
--- a/test/leaky-dash-ps3-argb32-ref.png
+++ b/test/leaky-dash.ps3.argb32.ref.png
diff --git a/test/leaky-dash-ps3-rgb24-ref.png b/test/leaky-dash.ps3.rgb24.ref.png
index c11eb4807..c11eb4807 100644
--- a/test/leaky-dash-ps3-rgb24-ref.png
+++ b/test/leaky-dash.ps3.rgb24.ref.png
diff --git a/test/leaky-dash-quartz-ref.png b/test/leaky-dash.quartz.ref.png
index 834335947..834335947 100644
--- a/test/leaky-dash-quartz-ref.png
+++ b/test/leaky-dash.quartz.ref.png
diff --git a/test/leaky-dash-ref.png b/test/leaky-dash.ref.png
index 87facc551..87facc551 100644
--- a/test/leaky-dash-ref.png
+++ b/test/leaky-dash.ref.png
diff --git a/test/leaky-dashed-rectangle-ps2-ref.png b/test/leaky-dashed-rectangle.ps2.ref.png
index e432de268..e432de268 100644
--- a/test/leaky-dashed-rectangle-ps2-ref.png
+++ b/test/leaky-dashed-rectangle.ps2.ref.png
diff --git a/test/leaky-dashed-rectangle-ps3-ref.png b/test/leaky-dashed-rectangle.ps3.ref.png
index e432de268..e432de268 100644
--- a/test/leaky-dashed-rectangle-ps3-ref.png
+++ b/test/leaky-dashed-rectangle.ps3.ref.png
diff --git a/test/leaky-dashed-rectangle-ref.png b/test/leaky-dashed-rectangle.ref.png
index 332d2fd78..332d2fd78 100644
--- a/test/leaky-dashed-rectangle-ref.png
+++ b/test/leaky-dashed-rectangle.ref.png
diff --git a/test/leaky-dashed-stroke-ps2-ref.png b/test/leaky-dashed-stroke.ps2.ref.png
index 1b2f6076e..1b2f6076e 100644
--- a/test/leaky-dashed-stroke-ps2-ref.png
+++ b/test/leaky-dashed-stroke.ps2.ref.png
diff --git a/test/leaky-dashed-stroke-ps3-ref.png b/test/leaky-dashed-stroke.ps3.ref.png
index 1b2f6076e..1b2f6076e 100644
--- a/test/leaky-dashed-stroke-ps3-ref.png
+++ b/test/leaky-dashed-stroke.ps3.ref.png
diff --git a/test/leaky-dashed-stroke-ref.png b/test/leaky-dashed-stroke.ref.png
index e79d4d118..e79d4d118 100644
--- a/test/leaky-dashed-stroke-ref.png
+++ b/test/leaky-dashed-stroke.ref.png
diff --git a/test/leaky-polygon-ps2-ref.png b/test/leaky-polygon.ps2.ref.png
index 5e8808c46..5e8808c46 100644
--- a/test/leaky-polygon-ps2-ref.png
+++ b/test/leaky-polygon.ps2.ref.png
diff --git a/test/leaky-polygon-ps3-ref.png b/test/leaky-polygon.ps3.ref.png
index 5e8808c46..5e8808c46 100644
--- a/test/leaky-polygon-ps3-ref.png
+++ b/test/leaky-polygon.ps3.ref.png
diff --git a/test/leaky-polygon-ref.png b/test/leaky-polygon.ref.png
index 15afc5dba..15afc5dba 100644
--- a/test/leaky-polygon-ref.png
+++ b/test/leaky-polygon.ref.png
diff --git a/test/line-width-scale-ps2-ref.png b/test/line-width-scale.ps2.ref.png
index 9d95aafaa..9d95aafaa 100644
--- a/test/line-width-scale-ps2-ref.png
+++ b/test/line-width-scale.ps2.ref.png
diff --git a/test/line-width-scale-ps3-ref.png b/test/line-width-scale.ps3.ref.png
index 9d95aafaa..9d95aafaa 100644
--- a/test/line-width-scale-ps3-ref.png
+++ b/test/line-width-scale.ps3.ref.png
diff --git a/test/line-width-scale-quartz-ref.png b/test/line-width-scale.quartz.ref.png
index 7a3153930..7a3153930 100644
--- a/test/line-width-scale-quartz-ref.png
+++ b/test/line-width-scale.quartz.ref.png
diff --git a/test/line-width-scale-ref.png b/test/line-width-scale.ref.png
index c40bce39a..c40bce39a 100644
--- a/test/line-width-scale-ref.png
+++ b/test/line-width-scale.ref.png
diff --git a/test/line-width-ref.png b/test/line-width.ref.png
index 81ac2f593..81ac2f593 100644
--- a/test/line-width-ref.png
+++ b/test/line-width.ref.png
diff --git a/test/linear-gradient-reflect-pdf-argb32-ref.png b/test/linear-gradient-reflect.pdf.argb32.ref.png
index 46e1c0f0e..46e1c0f0e 100644
--- a/test/linear-gradient-reflect-pdf-argb32-ref.png
+++ b/test/linear-gradient-reflect.pdf.argb32.ref.png
diff --git a/test/linear-gradient-reflect-pdf-rgb24-ref.png b/test/linear-gradient-reflect.pdf.rgb24.ref.png
index 46e1c0f0e..46e1c0f0e 100644
--- a/test/linear-gradient-reflect-pdf-rgb24-ref.png
+++ b/test/linear-gradient-reflect.pdf.rgb24.ref.png
diff --git a/test/linear-gradient-reflect-ps3-ref.png b/test/linear-gradient-reflect.ps3.ref.png
index ea6d25c17..ea6d25c17 100644
--- a/test/linear-gradient-reflect-ps3-ref.png
+++ b/test/linear-gradient-reflect.ps3.ref.png
diff --git a/test/linear-gradient-reflect-quartz-ref.png b/test/linear-gradient-reflect.quartz.ref.png
index a0067ac32..a0067ac32 100644
--- a/test/linear-gradient-reflect-quartz-ref.png
+++ b/test/linear-gradient-reflect.quartz.ref.png
diff --git a/test/linear-gradient-reflect-ref.png b/test/linear-gradient-reflect.ref.png
index e4f9db8fe..e4f9db8fe 100644
--- a/test/linear-gradient-reflect-ref.png
+++ b/test/linear-gradient-reflect.ref.png
diff --git a/test/linear-gradient-pdf-ref.png b/test/linear-gradient.pdf.ref.png
index ede7c9011..ede7c9011 100644
--- a/test/linear-gradient-pdf-ref.png
+++ b/test/linear-gradient.pdf.ref.png
diff --git a/test/linear-gradient-ps3-ref.png b/test/linear-gradient.ps3.ref.png
index c2fa71b11..c2fa71b11 100644
--- a/test/linear-gradient-ps3-ref.png
+++ b/test/linear-gradient.ps3.ref.png
diff --git a/test/linear-gradient-quartz-ref.png b/test/linear-gradient.quartz.ref.png
index 43fb5085f..43fb5085f 100644
--- a/test/linear-gradient-quartz-ref.png
+++ b/test/linear-gradient.quartz.ref.png
diff --git a/test/linear-gradient-ref.png b/test/linear-gradient.ref.png
index cb8f90897..cb8f90897 100644
--- a/test/linear-gradient-ref.png
+++ b/test/linear-gradient.ref.png
diff --git a/test/linear-gradient-svg11-ref.png b/test/linear-gradient.svg11.ref.png
index 4ed4bfa83..4ed4bfa83 100644
--- a/test/linear-gradient-svg11-ref.png
+++ b/test/linear-gradient.svg11.ref.png
diff --git a/test/linear-gradient-svg12-ref.png b/test/linear-gradient.svg12.ref.png
index 4ed4bfa83..4ed4bfa83 100644
--- a/test/linear-gradient-svg12-ref.png
+++ b/test/linear-gradient.svg12.ref.png
diff --git a/test/long-dashed-lines-ps2-ref.png b/test/long-dashed-lines.ps2.ref.png
index 82484f4f8..82484f4f8 100644
--- a/test/long-dashed-lines-ps2-ref.png
+++ b/test/long-dashed-lines.ps2.ref.png
diff --git a/test/long-dashed-lines-ps3-ref.png b/test/long-dashed-lines.ps3.ref.png
index 82484f4f8..82484f4f8 100644
--- a/test/long-dashed-lines-ps3-ref.png
+++ b/test/long-dashed-lines.ps3.ref.png
diff --git a/test/long-dashed-lines-quartz-ref.png b/test/long-dashed-lines.quartz.ref.png
index 439263adc..439263adc 100644
--- a/test/long-dashed-lines-quartz-ref.png
+++ b/test/long-dashed-lines.quartz.ref.png
diff --git a/test/long-dashed-lines-ref.png b/test/long-dashed-lines.ref.png
index caf8b5e5f..caf8b5e5f 100644
--- a/test/long-dashed-lines-ref.png
+++ b/test/long-dashed-lines.ref.png
diff --git a/test/long-lines-ref.png b/test/long-lines.ref.png
index 6119204cc..6119204cc 100644
--- a/test/long-lines-ref.png
+++ b/test/long-lines.ref.png
diff --git a/test/mask-alpha-quartz-argb32-ref.png b/test/mask-alpha.quartz.argb32.ref.png
index a7fdc5fd7..a7fdc5fd7 100644
--- a/test/mask-alpha-quartz-argb32-ref.png
+++ b/test/mask-alpha.quartz.argb32.ref.png
diff --git a/test/mask-alpha-ref.png b/test/mask-alpha.ref.png
index 715a959e0..715a959e0 100644
--- a/test/mask-alpha-ref.png
+++ b/test/mask-alpha.ref.png
diff --git a/test/mask-alpha-rgb24-ref.png b/test/mask-alpha.rgb24.ref.png
index aa2010f36..aa2010f36 100644
--- a/test/mask-alpha-rgb24-ref.png
+++ b/test/mask-alpha.rgb24.ref.png
diff --git a/test/mask-alpha-svg11-argb32-ref.png b/test/mask-alpha.svg11.argb32.ref.png
index 3e56aa34e..3e56aa34e 100644
--- a/test/mask-alpha-svg11-argb32-ref.png
+++ b/test/mask-alpha.svg11.argb32.ref.png
diff --git a/test/mask-alpha-svg12-argb32-ref.png b/test/mask-alpha.svg12.argb32.ref.png
index 3e56aa34e..3e56aa34e 100644
--- a/test/mask-alpha-svg12-argb32-ref.png
+++ b/test/mask-alpha.svg12.argb32.ref.png
diff --git a/test/mask-ctm-ref.png b/test/mask-ctm.ref.png
index 88a0402ca..88a0402ca 100644
--- a/test/mask-ctm-ref.png
+++ b/test/mask-ctm.ref.png
diff --git a/test/mask-ctm-rgb24-ref.png b/test/mask-ctm.rgb24.ref.png
index 266cb0d12..266cb0d12 100644
--- a/test/mask-ctm-rgb24-ref.png
+++ b/test/mask-ctm.rgb24.ref.png
diff --git a/test/mask-ctm-svg11-argb32-ref.png b/test/mask-ctm.svg11.argb32.ref.png
index 049d5f0d0..049d5f0d0 100644
--- a/test/mask-ctm-svg11-argb32-ref.png
+++ b/test/mask-ctm.svg11.argb32.ref.png
diff --git a/test/mask-ctm-svg12-argb32-ref.png b/test/mask-ctm.svg12.argb32.ref.png
index 049d5f0d0..049d5f0d0 100644
--- a/test/mask-ctm-svg12-argb32-ref.png
+++ b/test/mask-ctm.svg12.argb32.ref.png
diff --git a/test/mask-surface-ctm-ref.png b/test/mask-surface-ctm.ref.png
index 744b1dd37..744b1dd37 100644
--- a/test/mask-surface-ctm-ref.png
+++ b/test/mask-surface-ctm.ref.png
diff --git a/test/mask-surface-ctm-rgb24-ref.png b/test/mask-surface-ctm.rgb24.ref.png
index a2bdc6111..a2bdc6111 100644
--- a/test/mask-surface-ctm-rgb24-ref.png
+++ b/test/mask-surface-ctm.rgb24.ref.png
diff --git a/test/mask-surface-ctm-svg11-argb32-ref.png b/test/mask-surface-ctm.svg11.argb32.ref.png
index 049d5f0d0..049d5f0d0 100644
--- a/test/mask-surface-ctm-svg11-argb32-ref.png
+++ b/test/mask-surface-ctm.svg11.argb32.ref.png
diff --git a/test/mask-surface-ctm-svg12-argb32-ref.png b/test/mask-surface-ctm.svg12.argb32.ref.png
index 049d5f0d0..049d5f0d0 100644
--- a/test/mask-surface-ctm-svg12-argb32-ref.png
+++ b/test/mask-surface-ctm.svg12.argb32.ref.png
diff --git a/test/mask-transformed-image-ref.png b/test/mask-transformed-image.ref.png
index e634f75ee..e634f75ee 100644
--- a/test/mask-transformed-image-ref.png
+++ b/test/mask-transformed-image.ref.png
diff --git a/test/mask-transformed-similar-pdf-ref.png b/test/mask-transformed-similar.pdf.ref.png
index e8d387903..e8d387903 100644
--- a/test/mask-transformed-similar-pdf-ref.png
+++ b/test/mask-transformed-similar.pdf.ref.png
diff --git a/test/mask-transformed-similar-ref.png b/test/mask-transformed-similar.ref.png
index e634f75ee..e634f75ee 100644
--- a/test/mask-transformed-similar-ref.png
+++ b/test/mask-transformed-similar.ref.png
diff --git a/test/mask-transformed-similar-svg11-ref.png b/test/mask-transformed-similar.svg11.ref.png
index b4344cd12..b4344cd12 100644
--- a/test/mask-transformed-similar-svg11-ref.png
+++ b/test/mask-transformed-similar.svg11.ref.png
diff --git a/test/mask-transformed-similar-svg12-ref.png b/test/mask-transformed-similar.svg12.ref.png
index b4344cd12..b4344cd12 100644
--- a/test/mask-transformed-similar-svg12-ref.png
+++ b/test/mask-transformed-similar.svg12.ref.png
diff --git a/test/mask-pdf-argb32-ref.png b/test/mask.pdf.argb32.ref.png
index 4570bff18..4570bff18 100644
--- a/test/mask-pdf-argb32-ref.png
+++ b/test/mask.pdf.argb32.ref.png
diff --git a/test/mask-pdf-rgb24-ref.png b/test/mask.pdf.rgb24.ref.png
index 1231965db..1231965db 100644
--- a/test/mask-pdf-rgb24-ref.png
+++ b/test/mask.pdf.rgb24.ref.png
diff --git a/test/mask-quartz-ref.png b/test/mask.quartz.ref.png
index a90218acb..a90218acb 100644
--- a/test/mask-quartz-ref.png
+++ b/test/mask.quartz.ref.png
diff --git a/test/mask-quartz-rgb24-ref.png b/test/mask.quartz.rgb24.ref.png
index b9c57c7d1..b9c57c7d1 100644
--- a/test/mask-quartz-rgb24-ref.png
+++ b/test/mask.quartz.rgb24.ref.png
diff --git a/test/mask-ref.png b/test/mask.ref.png
index 549c130c2..549c130c2 100644
--- a/test/mask-ref.png
+++ b/test/mask.ref.png
diff --git a/test/mask-rgb24-ref.png b/test/mask.rgb24.ref.png
index 703236723..703236723 100644
--- a/test/mask-rgb24-ref.png
+++ b/test/mask.rgb24.ref.png
diff --git a/test/mask-svg11-argb32-ref.png b/test/mask.svg11.argb32.ref.png
index c58285910..c58285910 100644
--- a/test/mask-svg11-argb32-ref.png
+++ b/test/mask.svg11.argb32.ref.png
diff --git a/test/mask-svg11-rgb24-ref.png b/test/mask.svg11.rgb24.ref.png
index 79957237f..79957237f 100644
--- a/test/mask-svg11-rgb24-ref.png
+++ b/test/mask.svg11.rgb24.ref.png
diff --git a/test/mask-svg12-argb32-ref.png b/test/mask.svg12.argb32.ref.png
index c58285910..c58285910 100644
--- a/test/mask-svg12-argb32-ref.png
+++ b/test/mask.svg12.argb32.ref.png
diff --git a/test/mask-svg12-rgb24-ref.png b/test/mask.svg12.rgb24.ref.png
index 79957237f..79957237f 100644
--- a/test/mask-svg12-rgb24-ref.png
+++ b/test/mask.svg12.rgb24.ref.png
diff --git a/test/meta-surface-pattern-pdf-ref.png b/test/meta-surface-pattern.pdf.ref.png
index 2e561b2b4..2e561b2b4 100644
--- a/test/meta-surface-pattern-pdf-ref.png
+++ b/test/meta-surface-pattern.pdf.ref.png
diff --git a/test/meta-surface-pattern-pdf-rgb24-ref.png b/test/meta-surface-pattern.pdf.rgb24.ref.png
index 680f0f502..680f0f502 100644
--- a/test/meta-surface-pattern-pdf-rgb24-ref.png
+++ b/test/meta-surface-pattern.pdf.rgb24.ref.png
diff --git a/test/meta-surface-pattern-ps2-argb32-ref.png b/test/meta-surface-pattern.ps2.argb32.ref.png
index fbd58ef7a..fbd58ef7a 100644
--- a/test/meta-surface-pattern-ps2-argb32-ref.png
+++ b/test/meta-surface-pattern.ps2.argb32.ref.png
diff --git a/test/meta-surface-pattern-ps2-rgb24-ref.png b/test/meta-surface-pattern.ps2.rgb24.ref.png
index 84da8daf2..84da8daf2 100644
--- a/test/meta-surface-pattern-ps2-rgb24-ref.png
+++ b/test/meta-surface-pattern.ps2.rgb24.ref.png
diff --git a/test/meta-surface-pattern-ps3-argb32-ref.png b/test/meta-surface-pattern.ps3.argb32.ref.png
index fbd58ef7a..fbd58ef7a 100644
--- a/test/meta-surface-pattern-ps3-argb32-ref.png
+++ b/test/meta-surface-pattern.ps3.argb32.ref.png
diff --git a/test/meta-surface-pattern-ps3-rgb24-ref.png b/test/meta-surface-pattern.ps3.rgb24.ref.png
index 84da8daf2..84da8daf2 100644
--- a/test/meta-surface-pattern-ps3-rgb24-ref.png
+++ b/test/meta-surface-pattern.ps3.rgb24.ref.png
diff --git a/test/meta-surface-pattern-quartz-ref.png b/test/meta-surface-pattern.quartz.ref.png
index 755f28147..755f28147 100644
--- a/test/meta-surface-pattern-quartz-ref.png
+++ b/test/meta-surface-pattern.quartz.ref.png
diff --git a/test/meta-surface-pattern-quartz-rgb24-ref.png b/test/meta-surface-pattern.quartz.rgb24.ref.png
index b71891e0c..b71891e0c 100644
--- a/test/meta-surface-pattern-quartz-rgb24-ref.png
+++ b/test/meta-surface-pattern.quartz.rgb24.ref.png
diff --git a/test/meta-surface-pattern-ref.png b/test/meta-surface-pattern.ref.png
index 7f9c56cd5..7f9c56cd5 100644
--- a/test/meta-surface-pattern-ref.png
+++ b/test/meta-surface-pattern.ref.png
diff --git a/test/meta-surface-pattern-rgb24-ref.png b/test/meta-surface-pattern.rgb24.ref.png
index 2de298dc1..2de298dc1 100644
--- a/test/meta-surface-pattern-rgb24-ref.png
+++ b/test/meta-surface-pattern.rgb24.ref.png
diff --git a/test/meta-surface-pattern-svg11-argb32-ref.png b/test/meta-surface-pattern.svg11.argb32.ref.png
index 6250f26c8..6250f26c8 100644
--- a/test/meta-surface-pattern-svg11-argb32-ref.png
+++ b/test/meta-surface-pattern.svg11.argb32.ref.png
diff --git a/test/meta-surface-pattern-svg11-rgb24-ref.png b/test/meta-surface-pattern.svg11.rgb24.ref.png
index feda67da3..feda67da3 100644
--- a/test/meta-surface-pattern-svg11-rgb24-ref.png
+++ b/test/meta-surface-pattern.svg11.rgb24.ref.png
diff --git a/test/meta-surface-pattern-svg12-argb32-ref.png b/test/meta-surface-pattern.svg12.argb32.ref.png
index 6250f26c8..6250f26c8 100644
--- a/test/meta-surface-pattern-svg12-argb32-ref.png
+++ b/test/meta-surface-pattern.svg12.argb32.ref.png
diff --git a/test/meta-surface-pattern-svg12-rgb24-ref.png b/test/meta-surface-pattern.svg12.rgb24.ref.png
index feda67da3..feda67da3 100644
--- a/test/meta-surface-pattern-svg12-rgb24-ref.png
+++ b/test/meta-surface-pattern.svg12.rgb24.ref.png
diff --git a/test/miter-precision-ps2-ref.png b/test/miter-precision.ps2.ref.png
index c2b69ad6a..c2b69ad6a 100644
--- a/test/miter-precision-ps2-ref.png
+++ b/test/miter-precision.ps2.ref.png
diff --git a/test/miter-precision-ps3-ref.png b/test/miter-precision.ps3.ref.png
index c2b69ad6a..c2b69ad6a 100644
--- a/test/miter-precision-ps3-ref.png
+++ b/test/miter-precision.ps3.ref.png
diff --git a/test/miter-precision-ref.png b/test/miter-precision.ref.png
index c9f7f5bd6..c9f7f5bd6 100644
--- a/test/miter-precision-ref.png
+++ b/test/miter-precision.ref.png
diff --git a/test/move-to-show-surface-ref.png b/test/move-to-show-surface.ref.png
index 765adc4a4..765adc4a4 100644
--- a/test/move-to-show-surface-ref.png
+++ b/test/move-to-show-surface.ref.png
diff --git a/test/multi-page.c b/test/multi-page.c
index 89f00c7ab..0b7390268 100644
--- a/test/multi-page.c
+++ b/test/multi-page.c
@@ -142,7 +142,7 @@ preamble (cairo_test_context_t *ctx)
 	if (result == CAIRO_TEST_UNTESTED)
 	    result = CAIRO_TEST_SUCCESS;
 
-	filename = "multi-page-out.ps";
+	filename = "multi-page.out.ps";
 	surface = cairo_ps_surface_create (filename,
 					   WIDTH_IN_POINTS, HEIGHT_IN_POINTS);
 	status = cairo_surface_status (surface);
@@ -165,7 +165,7 @@ preamble (cairo_test_context_t *ctx)
 	if (result == CAIRO_TEST_UNTESTED)
 	    result = CAIRO_TEST_SUCCESS;
 
-	filename = "multi-page-out.pdf";
+	filename = "multi-page.out.pdf";
 	surface = cairo_pdf_surface_create (filename,
 					    WIDTH_IN_POINTS, HEIGHT_IN_POINTS);
 	status = cairo_surface_status (surface);
diff --git a/test/new-sub-path-ps2-argb32-ref.png b/test/new-sub-path.ps2.argb32.ref.png
index 69257d904..69257d904 100644
--- a/test/new-sub-path-ps2-argb32-ref.png
+++ b/test/new-sub-path.ps2.argb32.ref.png
diff --git a/test/new-sub-path-ps2-rgb24-ref.png b/test/new-sub-path.ps2.rgb24.ref.png
index bceb5b75a..bceb5b75a 100644
--- a/test/new-sub-path-ps2-rgb24-ref.png
+++ b/test/new-sub-path.ps2.rgb24.ref.png
diff --git a/test/new-sub-path-ps3-argb32-ref.png b/test/new-sub-path.ps3.argb32.ref.png
index 69257d904..69257d904 100644
--- a/test/new-sub-path-ps3-argb32-ref.png
+++ b/test/new-sub-path.ps3.argb32.ref.png
diff --git a/test/new-sub-path-ps3-rgb24-ref.png b/test/new-sub-path.ps3.rgb24.ref.png
index bceb5b75a..bceb5b75a 100644
--- a/test/new-sub-path-ps3-rgb24-ref.png
+++ b/test/new-sub-path.ps3.rgb24.ref.png
diff --git a/test/new-sub-path-quartz-ref.png b/test/new-sub-path.quartz.ref.png
index 42780176a..42780176a 100644
--- a/test/new-sub-path-quartz-ref.png
+++ b/test/new-sub-path.quartz.ref.png
diff --git a/test/new-sub-path-quartz-rgb24-ref.png b/test/new-sub-path.quartz.rgb24.ref.png
index efc907e83..efc907e83 100644
--- a/test/new-sub-path-quartz-rgb24-ref.png
+++ b/test/new-sub-path.quartz.rgb24.ref.png
diff --git a/test/new-sub-path-ref.png b/test/new-sub-path.ref.png
index 7319ab3fc..7319ab3fc 100644
--- a/test/new-sub-path-ref.png
+++ b/test/new-sub-path.ref.png
diff --git a/test/new-sub-path-rgb24-ref.png b/test/new-sub-path.rgb24.ref.png
index 8cbc73161..8cbc73161 100644
--- a/test/new-sub-path-rgb24-ref.png
+++ b/test/new-sub-path.rgb24.ref.png
diff --git a/test/nil-surface-ref.png b/test/nil-surface.ref.png
index 79dd2bc1d..79dd2bc1d 100644
--- a/test/nil-surface-ref.png
+++ b/test/nil-surface.ref.png
diff --git a/test/nil-surface-rgb24-ref.png b/test/nil-surface.rgb24.ref.png
index 97b2cfaa5..97b2cfaa5 100644
--- a/test/nil-surface-rgb24-ref.png
+++ b/test/nil-surface.rgb24.ref.png
diff --git a/test/operator-alpha-ref.png b/test/operator-alpha.ref.png
index b4f3b71f0..b4f3b71f0 100644
--- a/test/operator-alpha-ref.png
+++ b/test/operator-alpha.ref.png
diff --git a/test/operator-alpha-rgb24-ref.png b/test/operator-alpha.rgb24.ref.png
index 3263550e1..3263550e1 100644
--- a/test/operator-alpha-rgb24-ref.png
+++ b/test/operator-alpha.rgb24.ref.png
diff --git a/test/operator-clear-pdf-argb32-ref.png b/test/operator-clear.pdf.argb32.ref.png
index 06fc51e39..06fc51e39 100644
--- a/test/operator-clear-pdf-argb32-ref.png
+++ b/test/operator-clear.pdf.argb32.ref.png
diff --git a/test/operator-clear-pdf-rgb24-ref.png b/test/operator-clear.pdf.rgb24.ref.png
index 55b44ad6f..55b44ad6f 100644
--- a/test/operator-clear-pdf-rgb24-ref.png
+++ b/test/operator-clear.pdf.rgb24.ref.png
diff --git a/test/operator-clear-quartz-ref.png b/test/operator-clear.quartz.ref.png
index 095f1824a..095f1824a 100644
--- a/test/operator-clear-quartz-ref.png
+++ b/test/operator-clear.quartz.ref.png
diff --git a/test/operator-clear-quartz-rgb24-ref.png b/test/operator-clear.quartz.rgb24.ref.png
index f978967ec..f978967ec 100644
--- a/test/operator-clear-quartz-rgb24-ref.png
+++ b/test/operator-clear.quartz.rgb24.ref.png
diff --git a/test/operator-clear-ref.png b/test/operator-clear.ref.png
index a3f8b7f02..a3f8b7f02 100644
--- a/test/operator-clear-ref.png
+++ b/test/operator-clear.ref.png
diff --git a/test/operator-clear-rgb24-ref.png b/test/operator-clear.rgb24.ref.png
index d80da8be7..d80da8be7 100644
--- a/test/operator-clear-rgb24-ref.png
+++ b/test/operator-clear.rgb24.ref.png
diff --git a/test/operator-source-pdf-argb32-ref.png b/test/operator-source.pdf.argb32.ref.png
index f110ff2ab..f110ff2ab 100644
--- a/test/operator-source-pdf-argb32-ref.png
+++ b/test/operator-source.pdf.argb32.ref.png
diff --git a/test/operator-source-pdf-rgb24-ref.png b/test/operator-source.pdf.rgb24.ref.png
index c6b71705f..c6b71705f 100644
--- a/test/operator-source-pdf-rgb24-ref.png
+++ b/test/operator-source.pdf.rgb24.ref.png
diff --git a/test/operator-source-quartz-ref.png b/test/operator-source.quartz.ref.png
index 31fc441a0..31fc441a0 100644
--- a/test/operator-source-quartz-ref.png
+++ b/test/operator-source.quartz.ref.png
diff --git a/test/operator-source-quartz-rgb24-ref.png b/test/operator-source.quartz.rgb24.ref.png
index 358e95140..358e95140 100644
--- a/test/operator-source-quartz-rgb24-ref.png
+++ b/test/operator-source.quartz.rgb24.ref.png
diff --git a/test/operator-source-ref.png b/test/operator-source.ref.png
index 8e2f5e61f..8e2f5e61f 100644
--- a/test/operator-source-ref.png
+++ b/test/operator-source.ref.png
diff --git a/test/operator-source-rgb24-ref.png b/test/operator-source.rgb24.ref.png
index a762d60ab..a762d60ab 100644
--- a/test/operator-source-rgb24-ref.png
+++ b/test/operator-source.rgb24.ref.png
diff --git a/test/operator-ref.png b/test/operator.ref.png
index 34fce987b..34fce987b 100644
--- a/test/operator-ref.png
+++ b/test/operator.ref.png
diff --git a/test/operator-rgb24-ref.png b/test/operator.rgb24.ref.png
index 3a6309c6b..3a6309c6b 100644
--- a/test/operator-rgb24-ref.png
+++ b/test/operator.rgb24.ref.png
diff --git a/test/over-above-source-ps2-argb32-ref.png b/test/over-above-source.ps2.argb32.ref.png
index 886faad4c..886faad4c 100644
--- a/test/over-above-source-ps2-argb32-ref.png
+++ b/test/over-above-source.ps2.argb32.ref.png
diff --git a/test/over-above-source-ps3-argb32-ref.png b/test/over-above-source.ps3.argb32.ref.png
index 886faad4c..886faad4c 100644
--- a/test/over-above-source-ps3-argb32-ref.png
+++ b/test/over-above-source.ps3.argb32.ref.png
diff --git a/test/over-above-source-quartz-ref.png b/test/over-above-source.quartz.ref.png
index 79d3c93af..79d3c93af 100644
--- a/test/over-above-source-quartz-ref.png
+++ b/test/over-above-source.quartz.ref.png
diff --git a/test/over-above-source-quartz-rgb24-ref.png b/test/over-above-source.quartz.rgb24.ref.png
index 38e823e91..38e823e91 100644
--- a/test/over-above-source-quartz-rgb24-ref.png
+++ b/test/over-above-source.quartz.rgb24.ref.png
diff --git a/test/over-above-source-ref.png b/test/over-above-source.ref.png
index f3a49f617..f3a49f617 100644
--- a/test/over-above-source-ref.png
+++ b/test/over-above-source.ref.png
diff --git a/test/over-above-source-rgb24-ref.png b/test/over-above-source.rgb24.ref.png
index 68c7d982b..68c7d982b 100644
--- a/test/over-above-source-rgb24-ref.png
+++ b/test/over-above-source.rgb24.ref.png
diff --git a/test/over-around-source-ps2-argb32-ref.png b/test/over-around-source.ps2.argb32.ref.png
index ea6de6964..ea6de6964 100644
--- a/test/over-around-source-ps2-argb32-ref.png
+++ b/test/over-around-source.ps2.argb32.ref.png
diff --git a/test/over-around-source-ps2-rgb24-ref.png b/test/over-around-source.ps2.rgb24.ref.png
index ee325eab3..ee325eab3 100644
--- a/test/over-around-source-ps2-rgb24-ref.png
+++ b/test/over-around-source.ps2.rgb24.ref.png
diff --git a/test/over-around-source-ps3-argb32-ref.png b/test/over-around-source.ps3.argb32.ref.png
index ea6de6964..ea6de6964 100644
--- a/test/over-around-source-ps3-argb32-ref.png
+++ b/test/over-around-source.ps3.argb32.ref.png
diff --git a/test/over-around-source-ps3-rgb24-ref.png b/test/over-around-source.ps3.rgb24.ref.png
index ee325eab3..ee325eab3 100644
--- a/test/over-around-source-ps3-rgb24-ref.png
+++ b/test/over-around-source.ps3.rgb24.ref.png
diff --git a/test/over-around-source-quartz-ref.png b/test/over-around-source.quartz.ref.png
index 417c8a7df..417c8a7df 100644
--- a/test/over-around-source-quartz-ref.png
+++ b/test/over-around-source.quartz.ref.png
diff --git a/test/over-around-source-quartz-rgb24-ref.png b/test/over-around-source.quartz.rgb24.ref.png
index 3e4d76400..3e4d76400 100644
--- a/test/over-around-source-quartz-rgb24-ref.png
+++ b/test/over-around-source.quartz.rgb24.ref.png
diff --git a/test/over-around-source-ref.png b/test/over-around-source.ref.png
index ccae95147..ccae95147 100644
--- a/test/over-around-source-ref.png
+++ b/test/over-around-source.ref.png
diff --git a/test/over-around-source-rgb24-ref.png b/test/over-around-source.rgb24.ref.png
index 943a28e35..943a28e35 100644
--- a/test/over-around-source-rgb24-ref.png
+++ b/test/over-around-source.rgb24.ref.png
diff --git a/test/over-below-source-ps2-argb32-ref.png b/test/over-below-source.ps2.argb32.ref.png
index 980ad5f95..980ad5f95 100644
--- a/test/over-below-source-ps2-argb32-ref.png
+++ b/test/over-below-source.ps2.argb32.ref.png
diff --git a/test/over-below-source-ps3-argb32-ref.png b/test/over-below-source.ps3.argb32.ref.png
index 980ad5f95..980ad5f95 100644
--- a/test/over-below-source-ps3-argb32-ref.png
+++ b/test/over-below-source.ps3.argb32.ref.png
diff --git a/test/over-below-source-ref.png b/test/over-below-source.ref.png
index cd7efd629..cd7efd629 100644
--- a/test/over-below-source-ref.png
+++ b/test/over-below-source.ref.png
diff --git a/test/over-below-source-rgb24-ref.png b/test/over-below-source.rgb24.ref.png
index 53041e9b6..53041e9b6 100644
--- a/test/over-below-source-rgb24-ref.png
+++ b/test/over-below-source.rgb24.ref.png
diff --git a/test/over-between-source-ps2-argb32-ref.png b/test/over-between-source.ps2.argb32.ref.png
index 43e9424bd..43e9424bd 100644
--- a/test/over-between-source-ps2-argb32-ref.png
+++ b/test/over-between-source.ps2.argb32.ref.png
diff --git a/test/over-between-source-ps3-argb32-ref.png b/test/over-between-source.ps3.argb32.ref.png
index 43e9424bd..43e9424bd 100644
--- a/test/over-between-source-ps3-argb32-ref.png
+++ b/test/over-between-source.ps3.argb32.ref.png
diff --git a/test/over-between-source-quartz-ref.png b/test/over-between-source.quartz.ref.png
index de954d5f8..de954d5f8 100644
--- a/test/over-between-source-quartz-ref.png
+++ b/test/over-between-source.quartz.ref.png
diff --git a/test/over-between-source-quartz-rgb24-ref.png b/test/over-between-source.quartz.rgb24.ref.png
index 97dae07f4..97dae07f4 100644
--- a/test/over-between-source-quartz-rgb24-ref.png
+++ b/test/over-between-source.quartz.rgb24.ref.png
diff --git a/test/over-between-source-ref.png b/test/over-between-source.ref.png
index 79ea75e95..79ea75e95 100644
--- a/test/over-between-source-ref.png
+++ b/test/over-between-source.ref.png
diff --git a/test/over-between-source-rgb24-ref.png b/test/over-between-source.rgb24.ref.png
index 602f2d26f..602f2d26f 100644
--- a/test/over-between-source-rgb24-ref.png
+++ b/test/over-between-source.rgb24.ref.png
diff --git a/test/paint-repeat-ref.png b/test/paint-repeat.ref.png
index 2cc48f336..2cc48f336 100644
--- a/test/paint-repeat-ref.png
+++ b/test/paint-repeat.ref.png
diff --git a/test/paint-source-alpha-pdf-argb32-ref.png b/test/paint-source-alpha.pdf.argb32.ref.png
index d1c23e8ea..d1c23e8ea 100644
--- a/test/paint-source-alpha-pdf-argb32-ref.png
+++ b/test/paint-source-alpha.pdf.argb32.ref.png
diff --git a/test/paint-source-alpha-pdf-ref.png b/test/paint-source-alpha.pdf.ref.png
index befab1086..befab1086 100644
--- a/test/paint-source-alpha-pdf-ref.png
+++ b/test/paint-source-alpha.pdf.ref.png
diff --git a/test/paint-source-alpha-ref.png b/test/paint-source-alpha.ref.png
index 548bcd7f3..548bcd7f3 100644
--- a/test/paint-source-alpha-ref.png
+++ b/test/paint-source-alpha.ref.png
diff --git a/test/paint-source-alpha-svg11-ref.png b/test/paint-source-alpha.svg11.ref.png
index 8736d44ab..8736d44ab 100644
--- a/test/paint-source-alpha-svg11-ref.png
+++ b/test/paint-source-alpha.svg11.ref.png
diff --git a/test/paint-source-alpha-svg12-ref.png b/test/paint-source-alpha.svg12.ref.png
index 3b3a990c6..3b3a990c6 100644
--- a/test/paint-source-alpha-svg12-ref.png
+++ b/test/paint-source-alpha.svg12.ref.png
diff --git a/test/paint-with-alpha-pdf-ref.png b/test/paint-with-alpha.pdf.ref.png
index 9da63ada4..9da63ada4 100644
--- a/test/paint-with-alpha-pdf-ref.png
+++ b/test/paint-with-alpha.pdf.ref.png
diff --git a/test/paint-with-alpha-ref.png b/test/paint-with-alpha.ref.png
index ab7ce3e04..ab7ce3e04 100644
--- a/test/paint-with-alpha-ref.png
+++ b/test/paint-with-alpha.ref.png
diff --git a/test/paint-with-alpha-svg11-ref.png b/test/paint-with-alpha.svg11.ref.png
index 97a2100e4..97a2100e4 100644
--- a/test/paint-with-alpha-svg11-ref.png
+++ b/test/paint-with-alpha.svg11.ref.png
diff --git a/test/paint-with-alpha-svg12-ref.png b/test/paint-with-alpha.svg12.ref.png
index 97a2100e4..97a2100e4 100644
--- a/test/paint-with-alpha-svg12-ref.png
+++ b/test/paint-with-alpha.svg12.ref.png
diff --git a/test/paint-ref.png b/test/paint.ref.png
index fff03b363..fff03b363 100644
--- a/test/paint-ref.png
+++ b/test/paint.ref.png
diff --git a/test/pass-through-ref.png b/test/pass-through.ref.png
index 058a1920f..058a1920f 100644
--- a/test/pass-through-ref.png
+++ b/test/pass-through.ref.png
diff --git a/test/pass-through-rgb24-ref.png b/test/pass-through.rgb24.ref.png
index b074ede2e..b074ede2e 100644
--- a/test/pass-through-rgb24-ref.png
+++ b/test/pass-through.rgb24.ref.png
diff --git a/test/pattern-getters-ref.png b/test/pattern-getters.ref.png
index 80304b0ec..80304b0ec 100644
--- a/test/pattern-getters-ref.png
+++ b/test/pattern-getters.ref.png
diff --git a/test/pdf-features.c b/test/pdf-features.c
index dbfa33205..cc25fceab 100644
--- a/test/pdf-features.c
+++ b/test/pdf-features.c
@@ -86,7 +86,7 @@ static struct {
 static cairo_test_status_t
 preamble (cairo_test_context_t *ctx)
 {
-    const char *filename = "pdf-features-out.pdf";
+    const char *filename = "pdf-features.out.pdf";
     cairo_surface_t *surface;
     cairo_t *cr;
     cairo_status_t status;
diff --git a/test/pdf-surface-source.c b/test/pdf-surface-source.c
index 23149a962..078af3a15 100644
--- a/test/pdf-surface-source.c
+++ b/test/pdf-surface-source.c
@@ -33,7 +33,7 @@ create_source_surface (int size)
 {
     cairo_surface_t *surface;
 
-    surface = cairo_pdf_surface_create ("pdf-surface-source-out.pdf", size, size);
+    surface = cairo_pdf_surface_create ("pdf-surface-source.out.pdf", size, size);
     cairo_surface_set_fallback_resolution (surface, 72., 72.);
 
     return surface;
diff --git a/test/pdf-surface-source-ref.png b/test/pdf-surface-source.ref.png
index 3fa8bbe55..3fa8bbe55 100644
--- a/test/pdf-surface-source-ref.png
+++ b/test/pdf-surface-source.ref.png
diff --git a/test/pixman-rotate-ref.png b/test/pixman-rotate.ref.png
index 7e47a4d8f..7e47a4d8f 100644
--- a/test/pixman-rotate-ref.png
+++ b/test/pixman-rotate.ref.png
diff --git a/test/pixman-rotate-rgb24-ref.png b/test/pixman-rotate.rgb24.ref.png
index 60d9b1c38..60d9b1c38 100644
--- a/test/pixman-rotate-rgb24-ref.png
+++ b/test/pixman-rotate.rgb24.ref.png
diff --git a/test/png.c b/test/png.c
index 0a375cb7d..fb50a9b55 100644
--- a/test/png.c
+++ b/test/png.c
@@ -74,7 +74,7 @@ print_surface (const cairo_test_context_t *ctx, cairo_surface_t *surface)
 static cairo_test_status_t
 preamble (cairo_test_context_t *ctx)
 {
-    const char *filename = "png-out.png";
+    const char *filename = "png.out.png";
     cairo_surface_t *surface0, *surface1;
     cairo_status_t status;
     uint32_t argb32 = 0xdeadbede;
diff --git a/test/ps-features.c b/test/ps-features.c
index 80088ffcc..72fd21ab0 100644
--- a/test/ps-features.c
+++ b/test/ps-features.c
@@ -102,7 +102,7 @@ preamble (cairo_test_context_t *ctx)
 	return CAIRO_TEST_UNTESTED;
     }
 
-    filename = "ps-features-out.ps";
+    filename = "ps-features.out.ps";
 
     /* We demonstrate that the initial size doesn't matter (we're
      * passing 0,0), if we use cairo_ps_surface_set_size on the first
diff --git a/test/ps-surface-source.c b/test/ps-surface-source.c
index 41016f4e3..37f57eef9 100644
--- a/test/ps-surface-source.c
+++ b/test/ps-surface-source.c
@@ -33,7 +33,7 @@ create_source_surface (int size)
 {
     cairo_surface_t *surface;
 
-    surface = cairo_ps_surface_create ("ps-surface-source-out.ps", size, size);
+    surface = cairo_ps_surface_create ("ps-surface-source.out.ps", size, size);
     cairo_surface_set_fallback_resolution (surface, 72., 72.);
 
     return surface;
diff --git a/test/ps-surface-source-ref.png b/test/ps-surface-source.ref.png
index 3fa8bbe55..3fa8bbe55 100644
--- a/test/ps-surface-source-ref.png
+++ b/test/ps-surface-source.ref.png
diff --git a/test/push-group-pdf-ref.png b/test/push-group.pdf.ref.png
index e016dbd7d..e016dbd7d 100644
--- a/test/push-group-pdf-ref.png
+++ b/test/push-group.pdf.ref.png
diff --git a/test/push-group-pdf-rgb24-ref.png b/test/push-group.pdf.rgb24.ref.png
index 7e84ec831..7e84ec831 100644
--- a/test/push-group-pdf-rgb24-ref.png
+++ b/test/push-group.pdf.rgb24.ref.png
diff --git a/test/push-group-ref.png b/test/push-group.ref.png
index 84bc184d2..84bc184d2 100644
--- a/test/push-group-ref.png
+++ b/test/push-group.ref.png
diff --git a/test/push-group-rgb24-ref.png b/test/push-group.rgb24.ref.png
index cababd955..cababd955 100644
--- a/test/push-group-rgb24-ref.png
+++ b/test/push-group.rgb24.ref.png
diff --git a/test/push-group-svg11-argb32-ref.png b/test/push-group.svg11.argb32.ref.png
index 34f06bf73..34f06bf73 100644
--- a/test/push-group-svg11-argb32-ref.png
+++ b/test/push-group.svg11.argb32.ref.png
diff --git a/test/push-group-svg12-argb32-ref.png b/test/push-group.svg12.argb32.ref.png
index 34f06bf73..34f06bf73 100644
--- a/test/push-group-svg12-argb32-ref.png
+++ b/test/push-group.svg12.argb32.ref.png
diff --git a/test/radial-gradient-pdf-ref.png b/test/radial-gradient.pdf.ref.png
index 18368c14a..18368c14a 100644
--- a/test/radial-gradient-pdf-ref.png
+++ b/test/radial-gradient.pdf.ref.png
diff --git a/test/radial-gradient-quartz-ref.png b/test/radial-gradient.quartz.ref.png
index be420f86a..be420f86a 100644
--- a/test/radial-gradient-quartz-ref.png
+++ b/test/radial-gradient.quartz.ref.png
diff --git a/test/radial-gradient-ref.png b/test/radial-gradient.ref.png
index ab1085816..ab1085816 100644
--- a/test/radial-gradient-ref.png
+++ b/test/radial-gradient.ref.png
diff --git a/test/radial-gradient-svg11-ref.png b/test/radial-gradient.svg11.ref.png
index 7e0470190..7e0470190 100644
--- a/test/radial-gradient-svg11-ref.png
+++ b/test/radial-gradient.svg11.ref.png
diff --git a/test/radial-gradient-svg12-ref.png b/test/radial-gradient.svg12.ref.png
index 7e0470190..7e0470190 100644
--- a/test/radial-gradient-svg12-ref.png
+++ b/test/radial-gradient.svg12.ref.png
diff --git a/test/random-intersections-ps2-ref.png b/test/random-intersections.ps2.ref.png
index 590c83248..590c83248 100644
--- a/test/random-intersections-ps2-ref.png
+++ b/test/random-intersections.ps2.ref.png
diff --git a/test/random-intersections-ps3-ref.png b/test/random-intersections.ps3.ref.png
index 590c83248..590c83248 100644
--- a/test/random-intersections-ps3-ref.png
+++ b/test/random-intersections.ps3.ref.png
diff --git a/test/random-intersections-quartz-ref.png b/test/random-intersections.quartz.ref.png
index ef76cba94..ef76cba94 100644
--- a/test/random-intersections-quartz-ref.png
+++ b/test/random-intersections.quartz.ref.png
diff --git a/test/random-intersections-ref.png b/test/random-intersections.ref.png
index 3188edefc..3188edefc 100644
--- a/test/random-intersections-ref.png
+++ b/test/random-intersections.ref.png
diff --git a/test/rectangle-rounding-error-ref.png b/test/rectangle-rounding-error.ref.png
index 413345d7c..413345d7c 100644
--- a/test/rectangle-rounding-error-ref.png
+++ b/test/rectangle-rounding-error.ref.png
diff --git a/test/rectilinear-fill-ref.png b/test/rectilinear-fill.ref.png
index 84b5967e2..84b5967e2 100644
--- a/test/rectilinear-fill-ref.png
+++ b/test/rectilinear-fill.ref.png
diff --git a/test/rectilinear-miter-limit-ps2-ref.png b/test/rectilinear-miter-limit.ps2.ref.png
index 821306067..821306067 100644
--- a/test/rectilinear-miter-limit-ps2-ref.png
+++ b/test/rectilinear-miter-limit.ps2.ref.png
diff --git a/test/rectilinear-miter-limit-ps3-ref.png b/test/rectilinear-miter-limit.ps3.ref.png
index 821306067..821306067 100644
--- a/test/rectilinear-miter-limit-ps3-ref.png
+++ b/test/rectilinear-miter-limit.ps3.ref.png
diff --git a/test/rectilinear-miter-limit-ref.png b/test/rectilinear-miter-limit.ref.png
index 53bfee047..53bfee047 100644
--- a/test/rectilinear-miter-limit-ref.png
+++ b/test/rectilinear-miter-limit.ref.png
diff --git a/test/rectilinear-stroke-ref.png b/test/rectilinear-stroke.ref.png
index 0a40b0dec..0a40b0dec 100644
--- a/test/rectilinear-stroke-ref.png
+++ b/test/rectilinear-stroke.ref.png
diff --git a/test/reflected-stroke-ps2-ref.png b/test/reflected-stroke.ps2.ref.png
index 6290a176c..6290a176c 100644
--- a/test/reflected-stroke-ps2-ref.png
+++ b/test/reflected-stroke.ps2.ref.png
diff --git a/test/reflected-stroke-ps3-ref.png b/test/reflected-stroke.ps3.ref.png
index 6290a176c..6290a176c 100644
--- a/test/reflected-stroke-ps3-ref.png
+++ b/test/reflected-stroke.ps3.ref.png
diff --git a/test/reflected-stroke-quartz-ref.png b/test/reflected-stroke.quartz.ref.png
index 7568a9957..7568a9957 100644
--- a/test/reflected-stroke-quartz-ref.png
+++ b/test/reflected-stroke.quartz.ref.png
diff --git a/test/reflected-stroke-ref.png b/test/reflected-stroke.ref.png
index 20f89c841..20f89c841 100644
--- a/test/reflected-stroke-ref.png
+++ b/test/reflected-stroke.ref.png
diff --git a/test/rel-path-ps2-rgb24-ref.png b/test/rel-path.ps2.rgb24.ref.png
index ccdcebbc6..ccdcebbc6 100644
--- a/test/rel-path-ps2-rgb24-ref.png
+++ b/test/rel-path.ps2.rgb24.ref.png
diff --git a/test/rel-path-ps3-rgb24-ref.png b/test/rel-path.ps3.rgb24.ref.png
index ccdcebbc6..ccdcebbc6 100644
--- a/test/rel-path-ps3-rgb24-ref.png
+++ b/test/rel-path.ps3.rgb24.ref.png
diff --git a/test/rel-path-quartz-ref.png b/test/rel-path.quartz.ref.png
index 5878ce4d3..5878ce4d3 100644
--- a/test/rel-path-quartz-ref.png
+++ b/test/rel-path.quartz.ref.png
diff --git a/test/rel-path-quartz-rgb24-ref.png b/test/rel-path.quartz.rgb24.ref.png
index 0e33b6688..0e33b6688 100644
--- a/test/rel-path-quartz-rgb24-ref.png
+++ b/test/rel-path.quartz.rgb24.ref.png
diff --git a/test/rel-path-ref.png b/test/rel-path.ref.png
index 7b7007f31..7b7007f31 100644
--- a/test/rel-path-ref.png
+++ b/test/rel-path.ref.png
diff --git a/test/rel-path-rgb24-ref.png b/test/rel-path.rgb24.ref.png
index 0a8a8732d..0a8a8732d 100644
--- a/test/rel-path-rgb24-ref.png
+++ b/test/rel-path.rgb24.ref.png
diff --git a/test/rgb24-ignore-alpha-ref.png b/test/rgb24-ignore-alpha.ref.png
index ab1d8fac7..ab1d8fac7 100644
--- a/test/rgb24-ignore-alpha-ref.png
+++ b/test/rgb24-ignore-alpha.ref.png
diff --git a/test/rotate-image-surface-paint-pdf-argb32-ref.png b/test/rotate-image-surface-paint.pdf.argb32.ref.png
index c12ae8fd5..c12ae8fd5 100644
--- a/test/rotate-image-surface-paint-pdf-argb32-ref.png
+++ b/test/rotate-image-surface-paint.pdf.argb32.ref.png
diff --git a/test/rotate-image-surface-paint-pdf-rgb24-ref.png b/test/rotate-image-surface-paint.pdf.rgb24.ref.png
index 5cd7bf614..5cd7bf614 100644
--- a/test/rotate-image-surface-paint-pdf-rgb24-ref.png
+++ b/test/rotate-image-surface-paint.pdf.rgb24.ref.png
diff --git a/test/rotate-image-surface-paint-ps2-ref.png b/test/rotate-image-surface-paint.ps2.ref.png
index dd725064c..dd725064c 100644
--- a/test/rotate-image-surface-paint-ps2-ref.png
+++ b/test/rotate-image-surface-paint.ps2.ref.png
diff --git a/test/rotate-image-surface-paint-ps3-ref.png b/test/rotate-image-surface-paint.ps3.ref.png
index dd725064c..dd725064c 100644
--- a/test/rotate-image-surface-paint-ps3-ref.png
+++ b/test/rotate-image-surface-paint.ps3.ref.png
diff --git a/test/rotate-image-surface-paint-quartz-ref.png b/test/rotate-image-surface-paint.quartz.ref.png
index f7ec95c8a..f7ec95c8a 100644
--- a/test/rotate-image-surface-paint-quartz-ref.png
+++ b/test/rotate-image-surface-paint.quartz.ref.png
diff --git a/test/rotate-image-surface-paint-ref.png b/test/rotate-image-surface-paint.ref.png
index bd20481fd..bd20481fd 100644
--- a/test/rotate-image-surface-paint-ref.png
+++ b/test/rotate-image-surface-paint.ref.png
diff --git a/test/rotate-image-surface-paint-svg11-ref.png b/test/rotate-image-surface-paint.svg11.ref.png
index 5a75aef2f..5a75aef2f 100644
--- a/test/rotate-image-surface-paint-svg11-ref.png
+++ b/test/rotate-image-surface-paint.svg11.ref.png
diff --git a/test/rotate-image-surface-paint-svg12-ref.png b/test/rotate-image-surface-paint.svg12.ref.png
index 5a75aef2f..5a75aef2f 100644
--- a/test/rotate-image-surface-paint-svg12-ref.png
+++ b/test/rotate-image-surface-paint.svg12.ref.png
diff --git a/test/scale-down-source-surface-paint-ref.png b/test/scale-down-source-surface-paint.ref.png
index 5c969d2c5..5c969d2c5 100644
--- a/test/scale-down-source-surface-paint-ref.png
+++ b/test/scale-down-source-surface-paint.ref.png
diff --git a/test/scale-source-surface-paint-pdf-argb32-ref.png b/test/scale-source-surface-paint.pdf.argb32.ref.png
index de274f95d..de274f95d 100644
--- a/test/scale-source-surface-paint-pdf-argb32-ref.png
+++ b/test/scale-source-surface-paint.pdf.argb32.ref.png
diff --git a/test/scale-source-surface-paint-pdf-rgb24-ref.png b/test/scale-source-surface-paint.pdf.rgb24.ref.png
index 3e873ab0f..3e873ab0f 100644
--- a/test/scale-source-surface-paint-pdf-rgb24-ref.png
+++ b/test/scale-source-surface-paint.pdf.rgb24.ref.png
diff --git a/test/scale-source-surface-paint-ref.png b/test/scale-source-surface-paint.ref.png
index ec3c059fd..ec3c059fd 100644
--- a/test/scale-source-surface-paint-ref.png
+++ b/test/scale-source-surface-paint.ref.png
diff --git a/test/scale-source-surface-paint-rgb24-ref.png b/test/scale-source-surface-paint.rgb24.ref.png
index b9e2f435e..b9e2f435e 100644
--- a/test/scale-source-surface-paint-rgb24-ref.png
+++ b/test/scale-source-surface-paint.rgb24.ref.png
diff --git a/test/scale-source-surface-paint-svg11-argb32-ref.png b/test/scale-source-surface-paint.svg11.argb32.ref.png
index ed946d4d4..ed946d4d4 100644
--- a/test/scale-source-surface-paint-svg11-argb32-ref.png
+++ b/test/scale-source-surface-paint.svg11.argb32.ref.png
diff --git a/test/scale-source-surface-paint-svg11-rgb24-ref.png b/test/scale-source-surface-paint.svg11.rgb24.ref.png
index d424dce08..d424dce08 100644
--- a/test/scale-source-surface-paint-svg11-rgb24-ref.png
+++ b/test/scale-source-surface-paint.svg11.rgb24.ref.png
diff --git a/test/scale-source-surface-paint-svg12-argb32-ref.png b/test/scale-source-surface-paint.svg12.argb32.ref.png
index ed946d4d4..ed946d4d4 100644
--- a/test/scale-source-surface-paint-svg12-argb32-ref.png
+++ b/test/scale-source-surface-paint.svg12.argb32.ref.png
diff --git a/test/scale-source-surface-paint-svg12-rgb24-ref.png b/test/scale-source-surface-paint.svg12.rgb24.ref.png
index d424dce08..d424dce08 100644
--- a/test/scale-source-surface-paint-svg12-rgb24-ref.png
+++ b/test/scale-source-surface-paint.svg12.rgb24.ref.png
diff --git a/test/select-font-face-ps2-ref.png b/test/select-font-face.ps2.ref.png
index 6c2f36115..6c2f36115 100644
--- a/test/select-font-face-ps2-ref.png
+++ b/test/select-font-face.ps2.ref.png
diff --git a/test/select-font-face-ps3-ref.png b/test/select-font-face.ps3.ref.png
index 6c2f36115..6c2f36115 100644
--- a/test/select-font-face-ps3-ref.png
+++ b/test/select-font-face.ps3.ref.png
diff --git a/test/select-font-face-quartz-ref.png b/test/select-font-face.quartz.ref.png
index 8f285b8e8..8f285b8e8 100644
--- a/test/select-font-face-quartz-ref.png
+++ b/test/select-font-face.quartz.ref.png
diff --git a/test/select-font-face-ref.png b/test/select-font-face.ref.png
index b3d232200..b3d232200 100644
--- a/test/select-font-face-ref.png
+++ b/test/select-font-face.ref.png
diff --git a/test/self-copy-overlap-ref.png b/test/self-copy-overlap.ref.png
index a70e819ed..a70e819ed 100644
--- a/test/self-copy-overlap-ref.png
+++ b/test/self-copy-overlap.ref.png
diff --git a/test/self-copy-overlap-rgb24-ref.png b/test/self-copy-overlap.rgb24.ref.png
index ec730f6f3..ec730f6f3 100644
--- a/test/self-copy-overlap-rgb24-ref.png
+++ b/test/self-copy-overlap.rgb24.ref.png
diff --git a/test/self-copy-ps2-ref.png b/test/self-copy.ps2.ref.png
index 5c9dd5771..5c9dd5771 100644
--- a/test/self-copy-ps2-ref.png
+++ b/test/self-copy.ps2.ref.png
diff --git a/test/self-copy-ps3-ref.png b/test/self-copy.ps3.ref.png
index 5c9dd5771..5c9dd5771 100644
--- a/test/self-copy-ps3-ref.png
+++ b/test/self-copy.ps3.ref.png
diff --git a/test/self-copy-ref.png b/test/self-copy.ref.png
index 92a20db64..92a20db64 100644
--- a/test/self-copy-ref.png
+++ b/test/self-copy.ref.png
diff --git a/test/self-intersecting-ref.png b/test/self-intersecting.ref.png
index 384b0abc0..384b0abc0 100644
--- a/test/self-intersecting-ref.png
+++ b/test/self-intersecting.ref.png
diff --git a/test/self-intersecting-rgb24-ref.png b/test/self-intersecting.rgb24.ref.png
index 51217926f..51217926f 100644
--- a/test/self-intersecting-rgb24-ref.png
+++ b/test/self-intersecting.rgb24.ref.png
diff --git a/test/set-source-ref.png b/test/set-source.ref.png
index 19793e026..19793e026 100644
--- a/test/set-source-ref.png
+++ b/test/set-source.ref.png
diff --git a/test/set-source-rgb24-ref.png b/test/set-source.rgb24.ref.png
index b158c7465..b158c7465 100644
--- a/test/set-source-rgb24-ref.png
+++ b/test/set-source.rgb24.ref.png
diff --git a/test/set-source-svg11-argb32-ref.png b/test/set-source.svg11.argb32.ref.png
index 754f1c469..754f1c469 100644
--- a/test/set-source-svg11-argb32-ref.png
+++ b/test/set-source.svg11.argb32.ref.png
diff --git a/test/set-source-svg12-argb32-ref.png b/test/set-source.svg12.argb32.ref.png
index 754f1c469..754f1c469 100644
--- a/test/set-source-svg12-argb32-ref.png
+++ b/test/set-source.svg12.argb32.ref.png
diff --git a/test/show-glyphs-many-ref.png b/test/show-glyphs-many.ref.png
index b61c5f7b6..b61c5f7b6 100644
--- a/test/show-glyphs-many-ref.png
+++ b/test/show-glyphs-many.ref.png
diff --git a/test/show-text-current-point-ps2-ref.png b/test/show-text-current-point.ps2.ref.png
index b42c48e7f..b42c48e7f 100644
--- a/test/show-text-current-point-ps2-ref.png
+++ b/test/show-text-current-point.ps2.ref.png
diff --git a/test/show-text-current-point-ps3-ref.png b/test/show-text-current-point.ps3.ref.png
index b42c48e7f..b42c48e7f 100644
--- a/test/show-text-current-point-ps3-ref.png
+++ b/test/show-text-current-point.ps3.ref.png
diff --git a/test/show-text-current-point-quartz-ref.png b/test/show-text-current-point.quartz.ref.png
index 538b0d1a1..538b0d1a1 100644
--- a/test/show-text-current-point-quartz-ref.png
+++ b/test/show-text-current-point.quartz.ref.png
diff --git a/test/show-text-current-point-ref.png b/test/show-text-current-point.ref.png
index 2fc5bd83f..2fc5bd83f 100644
--- a/test/show-text-current-point-ref.png
+++ b/test/show-text-current-point.ref.png
diff --git a/test/skew-extreme-ps2-ref.png b/test/skew-extreme.ps2.ref.png
index 69f1d374f..69f1d374f 100644
--- a/test/skew-extreme-ps2-ref.png
+++ b/test/skew-extreme.ps2.ref.png
diff --git a/test/skew-extreme-ps3-ref.png b/test/skew-extreme.ps3.ref.png
index 69f1d374f..69f1d374f 100644
--- a/test/skew-extreme-ps3-ref.png
+++ b/test/skew-extreme.ps3.ref.png
diff --git a/test/skew-extreme-ref.png b/test/skew-extreme.ref.png
index 14083956c..14083956c 100644
--- a/test/skew-extreme-ref.png
+++ b/test/skew-extreme.ref.png
diff --git a/test/smask-fill-pdf-ref.png b/test/smask-fill.pdf.ref.png
index dc87a5f0d..dc87a5f0d 100644
--- a/test/smask-fill-pdf-ref.png
+++ b/test/smask-fill.pdf.ref.png
diff --git a/test/smask-fill-ref.png b/test/smask-fill.ref.png
index c778a7911..c778a7911 100644
--- a/test/smask-fill-ref.png
+++ b/test/smask-fill.ref.png
diff --git a/test/smask-fill-svg11-ref.png b/test/smask-fill.svg11.ref.png
index 06ab12a65..06ab12a65 100644
--- a/test/smask-fill-svg11-ref.png
+++ b/test/smask-fill.svg11.ref.png
diff --git a/test/smask-fill-svg12-ref.png b/test/smask-fill.svg12.ref.png
index 06ab12a65..06ab12a65 100644
--- a/test/smask-fill-svg12-ref.png
+++ b/test/smask-fill.svg12.ref.png
diff --git a/test/smask-image-mask-pdf-ref.png b/test/smask-image-mask.pdf.ref.png
index 54baefda0..54baefda0 100644
--- a/test/smask-image-mask-pdf-ref.png
+++ b/test/smask-image-mask.pdf.ref.png
diff --git a/test/smask-image-mask-ref.png b/test/smask-image-mask.ref.png
index 858b2094e..858b2094e 100644
--- a/test/smask-image-mask-ref.png
+++ b/test/smask-image-mask.ref.png
diff --git a/test/smask-mask-pdf-ref.png b/test/smask-mask.pdf.ref.png
index 94dac1dc8..94dac1dc8 100644
--- a/test/smask-mask-pdf-ref.png
+++ b/test/smask-mask.pdf.ref.png
diff --git a/test/smask-mask-ref.png b/test/smask-mask.ref.png
index eabd2d6b3..eabd2d6b3 100644
--- a/test/smask-mask-ref.png
+++ b/test/smask-mask.ref.png
diff --git a/test/smask-mask-svg11-ref.png b/test/smask-mask.svg11.ref.png
index 0820cd18f..0820cd18f 100644
--- a/test/smask-mask-svg11-ref.png
+++ b/test/smask-mask.svg11.ref.png
diff --git a/test/smask-mask-svg12-ref.png b/test/smask-mask.svg12.ref.png
index 0820cd18f..0820cd18f 100644
--- a/test/smask-mask-svg12-ref.png
+++ b/test/smask-mask.svg12.ref.png
diff --git a/test/smask-paint-pdf-ref.png b/test/smask-paint.pdf.ref.png
index 7d82db9a5..7d82db9a5 100644
--- a/test/smask-paint-pdf-ref.png
+++ b/test/smask-paint.pdf.ref.png
diff --git a/test/smask-paint-ref.png b/test/smask-paint.ref.png
index 438120964..438120964 100644
--- a/test/smask-paint-ref.png
+++ b/test/smask-paint.ref.png
diff --git a/test/smask-paint-svg11-ref.png b/test/smask-paint.svg11.ref.png
index 09c01deb6..09c01deb6 100644
--- a/test/smask-paint-svg11-ref.png
+++ b/test/smask-paint.svg11.ref.png
diff --git a/test/smask-paint-svg12-ref.png b/test/smask-paint.svg12.ref.png
index 09c01deb6..09c01deb6 100644
--- a/test/smask-paint-svg12-ref.png
+++ b/test/smask-paint.svg12.ref.png
diff --git a/test/smask-stroke-pdf-ref.png b/test/smask-stroke.pdf.ref.png
index ac9b5a18b..ac9b5a18b 100644
--- a/test/smask-stroke-pdf-ref.png
+++ b/test/smask-stroke.pdf.ref.png
diff --git a/test/smask-stroke-ref.png b/test/smask-stroke.ref.png
index 0d3f7feae..0d3f7feae 100644
--- a/test/smask-stroke-ref.png
+++ b/test/smask-stroke.ref.png
diff --git a/test/smask-text-pdf-ref.png b/test/smask-text.pdf.ref.png
index 7542d3dd4..7542d3dd4 100644
--- a/test/smask-text-pdf-ref.png
+++ b/test/smask-text.pdf.ref.png
diff --git a/test/smask-text-ps2-ref.png b/test/smask-text.ps2.ref.png
index ae61325cb..ae61325cb 100644
--- a/test/smask-text-ps2-ref.png
+++ b/test/smask-text.ps2.ref.png
diff --git a/test/smask-text-ps3-ref.png b/test/smask-text.ps3.ref.png
index ae61325cb..ae61325cb 100644
--- a/test/smask-text-ps3-ref.png
+++ b/test/smask-text.ps3.ref.png
diff --git a/test/smask-text-ref.png b/test/smask-text.ref.png
index f001859bb..f001859bb 100644
--- a/test/smask-text-ref.png
+++ b/test/smask-text.ref.png
diff --git a/test/smask-text-svg11-ref.png b/test/smask-text.svg11.ref.png
index 2665370c4..2665370c4 100644
--- a/test/smask-text-svg11-ref.png
+++ b/test/smask-text.svg11.ref.png
diff --git a/test/smask-text-svg12-ref.png b/test/smask-text.svg12.ref.png
index 2665370c4..2665370c4 100644
--- a/test/smask-text-svg12-ref.png
+++ b/test/smask-text.svg12.ref.png
diff --git a/test/smask-pdf-ref.png b/test/smask.pdf.ref.png
index 7d82db9a5..7d82db9a5 100644
--- a/test/smask-pdf-ref.png
+++ b/test/smask.pdf.ref.png
diff --git a/test/smask-ps2-ref.png b/test/smask.ps2.ref.png
index c006bbdaa..c006bbdaa 100644
--- a/test/smask-ps2-ref.png
+++ b/test/smask.ps2.ref.png
diff --git a/test/smask-ps3-ref.png b/test/smask.ps3.ref.png
index c006bbdaa..c006bbdaa 100644
--- a/test/smask-ps3-ref.png
+++ b/test/smask.ps3.ref.png
diff --git a/test/smask-ref.png b/test/smask.ref.png
index 2d98e4337..2d98e4337 100644
--- a/test/smask-ref.png
+++ b/test/smask.ref.png
diff --git a/test/smask-svg11-ref.png b/test/smask.svg11.ref.png
index f18856144..f18856144 100644
--- a/test/smask-svg11-ref.png
+++ b/test/smask.svg11.ref.png
diff --git a/test/smask-svg12-ref.png b/test/smask.svg12.ref.png
index f18856144..f18856144 100644
--- a/test/smask-svg12-ref.png
+++ b/test/smask.svg12.ref.png
diff --git a/test/solid-pattern-cache-stress-ref.png b/test/solid-pattern-cache-stress.ref.png
index e0e8498c3..e0e8498c3 100644
--- a/test/solid-pattern-cache-stress-ref.png
+++ b/test/solid-pattern-cache-stress.ref.png
diff --git a/test/source-clip-scale-pdf-ref.png b/test/source-clip-scale.pdf.ref.png
index 78c77106c..78c77106c 100644
--- a/test/source-clip-scale-pdf-ref.png
+++ b/test/source-clip-scale.pdf.ref.png
diff --git a/test/source-clip-scale-ps2-argb32-ref.png b/test/source-clip-scale.ps2.argb32.ref.png
index be57d7721..be57d7721 100644
--- a/test/source-clip-scale-ps2-argb32-ref.png
+++ b/test/source-clip-scale.ps2.argb32.ref.png
diff --git a/test/source-clip-scale-ps2-rgb24-ref.png b/test/source-clip-scale.ps2.rgb24.ref.png
index be57d7721..be57d7721 100644
--- a/test/source-clip-scale-ps2-rgb24-ref.png
+++ b/test/source-clip-scale.ps2.rgb24.ref.png
diff --git a/test/source-clip-scale-ps3-argb32-ref.png b/test/source-clip-scale.ps3.argb32.ref.png
index be57d7721..be57d7721 100644
--- a/test/source-clip-scale-ps3-argb32-ref.png
+++ b/test/source-clip-scale.ps3.argb32.ref.png
diff --git a/test/source-clip-scale-ps3-rgb24-ref.png b/test/source-clip-scale.ps3.rgb24.ref.png
index be57d7721..be57d7721 100644
--- a/test/source-clip-scale-ps3-rgb24-ref.png
+++ b/test/source-clip-scale.ps3.rgb24.ref.png
diff --git a/test/source-clip-scale-quartz-ref.png b/test/source-clip-scale.quartz.ref.png
index f21ae4bb3..f21ae4bb3 100644
--- a/test/source-clip-scale-quartz-ref.png
+++ b/test/source-clip-scale.quartz.ref.png
diff --git a/test/source-clip-scale-ref.png b/test/source-clip-scale.ref.png
index 1519ff895..1519ff895 100644
--- a/test/source-clip-scale-ref.png
+++ b/test/source-clip-scale.ref.png
diff --git a/test/source-clip-scale-svg11-ref.png b/test/source-clip-scale.svg11.ref.png
index 87c291743..87c291743 100644
--- a/test/source-clip-scale-svg11-ref.png
+++ b/test/source-clip-scale.svg11.ref.png
diff --git a/test/source-clip-scale-svg12-ref.png b/test/source-clip-scale.svg12.ref.png
index 87c291743..87c291743 100644
--- a/test/source-clip-scale-svg12-ref.png
+++ b/test/source-clip-scale.svg12.ref.png
diff --git a/test/source-clip-ref.png b/test/source-clip.ref.png
index 22454bed9..22454bed9 100644
--- a/test/source-clip-ref.png
+++ b/test/source-clip.ref.png
diff --git a/test/source-surface-scale-paint-ref.png b/test/source-surface-scale-paint.ref.png
index a81f93d94..a81f93d94 100644
--- a/test/source-surface-scale-paint-ref.png
+++ b/test/source-surface-scale-paint.ref.png
diff --git a/test/source-surface-scale-paint-rgb24-ref.png b/test/source-surface-scale-paint.rgb24.ref.png
index 7ca745937..7ca745937 100644
--- a/test/source-surface-scale-paint-rgb24-ref.png
+++ b/test/source-surface-scale-paint.rgb24.ref.png
diff --git a/test/spline-decomposition-pdf-ref.png b/test/spline-decomposition.pdf.ref.png
index 4fd25a62b..4fd25a62b 100644
--- a/test/spline-decomposition-pdf-ref.png
+++ b/test/spline-decomposition.pdf.ref.png
diff --git a/test/spline-decomposition-ps2-ref.png b/test/spline-decomposition.ps2.ref.png
index ca1fbfd6f..ca1fbfd6f 100644
--- a/test/spline-decomposition-ps2-ref.png
+++ b/test/spline-decomposition.ps2.ref.png
diff --git a/test/spline-decomposition-ps3-ref.png b/test/spline-decomposition.ps3.ref.png
index ca1fbfd6f..ca1fbfd6f 100644
--- a/test/spline-decomposition-ps3-ref.png
+++ b/test/spline-decomposition.ps3.ref.png
diff --git a/test/spline-decomposition-ref.png b/test/spline-decomposition.ref.png
index 4e1b3448a..4e1b3448a 100644
--- a/test/spline-decomposition-ref.png
+++ b/test/spline-decomposition.ref.png
diff --git a/test/spline-decomposition-svg11-ref.png b/test/spline-decomposition.svg11.ref.png
index 4fd25a62b..4fd25a62b 100644
--- a/test/spline-decomposition-svg11-ref.png
+++ b/test/spline-decomposition.svg11.ref.png
diff --git a/test/spline-decomposition-svg12-ref.png b/test/spline-decomposition.svg12.ref.png
index 4fd25a62b..4fd25a62b 100644
--- a/test/spline-decomposition-svg12-ref.png
+++ b/test/spline-decomposition.svg12.ref.png
diff --git a/test/stroke-ctm-caps-ps2-ref.png b/test/stroke-ctm-caps.ps2.ref.png
index 63c10645b..63c10645b 100644
--- a/test/stroke-ctm-caps-ps2-ref.png
+++ b/test/stroke-ctm-caps.ps2.ref.png
diff --git a/test/stroke-ctm-caps-ps3-ref.png b/test/stroke-ctm-caps.ps3.ref.png
index 63c10645b..63c10645b 100644
--- a/test/stroke-ctm-caps-ps3-ref.png
+++ b/test/stroke-ctm-caps.ps3.ref.png
diff --git a/test/stroke-ctm-caps-quartz-ref.png b/test/stroke-ctm-caps.quartz.ref.png
index 45ea14598..45ea14598 100644
--- a/test/stroke-ctm-caps-quartz-ref.png
+++ b/test/stroke-ctm-caps.quartz.ref.png
diff --git a/test/stroke-ctm-caps-ref.png b/test/stroke-ctm-caps.ref.png
index f36435760..f36435760 100644
--- a/test/stroke-ctm-caps-ref.png
+++ b/test/stroke-ctm-caps.ref.png
diff --git a/test/stroke-image-pdf-ref.png b/test/stroke-image.pdf.ref.png
index f3eb75d83..f3eb75d83 100644
--- a/test/stroke-image-pdf-ref.png
+++ b/test/stroke-image.pdf.ref.png
diff --git a/test/stroke-image-ps2-ref.png b/test/stroke-image.ps2.ref.png
index a18716742..a18716742 100644
--- a/test/stroke-image-ps2-ref.png
+++ b/test/stroke-image.ps2.ref.png
diff --git a/test/stroke-image-ps3-ref.png b/test/stroke-image.ps3.ref.png
index a18716742..a18716742 100644
--- a/test/stroke-image-ps3-ref.png
+++ b/test/stroke-image.ps3.ref.png
diff --git a/test/stroke-image-quartz-ref.png b/test/stroke-image.quartz.ref.png
index db1f5a708..db1f5a708 100644
--- a/test/stroke-image-quartz-ref.png
+++ b/test/stroke-image.quartz.ref.png
diff --git a/test/stroke-image-ref.png b/test/stroke-image.ref.png
index c8b9417df..c8b9417df 100644
--- a/test/stroke-image-ref.png
+++ b/test/stroke-image.ref.png
diff --git a/test/surface-pattern-big-scale-down-ref.png b/test/surface-pattern-big-scale-down.ref.png
index 7a8f513e2..7a8f513e2 100644
--- a/test/surface-pattern-big-scale-down-ref.png
+++ b/test/surface-pattern-big-scale-down.ref.png
diff --git a/test/surface-pattern-scale-down-pdf-argb32-ref.png b/test/surface-pattern-scale-down.pdf.argb32.ref.png
index c29d804c1..c29d804c1 100644
--- a/test/surface-pattern-scale-down-pdf-argb32-ref.png
+++ b/test/surface-pattern-scale-down.pdf.argb32.ref.png
diff --git a/test/surface-pattern-scale-down-pdf-rgb24-ref.png b/test/surface-pattern-scale-down.pdf.rgb24.ref.png
index c29d804c1..c29d804c1 100644
--- a/test/surface-pattern-scale-down-pdf-rgb24-ref.png
+++ b/test/surface-pattern-scale-down.pdf.rgb24.ref.png
diff --git a/test/surface-pattern-scale-down-ps2-ref.png b/test/surface-pattern-scale-down.ps2.ref.png
index 5fb6395ce..5fb6395ce 100644
--- a/test/surface-pattern-scale-down-ps2-ref.png
+++ b/test/surface-pattern-scale-down.ps2.ref.png
diff --git a/test/surface-pattern-scale-down-ps3-ref.png b/test/surface-pattern-scale-down.ps3.ref.png
index 5fb6395ce..5fb6395ce 100644
--- a/test/surface-pattern-scale-down-ps3-ref.png
+++ b/test/surface-pattern-scale-down.ps3.ref.png
diff --git a/test/surface-pattern-scale-down-quartz-ref.png b/test/surface-pattern-scale-down.quartz.ref.png
index 93a34dac0..93a34dac0 100644
--- a/test/surface-pattern-scale-down-quartz-ref.png
+++ b/test/surface-pattern-scale-down.quartz.ref.png
diff --git a/test/surface-pattern-scale-down-ref.png b/test/surface-pattern-scale-down.ref.png
index b7255ef7a..b7255ef7a 100644
--- a/test/surface-pattern-scale-down-ref.png
+++ b/test/surface-pattern-scale-down.ref.png
diff --git a/test/surface-pattern-scale-up-pdf-argb32-ref.png b/test/surface-pattern-scale-up.pdf.argb32.ref.png
index 6f3a53c50..6f3a53c50 100644
--- a/test/surface-pattern-scale-up-pdf-argb32-ref.png
+++ b/test/surface-pattern-scale-up.pdf.argb32.ref.png
diff --git a/test/surface-pattern-scale-up-pdf-rgb24-ref.png b/test/surface-pattern-scale-up.pdf.rgb24.ref.png
index 6f3a53c50..6f3a53c50 100644
--- a/test/surface-pattern-scale-up-pdf-rgb24-ref.png
+++ b/test/surface-pattern-scale-up.pdf.rgb24.ref.png
diff --git a/test/surface-pattern-scale-up-ps2-ref.png b/test/surface-pattern-scale-up.ps2.ref.png
index 7f672880e..7f672880e 100644
--- a/test/surface-pattern-scale-up-ps2-ref.png
+++ b/test/surface-pattern-scale-up.ps2.ref.png
diff --git a/test/surface-pattern-scale-up-ps3-ref.png b/test/surface-pattern-scale-up.ps3.ref.png
index 7f672880e..7f672880e 100644
--- a/test/surface-pattern-scale-up-ps3-ref.png
+++ b/test/surface-pattern-scale-up.ps3.ref.png
diff --git a/test/surface-pattern-scale-up-ref.png b/test/surface-pattern-scale-up.ref.png
index 821f54021..821f54021 100644
--- a/test/surface-pattern-scale-up-ref.png
+++ b/test/surface-pattern-scale-up.ref.png
diff --git a/test/surface-pattern-pdf-ref.png b/test/surface-pattern.pdf.ref.png
index bfb34788f..bfb34788f 100644
--- a/test/surface-pattern-pdf-ref.png
+++ b/test/surface-pattern.pdf.ref.png
diff --git a/test/surface-pattern-ps2-ref.png b/test/surface-pattern.ps2.ref.png
index b5c7b9155..b5c7b9155 100644
--- a/test/surface-pattern-ps2-ref.png
+++ b/test/surface-pattern.ps2.ref.png
diff --git a/test/surface-pattern-ps3-ref.png b/test/surface-pattern.ps3.ref.png
index b5c7b9155..b5c7b9155 100644
--- a/test/surface-pattern-ps3-ref.png
+++ b/test/surface-pattern.ps3.ref.png
diff --git a/test/surface-pattern-ref.png b/test/surface-pattern.ref.png
index d1c2b3355..d1c2b3355 100644
--- a/test/surface-pattern-ref.png
+++ b/test/surface-pattern.ref.png
diff --git a/test/surface-pattern-svg11-ref.png b/test/surface-pattern.svg11.ref.png
index 5569a5577..5569a5577 100644
--- a/test/surface-pattern-svg11-ref.png
+++ b/test/surface-pattern.svg11.ref.png
diff --git a/test/surface-pattern-svg12-ref.png b/test/surface-pattern.svg12.ref.png
index 5569a5577..5569a5577 100644
--- a/test/surface-pattern-svg12-ref.png
+++ b/test/surface-pattern.svg12.ref.png
diff --git a/test/svg-clip.c b/test/svg-clip.c
index 4a6cf0749..035b23605 100644
--- a/test/svg-clip.c
+++ b/test/svg-clip.c
@@ -107,7 +107,7 @@ static cairo_test_status_t
 preamble (cairo_test_context_t *ctx)
 {
     cairo_t *cr;
-    const char *filename = "svg-clip-out.svg";
+    const char *filename = "svg-clip.out.svg";
     cairo_surface_t *surface;
 
     if (! cairo_test_is_target_enabled (ctx, "svg11") &&
diff --git a/test/svg-surface-source.c b/test/svg-surface-source.c
index d7749e5d0..c97d3caf1 100644
--- a/test/svg-surface-source.c
+++ b/test/svg-surface-source.c
@@ -33,7 +33,7 @@ create_source_surface (int size)
 {
     cairo_surface_t *surface;
 
-    surface = cairo_svg_surface_create ("svg-surface-source-out.svg",
+    surface = cairo_svg_surface_create ("svg-surface-source.out.svg",
 					size, size);
     cairo_surface_set_fallback_resolution (surface, 72., 72.);
 
diff --git a/test/svg-surface-source-ref.png b/test/svg-surface-source.ref.png
index 3fa8bbe55..3fa8bbe55 100644
--- a/test/svg-surface-source-ref.png
+++ b/test/svg-surface-source.ref.png
diff --git a/test/svg-surface.c b/test/svg-surface.c
index 6f071cedd..4e29f1bc1 100644
--- a/test/svg-surface.c
+++ b/test/svg-surface.c
@@ -90,7 +90,7 @@ static cairo_test_status_t
 preamble (cairo_test_context_t *ctx)
 {
     cairo_t *cr;
-    const char *filename = "svg-surface-out.svg";
+    const char *filename = "svg-surface.out.svg";
     cairo_surface_t *surface;
 
     if (! cairo_test_is_target_enabled (ctx, "svg11") &&
diff --git a/test/text-antialias-gray-quartz-ref.png b/test/text-antialias-gray.quartz.ref.png
index 573848dd6..573848dd6 100644
--- a/test/text-antialias-gray-quartz-ref.png
+++ b/test/text-antialias-gray.quartz.ref.png
diff --git a/test/text-antialias-gray-ref.png b/test/text-antialias-gray.ref.png
index 63b2e52ac..63b2e52ac 100644
--- a/test/text-antialias-gray-ref.png
+++ b/test/text-antialias-gray.ref.png
diff --git a/test/text-antialias-none-quartz-ref.png b/test/text-antialias-none.quartz.ref.png
index bcee5da24..bcee5da24 100644
--- a/test/text-antialias-none-quartz-ref.png
+++ b/test/text-antialias-none.quartz.ref.png
diff --git a/test/text-antialias-none-ref.png b/test/text-antialias-none.ref.png
index bdd77bd56..bdd77bd56 100644
--- a/test/text-antialias-none-ref.png
+++ b/test/text-antialias-none.ref.png
diff --git a/test/text-antialias-subpixel-quartz-ref.png b/test/text-antialias-subpixel.quartz.ref.png
index ffd487f38..ffd487f38 100644
--- a/test/text-antialias-subpixel-quartz-ref.png
+++ b/test/text-antialias-subpixel.quartz.ref.png
diff --git a/test/text-antialias-subpixel-ref.png b/test/text-antialias-subpixel.ref.png
index 31ddc9c2b..31ddc9c2b 100644
--- a/test/text-antialias-subpixel-ref.png
+++ b/test/text-antialias-subpixel.ref.png
diff --git a/test/text-glyph-range-ps2-ref.png b/test/text-glyph-range.ps2.ref.png
index b20e6bd65..b20e6bd65 100644
--- a/test/text-glyph-range-ps2-ref.png
+++ b/test/text-glyph-range.ps2.ref.png
diff --git a/test/text-glyph-range-ps3-ref.png b/test/text-glyph-range.ps3.ref.png
index b20e6bd65..b20e6bd65 100644
--- a/test/text-glyph-range-ps3-ref.png
+++ b/test/text-glyph-range.ps3.ref.png
diff --git a/test/text-glyph-range-ref.png b/test/text-glyph-range.ref.png
index a39e46cb8..a39e46cb8 100644
--- a/test/text-glyph-range-ref.png
+++ b/test/text-glyph-range.ref.png
diff --git a/test/text-pattern-pdf-argb32-ref.png b/test/text-pattern.pdf.argb32.ref.png
index 2a70deb08..2a70deb08 100644
--- a/test/text-pattern-pdf-argb32-ref.png
+++ b/test/text-pattern.pdf.argb32.ref.png
diff --git a/test/text-pattern-pdf-rgb24-ref.png b/test/text-pattern.pdf.rgb24.ref.png
index 2933f342f..2933f342f 100644
--- a/test/text-pattern-pdf-rgb24-ref.png
+++ b/test/text-pattern.pdf.rgb24.ref.png
diff --git a/test/text-pattern-ps3-argb32-ref.png b/test/text-pattern.ps3.argb32.ref.png
index fa68f6430..fa68f6430 100644
--- a/test/text-pattern-ps3-argb32-ref.png
+++ b/test/text-pattern.ps3.argb32.ref.png
diff --git a/test/text-pattern-ps3-rgb24-ref.png b/test/text-pattern.ps3.rgb24.ref.png
index 943149c78..943149c78 100644
--- a/test/text-pattern-ps3-rgb24-ref.png
+++ b/test/text-pattern.ps3.rgb24.ref.png
diff --git a/test/text-pattern-quartz-ref.png b/test/text-pattern.quartz.ref.png
index 5cb587465..5cb587465 100644
--- a/test/text-pattern-quartz-ref.png
+++ b/test/text-pattern.quartz.ref.png
diff --git a/test/text-pattern-quartz-rgb24-ref.png b/test/text-pattern.quartz.rgb24.ref.png
index 7eae4c87c..7eae4c87c 100644
--- a/test/text-pattern-quartz-rgb24-ref.png
+++ b/test/text-pattern.quartz.rgb24.ref.png
diff --git a/test/text-pattern-ref.png b/test/text-pattern.ref.png
index ac1dd84e7..ac1dd84e7 100644
--- a/test/text-pattern-ref.png
+++ b/test/text-pattern.ref.png
diff --git a/test/text-pattern-rgb24-ref.png b/test/text-pattern.rgb24.ref.png
index 54b214b45..54b214b45 100644
--- a/test/text-pattern-rgb24-ref.png
+++ b/test/text-pattern.rgb24.ref.png
diff --git a/test/text-pattern-svg11-argb32-ref.png b/test/text-pattern.svg11.argb32.ref.png
index 97d7534c6..97d7534c6 100644
--- a/test/text-pattern-svg11-argb32-ref.png
+++ b/test/text-pattern.svg11.argb32.ref.png
diff --git a/test/text-pattern-svg11-rgb24-ref.png b/test/text-pattern.svg11.rgb24.ref.png
index c1f76c233..c1f76c233 100644
--- a/test/text-pattern-svg11-rgb24-ref.png
+++ b/test/text-pattern.svg11.rgb24.ref.png
diff --git a/test/text-pattern-svg12-argb32-ref.png b/test/text-pattern.svg12.argb32.ref.png
index 97d7534c6..97d7534c6 100644
--- a/test/text-pattern-svg12-argb32-ref.png
+++ b/test/text-pattern.svg12.argb32.ref.png
diff --git a/test/text-pattern-svg12-rgb24-ref.png b/test/text-pattern.svg12.rgb24.ref.png
index c1f76c233..c1f76c233 100644
--- a/test/text-pattern-svg12-rgb24-ref.png
+++ b/test/text-pattern.svg12.rgb24.ref.png
diff --git a/test/text-rotate-pdf-ref.png b/test/text-rotate.pdf.ref.png
index bdd64e6e9..bdd64e6e9 100644
--- a/test/text-rotate-pdf-ref.png
+++ b/test/text-rotate.pdf.ref.png
diff --git a/test/text-rotate-ps2-ref.png b/test/text-rotate.ps2.ref.png
index 125736bfc..125736bfc 100644
--- a/test/text-rotate-ps2-ref.png
+++ b/test/text-rotate.ps2.ref.png
diff --git a/test/text-rotate-ps3-ref.png b/test/text-rotate.ps3.ref.png
index 125736bfc..125736bfc 100644
--- a/test/text-rotate-ps3-ref.png
+++ b/test/text-rotate.ps3.ref.png
diff --git a/test/text-rotate-quartz-ref.png b/test/text-rotate.quartz.ref.png
index 6fb7f3da7..6fb7f3da7 100644
--- a/test/text-rotate-quartz-ref.png
+++ b/test/text-rotate.quartz.ref.png
diff --git a/test/text-rotate-ref.png b/test/text-rotate.ref.png
index b22739892..b22739892 100644
--- a/test/text-rotate-ref.png
+++ b/test/text-rotate.ref.png
diff --git a/test/text-rotate-svg11-ref.png b/test/text-rotate.svg11.ref.png
index 35fd019fc..35fd019fc 100644
--- a/test/text-rotate-svg11-ref.png
+++ b/test/text-rotate.svg11.ref.png
diff --git a/test/text-rotate-svg12-ref.png b/test/text-rotate.svg12.ref.png
index 35fd019fc..35fd019fc 100644
--- a/test/text-rotate-svg12-ref.png
+++ b/test/text-rotate.svg12.ref.png
diff --git a/test/text-transform-pdf-ref.png b/test/text-transform.pdf.ref.png
index 46076bdfd..46076bdfd 100644
--- a/test/text-transform-pdf-ref.png
+++ b/test/text-transform.pdf.ref.png
diff --git a/test/text-transform-ps2-ref.png b/test/text-transform.ps2.ref.png
index 6f33fb6cb..6f33fb6cb 100644
--- a/test/text-transform-ps2-ref.png
+++ b/test/text-transform.ps2.ref.png
diff --git a/test/text-transform-ps3-ref.png b/test/text-transform.ps3.ref.png
index 6f33fb6cb..6f33fb6cb 100644
--- a/test/text-transform-ps3-ref.png
+++ b/test/text-transform.ps3.ref.png
diff --git a/test/text-transform-ref.png b/test/text-transform.ref.png
index 6f36b9d41..6f36b9d41 100644
--- a/test/text-transform-ref.png
+++ b/test/text-transform.ref.png
diff --git a/test/transforms-ps2-ref.png b/test/transforms.ps2.ref.png
index 6d195aaf3..6d195aaf3 100644
--- a/test/transforms-ps2-ref.png
+++ b/test/transforms.ps2.ref.png
diff --git a/test/transforms-ps3-ref.png b/test/transforms.ps3.ref.png
index 6d195aaf3..6d195aaf3 100644
--- a/test/transforms-ps3-ref.png
+++ b/test/transforms.ps3.ref.png
diff --git a/test/transforms-ref.png b/test/transforms.ref.png
index a60e51915..a60e51915 100644
--- a/test/transforms-ref.png
+++ b/test/transforms.ref.png
diff --git a/test/translate-show-surface-ref.png b/test/translate-show-surface.ref.png
index 765adc4a4..765adc4a4 100644
--- a/test/translate-show-surface-ref.png
+++ b/test/translate-show-surface.ref.png
diff --git a/test/trap-clip-pdf-argb32-ref.png b/test/trap-clip.pdf.argb32.ref.png
index c3ee9971a..c3ee9971a 100644
--- a/test/trap-clip-pdf-argb32-ref.png
+++ b/test/trap-clip.pdf.argb32.ref.png
diff --git a/test/trap-clip-pdf-rgb24-ref.png b/test/trap-clip.pdf.rgb24.ref.png
index f787011cb..f787011cb 100644
--- a/test/trap-clip-pdf-rgb24-ref.png
+++ b/test/trap-clip.pdf.rgb24.ref.png
diff --git a/test/trap-clip-ps2-argb32-ref.png b/test/trap-clip.ps2.argb32.ref.png
index 37121cde7..37121cde7 100644
--- a/test/trap-clip-ps2-argb32-ref.png
+++ b/test/trap-clip.ps2.argb32.ref.png
diff --git a/test/trap-clip-ps2-rgb24-ref.png b/test/trap-clip.ps2.rgb24.ref.png
index 8dd921c21..8dd921c21 100644
--- a/test/trap-clip-ps2-rgb24-ref.png
+++ b/test/trap-clip.ps2.rgb24.ref.png
diff --git a/test/trap-clip-ps3-argb32-ref.png b/test/trap-clip.ps3.argb32.ref.png
index 8bbd1fd32..8bbd1fd32 100644
--- a/test/trap-clip-ps3-argb32-ref.png
+++ b/test/trap-clip.ps3.argb32.ref.png
diff --git a/test/trap-clip-ps3-rgb24-ref.png b/test/trap-clip.ps3.rgb24.ref.png
index f3ded8010..f3ded8010 100644
--- a/test/trap-clip-ps3-rgb24-ref.png
+++ b/test/trap-clip.ps3.rgb24.ref.png
diff --git a/test/trap-clip-quartz-ref.png b/test/trap-clip.quartz.ref.png
index d1acd319d..d1acd319d 100644
--- a/test/trap-clip-quartz-ref.png
+++ b/test/trap-clip.quartz.ref.png
diff --git a/test/trap-clip-quartz-rgb24-ref.png b/test/trap-clip.quartz.rgb24.ref.png
index 24da4b9aa..24da4b9aa 100644
--- a/test/trap-clip-quartz-rgb24-ref.png
+++ b/test/trap-clip.quartz.rgb24.ref.png
diff --git a/test/trap-clip-ref.png b/test/trap-clip.ref.png
index 2cbbdb76e..2cbbdb76e 100644
--- a/test/trap-clip-ref.png
+++ b/test/trap-clip.ref.png
diff --git a/test/trap-clip-rgb24-ref.png b/test/trap-clip.rgb24.ref.png
index 15068aa56..15068aa56 100644
--- a/test/trap-clip-rgb24-ref.png
+++ b/test/trap-clip.rgb24.ref.png
diff --git a/test/twin-ps2-ref.png b/test/twin.ps2.ref.png
index a58dc5b63..a58dc5b63 100644
--- a/test/twin-ps2-ref.png
+++ b/test/twin.ps2.ref.png
diff --git a/test/twin-ps3-ref.png b/test/twin.ps3.ref.png
index a58dc5b63..a58dc5b63 100644
--- a/test/twin-ps3-ref.png
+++ b/test/twin.ps3.ref.png
diff --git a/test/twin-ref.png b/test/twin.ref.png
index f2a5636de..f2a5636de 100644
--- a/test/twin-ref.png
+++ b/test/twin.ref.png
diff --git a/test/twin-svg11-ref.png b/test/twin.svg11.ref.png
index 5b7d67d42..5b7d67d42 100644
--- a/test/twin-svg11-ref.png
+++ b/test/twin.svg11.ref.png
diff --git a/test/twin-svg12-ref.png b/test/twin.svg12.ref.png
index 5b7d67d42..5b7d67d42 100644
--- a/test/twin-svg12-ref.png
+++ b/test/twin.svg12.ref.png
diff --git a/test/unantialiased-shapes-quartz-ref.png b/test/unantialiased-shapes.quartz.ref.png
index 0760505d6..0760505d6 100644
--- a/test/unantialiased-shapes-quartz-ref.png
+++ b/test/unantialiased-shapes.quartz.ref.png
diff --git a/test/unantialiased-shapes-ref.png b/test/unantialiased-shapes.ref.png
index 128a2a162..128a2a162 100644
--- a/test/unantialiased-shapes-ref.png
+++ b/test/unantialiased-shapes.ref.png
diff --git a/test/unbounded-operator-quartz-ref.png b/test/unbounded-operator.quartz.ref.png
index b0501db6d..b0501db6d 100644
--- a/test/unbounded-operator-quartz-ref.png
+++ b/test/unbounded-operator.quartz.ref.png
diff --git a/test/unbounded-operator-quartz-rgb24-ref.png b/test/unbounded-operator.quartz.rgb24.ref.png
index f8dae18d5..f8dae18d5 100644
--- a/test/unbounded-operator-quartz-rgb24-ref.png
+++ b/test/unbounded-operator.quartz.rgb24.ref.png
diff --git a/test/unbounded-operator-ref.png b/test/unbounded-operator.ref.png
index 03c7bc8f7..03c7bc8f7 100644
--- a/test/unbounded-operator-ref.png
+++ b/test/unbounded-operator.ref.png
diff --git a/test/unbounded-operator-rgb24-ref.png b/test/unbounded-operator.rgb24.ref.png
index b2f1a84dc..b2f1a84dc 100644
--- a/test/unbounded-operator-rgb24-ref.png
+++ b/test/unbounded-operator.rgb24.ref.png
diff --git a/test/user-font-mask-pdf-ref.png b/test/user-font-mask.pdf.ref.png
index ebf148587..ebf148587 100644
--- a/test/user-font-mask-pdf-ref.png
+++ b/test/user-font-mask.pdf.ref.png
diff --git a/test/user-font-mask-ps2-ref.png b/test/user-font-mask.ps2.ref.png
index ebf148587..ebf148587 100644
--- a/test/user-font-mask-ps2-ref.png
+++ b/test/user-font-mask.ps2.ref.png
diff --git a/test/user-font-mask-ps3-ref.png b/test/user-font-mask.ps3.ref.png
index ebf148587..ebf148587 100644
--- a/test/user-font-mask-ps3-ref.png
+++ b/test/user-font-mask.ps3.ref.png
diff --git a/test/user-font-mask-ref.png b/test/user-font-mask.ref.png
index e59eab82d..e59eab82d 100644
--- a/test/user-font-mask-ref.png
+++ b/test/user-font-mask.ref.png
diff --git a/test/user-font-mask-svg11-ref.png b/test/user-font-mask.svg11.ref.png
index 55006bf79..55006bf79 100644
--- a/test/user-font-mask-svg11-ref.png
+++ b/test/user-font-mask.svg11.ref.png
diff --git a/test/user-font-proxy-pdf-ref.png b/test/user-font-proxy.pdf.ref.png
index afe7cb0dc..afe7cb0dc 100644
--- a/test/user-font-proxy-pdf-ref.png
+++ b/test/user-font-proxy.pdf.ref.png
diff --git a/test/user-font-proxy-ps2-ref.png b/test/user-font-proxy.ps2.ref.png
index 0d9024445..0d9024445 100644
--- a/test/user-font-proxy-ps2-ref.png
+++ b/test/user-font-proxy.ps2.ref.png
diff --git a/test/user-font-proxy-ps3-ref.png b/test/user-font-proxy.ps3.ref.png
index 0d9024445..0d9024445 100644
--- a/test/user-font-proxy-ps3-ref.png
+++ b/test/user-font-proxy.ps3.ref.png
diff --git a/test/user-font-proxy-ref.png b/test/user-font-proxy.ref.png
index ebd97198f..ebd97198f 100644
--- a/test/user-font-proxy-ref.png
+++ b/test/user-font-proxy.ref.png
diff --git a/test/user-font-proxy-svg11-ref.png b/test/user-font-proxy.svg11.ref.png
index e5e9e9a79..e5e9e9a79 100644
--- a/test/user-font-proxy-svg11-ref.png
+++ b/test/user-font-proxy.svg11.ref.png
diff --git a/test/user-font-proxy-svg12-ref.png b/test/user-font-proxy.svg12.ref.png
index e5e9e9a79..e5e9e9a79 100644
--- a/test/user-font-proxy-svg12-ref.png
+++ b/test/user-font-proxy.svg12.ref.png
diff --git a/test/user-font-rescale-ps2-ref.png b/test/user-font-rescale.ps2.ref.png
index 7e112da88..7e112da88 100644
--- a/test/user-font-rescale-ps2-ref.png
+++ b/test/user-font-rescale.ps2.ref.png
diff --git a/test/user-font-rescale-ps3-ref.png b/test/user-font-rescale.ps3.ref.png
index 7e112da88..7e112da88 100644
--- a/test/user-font-rescale-ps3-ref.png
+++ b/test/user-font-rescale.ps3.ref.png
diff --git a/test/user-font-rescale-ref.png b/test/user-font-rescale.ref.png
index 447813025..447813025 100644
--- a/test/user-font-rescale-ref.png
+++ b/test/user-font-rescale.ref.png
diff --git a/test/user-font-rescale-svg11-ref.png b/test/user-font-rescale.svg11.ref.png
index 871e27e44..871e27e44 100644
--- a/test/user-font-rescale-svg11-ref.png
+++ b/test/user-font-rescale.svg11.ref.png
diff --git a/test/user-font-rescale-svg12-ref.png b/test/user-font-rescale.svg12.ref.png
index 871e27e44..871e27e44 100644
--- a/test/user-font-rescale-svg12-ref.png
+++ b/test/user-font-rescale.svg12.ref.png
diff --git a/test/user-font-ps2-ref.png b/test/user-font.ps2.ref.png
index e1dd00abf..e1dd00abf 100644
--- a/test/user-font-ps2-ref.png
+++ b/test/user-font.ps2.ref.png
diff --git a/test/user-font-ps3-ref.png b/test/user-font.ps3.ref.png
index e1dd00abf..e1dd00abf 100644
--- a/test/user-font-ps3-ref.png
+++ b/test/user-font.ps3.ref.png
diff --git a/test/user-font-ref.png b/test/user-font.ref.png
index abc31171a..abc31171a 100644
--- a/test/user-font-ref.png
+++ b/test/user-font.ref.png
diff --git a/test/user-font-svg11-ref.png b/test/user-font.svg11.ref.png
index 28ba652a6..28ba652a6 100644
--- a/test/user-font-svg11-ref.png
+++ b/test/user-font.svg11.ref.png
diff --git a/test/user-font-svg12-ref.png b/test/user-font.svg12.ref.png
index 28ba652a6..28ba652a6 100644
--- a/test/user-font-svg12-ref.png
+++ b/test/user-font.svg12.ref.png
diff --git a/test/xlib-expose-event.c b/test/xlib-expose-event.c
index a2bda1ac3..fc312dadd 100644
--- a/test/xlib-expose-event.c
+++ b/test/xlib-expose-event.c
@@ -190,9 +190,9 @@ compare (const cairo_test_context_t *ctx, cairo_surface_t *surface)
     cairo_set_source_surface (cr, surface, 0, 0);
     cairo_paint (cr);
     cairo_destroy (cr);
-    cairo_surface_write_to_png (image, "xlib-expose-event-out.png");
+    cairo_surface_write_to_png (image, "xlib-expose-event.out.png");
 
-    reference = cairo_test_create_surface_from_png (ctx, "xlib-expose-event-ref.png");
+    reference = cairo_test_create_surface_from_png (ctx, "xlib-expose-event.ref.png");
     status = image_diff (ctx, reference, image, diff, &result);
 
     cairo_surface_destroy (reference);
diff --git a/test/xlib-expose-event-ref.png b/test/xlib-expose-event.ref.png
index 1cca0e749..1cca0e749 100644
--- a/test/xlib-expose-event-ref.png
+++ b/test/xlib-expose-event.ref.png
diff --git a/test/xlib-surface-source-ps2-ref.png b/test/xlib-surface-source.ps2.ref.png
index 10231581b..10231581b 100644
--- a/test/xlib-surface-source-ps2-ref.png
+++ b/test/xlib-surface-source.ps2.ref.png
diff --git a/test/xlib-surface-source-ps3-ref.png b/test/xlib-surface-source.ps3.ref.png
index 10231581b..10231581b 100644
--- a/test/xlib-surface-source-ps3-ref.png
+++ b/test/xlib-surface-source.ps3.ref.png
diff --git a/test/xlib-surface-source-ref.png b/test/xlib-surface-source.ref.png
index 3fa8bbe55..3fa8bbe55 100644
--- a/test/xlib-surface-source-ref.png
+++ b/test/xlib-surface-source.ref.png
diff --git a/test/zero-alpha-ref.png b/test/zero-alpha.ref.png
index d03727dda..d03727dda 100644
--- a/test/zero-alpha-ref.png
+++ b/test/zero-alpha.ref.png