5 files changed, 11 insertions, 1 deletions
diff --git a/tests/bugs/bug-1043886.t b/tests/bugs/bug-1043886.t
index 9a125c2de2c..710fcd2064d 100755
--- a/tests/bugs/bug-1043886.t
+++ b/tests/bugs/bug-1043886.t
@@ -46,6 +46,9 @@ TEST [ "$(stat -c %u:%g $N0/other/file)" = "$uid:$gid" ];
 TEST mkdir $M0/other/dir 2>/dev/null;
 TEST [ "$(stat -c %u:%g $N0/other/dir)" = "$uid:$gid" ];
 
+## Before killing daemon to avoid deadlocks
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
+
 TEST $CLI volume stop $V0;
 TEST $CLI volume delete $V0;
 
diff --git a/tests/bugs/bug-1070734.t b/tests/bugs/bug-1070734.t
index fd7bbe01cf6..3928983c345 100755
--- a/tests/bugs/bug-1070734.t
+++ b/tests/bugs/bug-1070734.t
@@ -68,4 +68,7 @@ TEST [ -f ${OTHERBRICK}/DIR/file ]
 EXPECT "0x00000001000000000000000000000000" dht_get_layout $HASHED/DIR ;
 EXPECT "0x000000010000000000000000ffffffff" dht_get_layout $OTHERBRICK/DIR;
 
+## Before killing daemon to avoid deadlocks
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
+
 cleanup
diff --git a/tests/bugs/bug-867253.t b/tests/bugs/bug-867253.t
index 6b0332959e9..47c194b4b52 100644
--- a/tests/bugs/bug-867253.t
+++ b/tests/bugs/bug-867253.t
@@ -30,7 +30,7 @@ TEST $CLI volume start $V0
 
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
 ## Mount nfs, with nocache option
-TEST mount -o vers=3,nolock,noac -t nfs $H0:/$V0 $M0;
+TEST mount_nfs $H0:/$V0 $M0 nolock,noac;
 
 touch $M0/files{1..1000};
 
diff --git a/tests/bugs/bug-887145.t b/tests/bugs/bug-887145.t
index ee19036e0c1..554e6ce95d6 100755
--- a/tests/bugs/bug-887145.t
+++ b/tests/bugs/bug-887145.t
@@ -80,6 +80,8 @@ TEST [ $? -ne 0 ]
 userdel tmp_user;
 rm -rf /home/tmp_user;
 
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
+
 TEST $CLI volume stop $V0;
 TEST $CLI volume delete $V0;
 
diff --git a/tests/bugs/bug-927616.t b/tests/bugs/bug-927616.t
index 58f961dc80a..4525ddbb747 100755
--- a/tests/bugs/bug-927616.t
+++ b/tests/bugs/bug-927616.t
@@ -54,6 +54,8 @@ TEST [ $? -eq 0 ]
 mkdir $N0/old 2>/dev/null;
 TEST [ $? -eq 0 ]
 
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
+
 TEST $CLI volume stop $V0;
 TEST $CLI volume delete $V0;