diff --git a/test/spdkcli/common.sh b/test/spdkcli/common.sh
index 2f135fb15..bc46a202d 100644
--- a/test/spdkcli/common.sh
+++ b/test/spdkcli/common.sh
@@ -6,8 +6,7 @@
 spdkcli_job="$rootdir/test/spdkcli/spdkcli_job.py"
 spdk_clear_config_py="$rootdir/test/json_config/clear_config.py"
 
-function on_error_exit() {
-	set +e
+function cleanup() {
 	if [ -n "$spdk_tgt_pid" ]; then
 		killprocess $spdk_tgt_pid
 	fi
@@ -21,8 +20,6 @@ function on_error_exit() {
 		killprocess $vhost_tgt_pid
 	fi
 	rm -f $testdir/${MATCH_FILE} $testdir/match_files/spdkcli_details_vhost.test /tmp/sample_aio /tmp/sample_pmem
-	print_backtrace
-	exit 1
 }
 
 function run_spdk_tgt() {
diff --git a/test/spdkcli/iscsi.sh b/test/spdkcli/iscsi.sh
index 335b5f429..ec80c5485 100755
--- a/test/spdkcli/iscsi.sh
+++ b/test/spdkcli/iscsi.sh
@@ -12,7 +12,7 @@ source $rootdir/test/iscsi_tgt/common.sh
 MATCH_FILE="spdkcli_iscsi.test"
 SPDKCLI_BRANCH="/iscsi"
 
-trap 'on_error_exit;' ERR
+trap 'cleanup' EXIT
 
 timing_enter run_iscsi_tgt
 
diff --git a/test/spdkcli/nvmf.sh b/test/spdkcli/nvmf.sh
index 7fb9d4c99..accd5ff4a 100755
--- a/test/spdkcli/nvmf.sh
+++ b/test/spdkcli/nvmf.sh
@@ -12,7 +12,7 @@ source $rootdir/test/nvmf/common.sh
 MATCH_FILE="spdkcli_nvmf.test"
 SPDKCLI_BRANCH="/nvmf"
 
-trap 'on_error_exit' ERR
+trap 'cleanup' EXIT
 
 timing_enter run_nvmf_tgt
 run_nvmf_tgt
diff --git a/test/spdkcli/pmem.sh b/test/spdkcli/pmem.sh
index 35ab19494..1031797ff 100755
--- a/test/spdkcli/pmem.sh
+++ b/test/spdkcli/pmem.sh
@@ -11,7 +11,7 @@ source $rootdir/test/spdkcli/common.sh
 MATCH_FILE="spdkcli_pmem.test"
 SPDKCLI_BRANCH="/bdevs/pmemblk"
 
-trap 'rm -f $testdir/match_files/spdkcli_pmem_info.test; on_error_exit;' ERR
+trap 'rm -f $testdir/match_files/spdkcli_pmem_info.test; cleanup' EXIT
 
 timing_enter run_spdk_tgt
 run_spdk_tgt
diff --git a/test/spdkcli/raid.sh b/test/spdkcli/raid.sh
index cabb7e1fd..d198a4e2c 100755
--- a/test/spdkcli/raid.sh
+++ b/test/spdkcli/raid.sh
@@ -14,7 +14,7 @@ SPDKCLI_BRANCH="/bdevs"
 testdir=$(readlink -f $(dirname $0))
 . $testdir/common.sh
 
-trap 'on_error_exit;' ERR
+trap 'cleanup' EXIT
 
 timing_enter run_spdk_tgt
 run_spdk_tgt
diff --git a/test/spdkcli/rbd.sh b/test/spdkcli/rbd.sh
index a93dfd0bc..83765e74a 100755
--- a/test/spdkcli/rbd.sh
+++ b/test/spdkcli/rbd.sh
@@ -11,13 +11,12 @@ source $rootdir/test/spdkcli/common.sh
 MATCH_FILE="spdkcli_rbd.test"
 SPDKCLI_BRANCH="/bdevs/rbd"
 
-trap 'on_error_exit' ERR
+trap 'rbd_cleanup; cleanup' EXIT
 timing_enter run_spdk_tgt
 run_spdk_tgt
 timing_exit run_spdk_tgt
 
 timing_enter spdkcli_create_rbd_config
-trap 'rbd_cleanup; on_error_exit' ERR
 rbd_cleanup
 rbd_setup 127.0.0.1
 $spdkcli_job "\"/bdevs/rbd create rbd foo 512' 'Ceph0' True "\"/bdevs/rbd create rbd foo 512 'Ceph1' True"
diff --git a/test/spdkcli/vhost.sh b/test/spdkcli/vhost.sh
index 74601cb3b..5507a9e6f 100755
--- a/test/spdkcli/vhost.sh
+++ b/test/spdkcli/vhost.sh
@@ -14,7 +14,7 @@ SPDKCLI_BRANCH="/"
 sample_aio=$SPDK_TEST_STORAGE/sample_aio
 sample_aio2=$SPDK_TEST_STORAGE/sample_aio2
 
-trap 'on_error_exit' ERR
+trap 'cleanup' EXIT
 timing_enter run_vhost_tgt
 run_vhost_tgt
 timing_exit run_vhost_tgt
diff --git a/test/spdkcli/virtio.sh b/test/spdkcli/virtio.sh
index 19f15e389..75702cd8f 100755
--- a/test/spdkcli/virtio.sh
+++ b/test/spdkcli/virtio.sh
@@ -8,7 +8,7 @@ rootdir=$(readlink -f $testdir/../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/spdkcli/common.sh
 
-trap 'killprocess $virtio_pid; on_error_exit' ERR
+trap 'killprocess $virtio_pid; cleanup' EXIT
 
 timing_enter run_spdk_tgt
 run_spdk_tgt