add configure options --disable-thorough-tests which breaks up testing into 3 levels: 0 for basic testing, 1 for thorough testing, 2 for exhaustive testing
diff --git a/test/test_bins.sh b/test/test_bins.sh
index 4d1898e..2ed0258 100755
--- a/test/test_bins.sh
+++ b/test/test_bins.sh
@@ -46,7 +46,7 @@
 
 run_flac ()
 {
-	if [ x"$FLAC__VALGRIND" = xyes ] ; then
+	if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then
 		valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 flac $* 4>>test_bins.valgrind.log
 	else
 		flac $*
@@ -98,7 +98,7 @@
 							done
 						done
 					done
-					if [ "$FLAC__EXHAUSTIVE_TESTS" = yes ] ; then
+					if [ "$FLAC__TEST_LEVEL" -gt 1 ] ; then
 						test_file $binfile $channels $bps "-b 16384 -m -r 8 -l 32 -e -p $disable"
 					fi
 				done