diff --git a/test/nvmf/discovery/discovery.sh b/test/nvmf/discovery/discovery.sh
index 2a7d7456a..1336200a8 100755
--- a/test/nvmf/discovery/discovery.sh
+++ b/test/nvmf/discovery/discovery.sh
@@ -12,6 +12,8 @@ fi
 
 rdma_device_init
 
+set -e
+
 timing_enter discovery
 
 # Start up the NVMf target in another process
diff --git a/test/nvmf/filesystem/filesystem.sh b/test/nvmf/filesystem/filesystem.sh
index 80bb38086..9a09e4b37 100755
--- a/test/nvmf/filesystem/filesystem.sh
+++ b/test/nvmf/filesystem/filesystem.sh
@@ -33,6 +33,8 @@ function filesystem_test()
 
 rdma_device_init
 
+set -e
+
 timing_enter fs_test
 
 # Start up the NVMf target in another process
diff --git a/test/nvmf/fio/fio.sh b/test/nvmf/fio/fio.sh
index dec264920..b9aabcd7d 100755
--- a/test/nvmf/fio/fio.sh
+++ b/test/nvmf/fio/fio.sh
@@ -7,6 +7,8 @@ source $rootdir/test/nvmf/common.sh
 
 rdma_device_init
 
+set -e
+
 timing_enter fio
 
 # Start up the NVMf target in another process