diff --git a/Makefile.am b/Makefile.am
index 26a7d00e1..1db225853 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ pngtest_SOURCES = pngtest.c
 pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
 pngvalid_SOURCES = pngvalid.c
 pngvalid_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-TESTS = test-pngtest.sh pngvalid
+TESTS = test-pngtest.sh test-pngvalid-simple.sh test-pngvalid-full.sh
 TESTS_ENVIRONMENT= srcdir=$(srcdir) 
 
 # man pages
diff --git a/Makefile.in b/Makefile.in
index 696a31748..058dffe3d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = pngtest$(EXEEXT) pngvalid$(EXEEXT)
-TESTS = test-pngtest.sh pngvalid$(EXEEXT)
+TESTS = test-pngtest.sh test-pngvalid-simple.sh test-pngvalid-full.sh 
 @HAVE_LD_VERSION_SCRIPT_TRUE@am__append_1 = -Wl,--version-script=libpng.vers
 @HAVE_LD_VERSION_SCRIPT_FALSE@am__append_2 = -export-symbols libpng.sym
 subdir = .
diff --git a/test-pngvalid-full.sh b/test-pngvalid-full.sh
new file mode 100755
index 000000000..a27e4b1bf
--- /dev/null
+++ b/test-pngvalid-full.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./pngvalid -q --speed
diff --git a/test-pngvalid-simple.sh b/test-pngvalid-simple.sh
new file mode 100755
index 000000000..0ca9bba78
--- /dev/null
+++ b/test-pngvalid-simple.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./pngvalid -q --nogamma