diff --git a/src/Makefile.am b/src/Makefile.am
index 3cf6b2b..75f2407 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+CAIROLIBRARIES =
+
 font_subset_sources =				\
 	cairo-cff-subset.c			\
 	cairo-truetype-subset.c			\
@@ -95,7 +97,7 @@ libcairo_beos_headers = cairo-beos.h
 libcairo_beos_sources += cairo-beos-surface.cpp
 backend_pkgconfigs += cairo-beos.pc
 
-noinst_LTLIBRARIES = libcairo_beos.la
+CAIROLIBRARIES += libcairo_beos.la
 libcairo_beos_la_SOURCES = $(libcairo_beos_sources)
 # BeOS system headers trigger this warning
 libcairo_beos_la_CXXFLAGS = -Wno-multichar
@@ -157,6 +159,7 @@ cairoinclude_HEADERS =			\
 nodist_cairoinclude_HEADERS =		\
 	cairo-features.h
 
+noinst_LTLIBRARIES = $(CAIROLIBRARIES) libcairotesthelper.la
 lib_LTLIBRARIES = libcairo.la
 
 libcairo_la_SOURCES =				\
@@ -246,9 +249,18 @@ libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined $(export_symbol
 
 INCLUDES = -I$(srcdir) -I$(top_srcdir)/pixman/src $(CAIRO_CFLAGS)
 
-libcairo_la_LIBADD = $(top_builddir)/pixman/src/libpixman.la $(CAIRO_LIBS) $(noinst_LTLIBRARIES) $(CAIRO_LDADD)
+libcairo_la_LIBADD = $(top_builddir)/pixman/src/libpixman.la $(CAIRO_LIBS) $(CAIROLIBRARIES) $(CAIRO_LDADD)
+
+libcairo_la_DEPENDENCIES = $(cairo_def_dependency) $(top_builddir)/pixman/src/libpixman.la $(CAIROLIBRARIES)
+
 
-libcairo_la_DEPENDENCIES = $(cairo_def_dependency) $(top_builddir)/pixman/src/libpixman.la $(noinst_LTLIBRARIES)
+libcairotesthelper_la_SOURCES =			\
+	$(libcairotesthelper_ps_sources)	\
+	$(libcairotesthelper_pdf_sources)	\
+	$(libcairotesthelper_svg_sources)	\
+	$(libcairotesthelper_xlib_sources)	\
+	cairo-test-helper.c			\
+	cairo-test-helper.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = cairo.pc $(backend_pkgconfigs)
diff --git a/src/cairo-test-helper.c b/src/cairo-test-helper.c
index e69de29..16cd8ec 100644
--- a/src/cairo-test-helper.c
+++ b/src/cairo-test-helper.c
@@ -0,0 +1,37 @@
+/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */
+/* cairo-test-helper - a helper library for testing cairo
+ *
+ * Copyright © 2007 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is University of Southern
+ * California.
+ *
+ * Contributor(s):
+ *	Behdad Esfahbod <behdad@behdad.org>
+ */
+
diff --git a/src/cairo-test-helper.h b/src/cairo-test-helper.h
index e69de29..da6b414 100644
--- a/src/cairo-test-helper.h
+++ b/src/cairo-test-helper.h
@@ -0,0 +1,40 @@
+/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */
+/* cairo-test-helper - a helper library for testing cairo
+ *
+ * Copyright © 2007 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is University of Southern
+ * California.
+ *
+ * Contributor(s):
+ *	Behdad Esfahbod <behdad@behdad.org>
+ */
+
+#ifndef CAIRO_TEST_HELPER_H
+#define CAIRO_TEST_HELPER_H
+
diff --git a/test/fallback-resolution.c b/test/fallback-resolution.c
index b8d7e04..ecf9830 100644
--- a/test/fallback-resolution.c
+++ b/test/fallback-resolution.c
@@ -103,18 +103,18 @@ main (void)
 	case PDF:
 	    surface = cairo_pdf_surface_create (backend_filename[backend],
 						SIZE, SIZE);
-	    _cairo_pdf_test_force_fallbacks ();
+	    cairo_boilerplate_pdf_surface_force_fallbacks (surface);
 	    break;
 	case PS:
 	    surface = cairo_ps_surface_create (backend_filename[backend],
 					       SIZE, SIZE);
-	    _cairo_ps_test_force_fallbacks ();
+	    cairo_boilerplate_ps_surface_force_fallbacks (surface);
 	    break;
 	case SVG:
 	    surface = cairo_svg_surface_create (backend_filename[backend],
 						SIZE, SIZE);
+	    cairo_boilerplate_svg_surface_force_fallbacks (surface);
 	    cairo_svg_surface_restrict_to_version (surface, CAIRO_SVG_VERSION_1_2);
-	    _cairo_svg_test_force_fallbacks ();
 	    break;
 	}
 
diff --git a/test/glyph-cache-pressure.c b/test/glyph-cache-pressure.c
index ba90fa3..6cca843 100644
--- a/test/glyph-cache-pressure.c
+++ b/test/glyph-cache-pressure.c
@@ -67,8 +67,6 @@ draw (cairo_t *cr, int width, int height)
     cairo_paint (cr);
     cairo_restore (cr);
 
-    _cairo_scaled_font_test_set_max_glyphs_cached_per_font (1);
-
     cairo_select_font_face (cr, "Bitstream Vera Sans",
 			    CAIRO_FONT_SLANT_NORMAL,
 			    CAIRO_FONT_WEIGHT_NORMAL);
@@ -76,6 +74,8 @@ draw (cairo_t *cr, int width, int height)
 
     cairo_set_source_rgb (cr, 0, 0, 0); /* black */
 
+    cairo_boilerplate_scaled_font_set_max_glyphs_cached (cairo_get_scaled_font (cr), 1);
+
     cairo_move_to (cr, 1, TEXT_SIZE);
     cairo_show_text (cr, "the five boxing wizards jump quickly");
 
diff --git a/test/xlib-surface.c b/test/xlib-surface.c
index 3b6d1b5..6906129 100644
--- a/test/xlib-surface.c
+++ b/test/xlib-surface.c
@@ -123,6 +123,9 @@ do_test (Display        *dpy,
 					 DefaultVisual (dpy, screen),
 					 SIZE, SIZE);
 
+    if (!use_render)
+	cairo_boilerplate_xlib_surface_disable_render (surface);
+
     if (set_size) {
 	cairo_xlib_surface_set_size (surface, SIZE, SIZE);
 
@@ -257,8 +260,6 @@ main (void)
 		    result = status;
 	    }
 
-    _cairo_xlib_test_disable_render ();
-
     for (set_size = 0; set_size <= 1; set_size++)
 	for (use_pixmap = 0; use_pixmap <= 1; use_pixmap++)
 	    for (offscreen = 0; offscreen <= 1; offscreen++) {