diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh
index b2fe56703..048b529d5 100755
--- a/test/iscsi_tgt/calsoft/calsoft.sh
+++ b/test/iscsi_tgt/calsoft/calsoft.sh
@@ -8,11 +8,6 @@ delete_tmp_conf_files() {
 	rm -f /usr/local/etc/its.conf
 }
 
-if [ ! -d /usr/local/calsoft ]; then
-	echo "skipping calsoft tests"
-	exit 0
-fi
-
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
diff --git a/test/iscsi_tgt/iscsi_tgt.sh b/test/iscsi_tgt/iscsi_tgt.sh
index c898bd98e..11cff211d 100755
--- a/test/iscsi_tgt/iscsi_tgt.sh
+++ b/test/iscsi_tgt/iscsi_tgt.sh
@@ -27,7 +27,11 @@ if [ "$TEST_TYPE" == "posix" ]; then
 	# calsoft doesn't handle TCP stream properly and fails decoding iSCSI
 	# requests when are divided by TCP segmentation. This is very common
 	# situation for VPP and causes that calsoft.sh never PASS.
-	run_test "iscsi_tgt_calsoft" ./test/iscsi_tgt/calsoft/calsoft.sh
+	if [[ -d /usr/local/calsoft ]]; then
+		run_test "iscsi_tgt_calsoft" ./test/iscsi_tgt/calsoft/calsoft.sh
+	else
+		skip_run_test_with_warning "WARNING: Calsoft binaries not found, skipping test!"
+	fi
 fi
 run_test "iscsi_tgt_filesystem" ./test/iscsi_tgt/filesystem/filesystem.sh
 run_test "iscsi_tgt_reset" ./test/iscsi_tgt/reset/reset.sh