diff --git a/src/test_streams/main.c b/src/test_streams/main.c
index c41b3461..fe1173cf 100644
--- a/src/test_streams/main.c
+++ b/src/test_streams/main.c
@@ -1078,9 +1078,9 @@ int main(int argc, char *argv[])
 	if(!generate_wackywavs()) return 1;
 	if(!generate_wackywav64s()) return 1;
 	if(!generate_wackyrf64s()) return 1;
-	for(channels = 1; channels <= 8; channels++) {
+	for(channels = 1; channels <= 8; channels *= 2) {
 		unsigned bits_per_sample;
-		for(bits_per_sample = 4; bits_per_sample <= 24; bits_per_sample++) {
+		for(bits_per_sample = 8; bits_per_sample <= 24; bits_per_sample += 4) {
 			static const unsigned nsamples[] = { 1, 111, 4777 } ;
 			unsigned samples;
 			for(samples = 0; samples < sizeof(nsamples)/sizeof(nsamples[0]); samples++) {
diff --git a/test/test_seeking.sh b/test/test_seeking.sh
index f59e665c..94e4de12 100755
--- a/test/test_seeking.sh
+++ b/test/test_seeking.sh
@@ -103,7 +103,7 @@ tiny_seek_count=100
 if [ "$FLAC__TEST_LEVEL" -gt 1 ] ; then
 	small_seek_count=10000
 else
-	small_seek_count=100000
+	small_seek_count=100
 fi
 
 for suffix in '' '-s' ; do