diff --git a/test/Makefile.am b/test/Makefile.am
index d4bfbd384..6aa0b8e34 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -973,10 +973,8 @@ REFERENCE_IMAGES = \
 	trap-clip.ps2.rgb24.ref.png \
 	twin.ref.png \
 	twin.pdf.ref.png \
-	twin.ps2.ref.png \
-	twin.ps3.ref.png \
-	twin.svg11.ref.png \
-	twin.svg12.ref.png \
+	twin.ps.ref.png \
+	twin.svg.ref.png \
 	unantialiased-shapes.ref.png	\
 	unantialiased-shapes.quartz.ref.png \
 	unbounded-operator.ref.png	\
diff --git a/test/twin.c b/test/twin.c
index b04caf56f..b71d97eb0 100644
--- a/test/twin.c
+++ b/test/twin.c
@@ -48,5 +48,5 @@ CAIRO_TEST (twin,
 	    "Tests the internal font",
 	    "twin, font", /* keywords */
 	    NULL, /* requirements */
-	    132, 20,
+	    140, 20,
 	    NULL, draw)
diff --git a/test/twin.pdf.ref.png b/test/twin.pdf.ref.png
deleted file mode 100644
index 366ad9a23..000000000
Binary files a/test/twin.pdf.ref.png and /dev/null differ
diff --git a/test/twin.ps.ref.png b/test/twin.ps.ref.png
new file mode 100644
index 000000000..f9374e33b
Binary files /dev/null and b/test/twin.ps.ref.png differ
diff --git a/test/twin.ps2.ref.png b/test/twin.ps2.ref.png
deleted file mode 100644
index 7fc3f35a3..000000000
Binary files a/test/twin.ps2.ref.png and /dev/null differ
diff --git a/test/twin.ps3.ref.png b/test/twin.ps3.ref.png
deleted file mode 100644
index 7fc3f35a3..000000000
Binary files a/test/twin.ps3.ref.png and /dev/null differ
diff --git a/test/twin.ref.png b/test/twin.ref.png
index 5c1cf2d4b..8bf098c15 100644
Binary files a/test/twin.ref.png and b/test/twin.ref.png differ
diff --git a/test/twin.svg.ref.png b/test/twin.svg.ref.png
new file mode 100644
index 000000000..8b4617f08
Binary files /dev/null and b/test/twin.svg.ref.png differ
diff --git a/test/twin.svg11.argb32.ref.png b/test/twin.svg11.argb32.ref.png
deleted file mode 100644
index 0818c67c8..000000000
Binary files a/test/twin.svg11.argb32.ref.png and /dev/null differ
diff --git a/test/twin.svg11.ref.png b/test/twin.svg11.ref.png
deleted file mode 100644
index 46503966b..000000000
Binary files a/test/twin.svg11.ref.png and /dev/null differ
diff --git a/test/twin.svg11.rgb24.ref.png b/test/twin.svg11.rgb24.ref.png
deleted file mode 100644
index 0818c67c8..000000000
Binary files a/test/twin.svg11.rgb24.ref.png and /dev/null differ
diff --git a/test/twin.svg12.argb32.ref.png b/test/twin.svg12.argb32.ref.png
deleted file mode 100644
index 0818c67c8..000000000
Binary files a/test/twin.svg12.argb32.ref.png and /dev/null differ
diff --git a/test/twin.svg12.ref.png b/test/twin.svg12.ref.png
deleted file mode 100644
index 46503966b..000000000
Binary files a/test/twin.svg12.ref.png and /dev/null differ
diff --git a/test/twin.svg12.rgb24.ref.png b/test/twin.svg12.rgb24.ref.png
deleted file mode 100644
index 0818c67c8..000000000
Binary files a/test/twin.svg12.rgb24.ref.png and /dev/null differ