diff --git a/ANNOUNCE b/ANNOUNCE
index e9b5bf7bc..0b337cc05 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -36,6 +36,7 @@ Version 1.5.16beta01 [April 25, 2013]
   Avoid a compiler warning about unused png_ptr in translate_gamma_flags()
 
 Version 1.5.16beta02 [April 26, 2013]
+  Revise pngtest.c to skip tests of unsupported features.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 325348491..a4cb1c16e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4080,6 +4080,7 @@ Version 1.5.16beta01 [April 25, 2013]
   Avoid a compiler warning about unused png_ptr in translate_gamma_flags()
 
 Version 1.5.16beta02 [April 26, 2013]
+  Revise pngtest.c to skip tests of unsupported features.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/configure b/configure
index e3ac97381..085052596 100755
--- a/configure
+++ b/configure
@@ -12844,7 +12844,7 @@ fi
 
 
 # If enable/disable was not specified default to using the optimizations if the
-# host CPU is ARM and the comppiler is targeting a NEON host.  The latter test
+# host CPU is ARM and the compiler is targeting a NEON host.  The latter test
 # is done in scripts/pnglibconf.dfa by checking for __ARM_NEON__.  The
 # AM_CONDITIONAL below controls whether the ARM NEON source files are built.
 
@@ -12858,7 +12858,7 @@ else
 fi
 
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: Extra options for compiler: $PNG_COPTS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Extra options for compiler: $PNG_COPTS" >&5
 $as_echo "$as_me: Extra options for compiler: $PNG_COPTS" >&6;}
 
 # Config files, substituting as above
diff --git a/pngtest.c b/pngtest.c
index 2f7841b8d..e8a43c62f 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -43,7 +43,20 @@
 
 #include "png.h"
 
-#ifdef PNG_READ_SUPPORTED /* else nothing can be done */
+#if defined PNG_READ_SUPPORTED && /* else nothing can be done */\
+   defined PNG_READ_bKGD_SUPPORTED &&\
+   defined PNG_READ_cHRM_SUPPORTED &&\
+   defined PNG_READ_gAMA_SUPPORTED &&\
+   defined PNG_READ_oFFs_SUPPORTED &&\
+   defined PNG_READ_pCAL_SUPPORTED &&\
+   defined PNG_READ_pHYs_SUPPORTED &&\
+   defined PNG_READ_sBIT_SUPPORTED &&\
+   defined PNG_READ_sCAL_SUPPORTED &&\
+   defined PNG_READ_sRGB_SUPPORTED &&\
+   defined PNG_READ_tEXt_SUPPORTED &&\
+   defined PNG_READ_tIME_SUPPORTED &&\
+   defined PNG_READ_zTXt_SUPPORTED
+
 #include "zlib.h"
 /* Copied from pngpriv.h but only used in error messages below. */
 #ifndef PNG_ZBUF_SIZE