diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh
index 5e48e56c4..3e625145d 100755
--- a/test/iscsi_tgt/calsoft/calsoft.sh
+++ b/test/iscsi_tgt/calsoft/calsoft.sh
@@ -27,11 +27,13 @@ echo "IP=$TARGET_IP" >> /usr/local/etc/its.conf
 
 timing_enter start_iscsi_tgt
 
+iscsitestinit
+
 "${ISCSI_APP[@]}" -m 0x1 --wait-for-rpc &
 pid=$!
 echo "Process pid: $pid"
 
-trap 'killprocess $pid; delete_tmp_conf_files; exit 1 ' SIGINT SIGTERM EXIT
+trap 'killprocess $pid; delete_tmp_conf_files; iscsitestfini; exit 1 ' SIGINT SIGTERM EXIT
 
 waitforlisten $pid
 $rpc_py load_subsystem_config < $testdir/iscsi.json
@@ -62,6 +64,8 @@ fi
 
 trap - SIGINT SIGTERM EXIT
 
+iscsicleanup
 killprocess $pid
 delete_tmp_conf_files
+iscsitestfini
 exit $failed