diff --git a/test/nvmf/target/filesystem.sh b/test/nvmf/target/filesystem.sh
index a3106a790..cd1523794 100755
--- a/test/nvmf/target/filesystem.sh
+++ b/test/nvmf/target/filesystem.sh
@@ -86,7 +86,7 @@ function nvmf_filesystem_part() {
 	parted -s /dev/${nvme_name} rm 1
 
 	sync
-	nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" || true
+	nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
 	waitforserial_disconnect "$NVMF_SERIAL"
 
 	$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
diff --git a/test/nvmf/target/fio.sh b/test/nvmf/target/fio.sh
index 339f6abf5..ccfec5e48 100755
--- a/test/nvmf/target/fio.sh
+++ b/test/nvmf/target/fio.sh
@@ -69,7 +69,7 @@ done
 fio_status=0
 wait $fio_pid || fio_status=$?
 
-nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" || true
+nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
 waitforserial_disconnect "$NVMF_SERIAL"
 
 if [ $fio_status -eq 0 ]; then
diff --git a/test/nvmf/target/initiator_timeout.sh b/test/nvmf/target/initiator_timeout.sh
index d03989dee..79d194ea4 100755
--- a/test/nvmf/target/initiator_timeout.sh
+++ b/test/nvmf/target/initiator_timeout.sh
@@ -53,7 +53,7 @@ $rpc_py bdev_delay_update_latency Delay0 p99_write 30
 fio_status=0
 wait $fio_pid || fio_status=$?
 
-nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" || true
+nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
 waitforserial_disconnect "$NVMF_SERIAL"
 
 if [ $fio_status -eq 0 ]; then
diff --git a/test/nvmf/target/multiconnection.sh b/test/nvmf/target/multiconnection.sh
index 7554ad8a9..5333a4aa4 100755
--- a/test/nvmf/target/multiconnection.sh
+++ b/test/nvmf/target/multiconnection.sh
@@ -35,7 +35,7 @@ $rootdir/scripts/fio-wrapper -p nvmf -i 262144 -d 64 -t randwrite -r 10
 
 sync
 for i in $(seq 1 $NVMF_SUBSYS); do
-	nvme disconnect -n "nqn.2016-06.io.spdk:cnode${i}" || true
+	nvme disconnect -n "nqn.2016-06.io.spdk:cnode${i}"
 	waitforserial_disconnect SPDK$i
 	$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode${i}
 done
diff --git a/test/nvmf/target/multipath.sh b/test/nvmf/target/multipath.sh
index 8c46effbc..b9f5edc20 100755
--- a/test/nvmf/target/multipath.sh
+++ b/test/nvmf/target/multipath.sh
@@ -118,7 +118,7 @@ check_ana_state "$subsys_id" "$ctrl2_id" "inaccessible"
 
 wait $fio_pid
 
-nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" || true
+nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
 waitforserial_disconnect "$NVMF_SERIAL"
 
 $rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1