diff --git a/tests/18imsm-1d-takeover-r0_1d b/tests/18imsm-1d-takeover-r0_1d
index bf462e2..6f5cf5a 100644
--- a/tests/18imsm-1d-takeover-r0_1d
+++ b/tests/18imsm-1d-takeover-r0_1d
@@ -8,12 +8,11 @@ vol0_comp_size=$((10 * 1024))
 
 # Create container
 mdadm --create --run $container --auto=md --metadata=imsm --force --raid-disks=$vol0_num_comps $dev0
-wait
+check wait
 imsm_check container $vol0_num_comps
 
 # Create RAID 0 volume
 mdadm --create --run $member0 --auto=md --level=0 --size=$vol0_comp_size --chunk=64 --force --raid-disks=$vol0_num_comps $dev0
-wait
 check wait
 
 # Test the member
diff --git a/tests/18imsm-1d-takeover-r1_2d b/tests/18imsm-1d-takeover-r1_2d
index fa02b6c..72e4173 100644
--- a/tests/18imsm-1d-takeover-r1_2d
+++ b/tests/18imsm-1d-takeover-r1_2d
@@ -8,12 +8,11 @@ vol0_comp_size=$((10 * 1024))
 
 # Create container
 mdadm --create --run $container --auto=md --metadata=imsm --force --raid-disks=$vol0_num_comps $dev0
-wait
+check wait
 imsm_check container $vol0_num_comps
 
 # Create RAID 1 volume
 mdadm --create --run $member0 --auto=md --level=1 --size=$vol0_comp_size --chunk=64 --raid-disks=$((vol0_num_comps + 1)) $dev0 missing
-wait
 check wait
 
 # Test the member0
diff --git a/tests/imsm-grow-template b/tests/imsm-grow-template
index 24218c7..71a0bbb 100644
--- a/tests/imsm-grow-template
+++ b/tests/imsm-grow-template
@@ -33,17 +33,17 @@ function grow_member() {
 
 # Create container
 mdadm --create --run $container --auto=md --metadata=imsm --raid-disks=$num_disks $device_list
-wait
+check wait
 imsm_check container $num_disks
 
 # Create first volume inside the container
 mdadm --create --run $member0 --auto=md --level=$vol0_level --size=$vol0_comp_size --chunk=$vol0_chunk --raid-disks=$num_disks $device_list
-wait
+check wait
 
 # Create second volume inside the container (if defined)
 if [ ! -z $vol1_chunk ]; then
     mdadm --create --run $member1 --auto=md --level=$vol1_level --size=$vol1_comp_size --chunk=$vol1_chunk --raid-disks=$num_disks $device_list
-    wait
+    check wait
 fi
 
 # Wait for any RESYNC to complete
@@ -63,7 +63,7 @@ fi
 for i in $spare_list
 do
     mdadm --add $container $i
-    wait
+    check wait
     num_disks=$((num_disks + 1))
 done