diff --git a/ChangeLog b/ChangeLog
index 00edbba45..0198570d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-28  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in Makefile.am: Skip tests/ directory if
+	libpng was disabled. (#3423, reported by Steve Chaplin)
+
 2005-07-28  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo-png.c: (read_png),
diff --git a/Makefile.am b/Makefile.am
index 31aea9118..c2a9965a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,10 @@
-SUBDIRS = src test doc
+DIST_SUBDIRS = src test doc
+SUBDIRS = src doc
+
+# libpng is required for our test programs
+if CAIRO_HAS_PNG_FUNCTIONS
+SUBDIRS += test
+endif
 
 EXTRA_DIST = \
 	COPYING \
diff --git a/configure.in b/configure.in
index 9f9d784d6..7c9502ce8 100644
--- a/configure.in
+++ b/configure.in
@@ -177,6 +177,8 @@ fi
 AM_CONDITIONAL(CAIRO_HAS_PNG_FUNCTIONS, test "x$use_png" = "xyes")
 if test "x$use_png" = "xyes"; then
   PNG_FUNCTIONS_FEATURE="#define CAIRO_HAS_PNG_FUNCTIONS 1"
+else
+  AC_MSG_WARN("*** To run the tests, cairo must be built with png support ***)
 fi
 AC_SUBST(PNG_FUNCTIONS_FEATURE)