diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 4bf07fadb..1626fe785 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -16,6 +16,20 @@ if CAIRO_HAS_DIRECTFB_SURFACE
 libcairoboilerplate_la_SOURCES += cairo-test-directfb.c cairo-test-directfb.h
 endif
 
+libcairoboilerplate_la_LIBADD =
+if CAIRO_CAN_TEST_GLITZ_AGL_SURFACE
+libcairoboilerplate_la_LIBADD += $(GLITZ_AGL_LIBS)
+endif
+if CAIRO_CAN_TEST_GLITZ_EGL_SURFACE
+libcairoboilerplate_la_LIBADD += $(GLITZ_EGL_LIBS)
+endif
+if CAIRO_CAN_TEST_GLITZ_GLX_SURFACE
+libcairoboilerplate_la_LIBADD += $(GLITZ_GLX_LIBS)
+endif
+if CAIRO_CAN_TEST_GLITZ_WGL_SURFACE
+libcairoboilerplate_la_LIBADD += $(GLITZ_WGL_LIBS)
+endif
+
 # We're using _GNU_SOURCE to get the prototype for asprintf. This may
 # not be the most portable approach, but it is pragmatic and I'm
 # willing to do something cleaner as soon as it causes someone a
diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c
index c37662f5b..3026e6338 100644
--- a/boilerplate/cairo-boilerplate.c
+++ b/boilerplate/cairo-boilerplate.c
@@ -408,6 +408,7 @@ create_cairo_glitz_glx_surface (const char	 *name,
     case CAIRO_CONTENT_COLOR_ALPHA:
 	glitz_surface = create_glitz_glx_surface (GLITZ_STANDARD_ARGB32, width, height, gxtc);
 	break;
+    case CAIRO_CONTENT_ALPHA:
     default:
 	CAIRO_BOILERPLATE_LOG ("Invalid content for glitz-glx test: %d\n", content);
 	goto FAIL_CLOSE_DISPLAY;
diff --git a/test/Makefile.am b/test/Makefile.am
index 1587f7ebd..e5da2ab09 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -393,19 +393,6 @@ LDADD = libcairotest.la \
         $(top_builddir)/boilerplate/libcairoboilerplate.la \
 	$(top_builddir)/src/libcairo.la
 
-if CAIRO_CAN_TEST_GLITZ_AGL_SURFACE
-LDADD += $(GLITZ_AGL_LIBS)
-endif
-if CAIRO_CAN_TEST_GLITZ_EGL_SURFACE
-LDADD += $(GLITZ_EGL_LIBS)
-endif
-if CAIRO_CAN_TEST_GLITZ_GLX_SURFACE
-LDADD += $(GLITZ_GLX_LIBS)
-endif
-if CAIRO_CAN_TEST_GLITZ_WGL_SURFACE
-LDADD += $(GLITZ_WGL_LIBS)
-endif
-
 if HAVE_PTHREAD
 LDADD += -lpthread
 endif