3 files changed, 16 insertions, 11 deletions
diff --git a/test/checkpoint/smoke.sh b/test/checkpoint/smoke.sh
index 2e18450d6da..2f1d4345ad7 100755
--- a/test/checkpoint/smoke.sh
+++ b/test/checkpoint/smoke.sh
@@ -1,21 +1,22 @@
 #! /bin/sh
 
-# Smoke-test checkpoints as part of running "make check".
+set -e
 
+# Smoke-test checkpoints as part of running "make check".
 echo "checkpoint: 3 mixed tables"
-$TEST_WRAPPER ./t -T 3 -t m || exit 1
+$TEST_WRAPPER ./t -T 3 -t m
 
 echo "checkpoint: 6 column-store tables"
-$TEST_WRAPPER ./t -T 6 -t c || exit 1
+$TEST_WRAPPER ./t -T 6 -t c
 
 echo "checkpoint: 6 LSM tables"
-$TEST_WRAPPER ./t -T 6 -t l || exit 1
+$TEST_WRAPPER ./t -T 6 -t l
 
 echo "checkpoint: 6 mixed tables"
-$TEST_WRAPPER ./t -T 6 -t m || exit 1
+$TEST_WRAPPER ./t -T 6 -t m
 
 echo "checkpoint: 6 row-store tables"
-$TEST_WRAPPER ./t -T 6 -t r || exit 1
+$TEST_WRAPPER ./t -T 6 -t r
 
 echo "checkpoint: 6 row-store tables, named checkpoint"
-$TEST_WRAPPER ./t -c 'TeSt' -T 6 -t r || exit 1
+$TEST_WRAPPER ./t -c 'TeSt' -T 6 -t r
diff --git a/test/format/smoke.sh b/test/format/smoke.sh
index 363f46ba01e..8b4b5d9e424 100755
--- a/test/format/smoke.sh
+++ b/test/format/smoke.sh
@@ -1,9 +1,11 @@
 #! /bin/sh
 
+set -e
+
 # Smoke-test format as part of running "make check".
 args="-1 -c "." data_source=table ops=100000 rows=10000 threads=4 compression=none"
 
-$TEST_WRAPPER ./t $args file_type=fix || exit 1
-$TEST_WRAPPER ./t $args file_type=row || exit 1
-$TEST_WRAPPER ./t $args file_type=row data_source=lsm || exit 1
-$TEST_WRAPPER ./t $args file_type=var || exit 1
+$TEST_WRAPPER ./t $args file_type=fix
+$TEST_WRAPPER ./t $args file_type=row
+$TEST_WRAPPER ./t $args file_type=row data_source=lsm
+$TEST_WRAPPER ./t $args file_type=var
diff --git a/test/huge/smoke.sh b/test/huge/smoke.sh
index 669a2a8d34d..1aa96b2eb2c 100755
--- a/test/huge/smoke.sh
+++ b/test/huge/smoke.sh
@@ -1,4 +1,6 @@
 #! /bin/sh
 
+set -e
+
 # Smoke-test as part of running "make check".
 $TEST_WRAPPER ./t -s