diff --git a/tools/test/stress2/misc/crossmp3.sh b/tools/test/stress2/misc/crossmp3.sh
index 0f7c01af5569..5eecb936e900 100755
--- a/tools/test/stress2/misc/crossmp3.sh
+++ b/tools/test/stress2/misc/crossmp3.sh
@@ -1,107 +1,111 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2014 EMC Corp.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 
 # Parallel mount and umount of file systems
 # "panic: Bad link elm 0xfffff8052a20cc00 prev->next != elm" seen:
 # http://people.freebsd.org/~pho/stress/log/crossmp3.txt
 # Fixed in r269853
 
 # panic: softdep_waitidle: work added after flush:
 # http://people.freebsd.org/~pho/stress/log/crossmp3-2.txt, fixed by r273967.
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 CONT=/tmp/crossmp3.continue
 if [ $# -eq 0 ]; then
 	N=`sysctl -n hw.ncpu`
 	usermem=`sysctl -n hw.usermem`
 	[ `sysctl -n vm.swap_total` -eq 0 ] && usermem=$((usermem / 2))
 	size=$((usermem / 1024 / 1024 / N))
 	echo "Using $N memory disks of size $size MB."
 
 	mounts=$N		# Number of parallel scripts
 
 	for i in `jot $mounts`; do
 		m=$(( i + mdstart - 1 ))
 		[ ! -d ${mntpoint}$m ] &&
 		    { mkdir ${mntpoint}$m; chmod 755 ${mntpoint}$m; }
 		mount | grep "${mntpoint}$m " | grep -q md$m &&
 		    umount ${mntpoint}$m
 		mdconfig -l | grep -q md$m && mdconfig -d -u $m
 
 		mdconfig -a -t swap -s ${size}m -u $m
 		newfs $newfs_flags md${m} > /dev/null 2>&1
 	done
 
 	# start the parallel tests
 	touch $CONT
 	for i in `jot $mounts`; do
 		m=$(( i + mdstart - 1 ))
 		./$0 $m &
 		./$0 find &
 	done
 	wait
 
 	for i in `jot $mounts`; do
 		m=$(( i + mdstart - 1 ))
 		while mount | grep -q "on ${mntpoint}$m "; do
 		    umount ${mntpoint}$m && break
 		    sleep 1
 		done
 		mdconfig -d -u $m
 	done
 	exit 0
 else
 	if [ $1 = find ]; then
 		while [ -f $CONT ]; do
 			find ${mntpoint}* -type f > /dev/null 2>&1
 		done
 	else
 		export runRUNTIME=20s
 		# The test: Parallel mount and unmounts
+		start=`date +%s`
 		for i in `jot 3`; do
 			m=$1
 			mount /dev/md${m} ${mntpoint}$m &&
 			   chmod 777 ${mntpoint}$m
 			export RUNDIR=${mntpoint}$m/stressX
 			export CTRLDIR=${mntpoint}$m/stressX.control
 			(cd ${mntpoint}$m && find . -delete)
 			su $testuser -c 'cd ..; ./run.sh disk.cfg' > \
 			    /dev/null 2>&1
 
 			while mount | grep -q "on ${mntpoint}$m "; do
 				opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f")
 				umount $opt ${mntpoint}$m > /dev/null 2>&1
 				[ -f $CONT ] || break 2
 			done
+			[ $((`date +%s` - start)) -gt 600 ] && 
+			    { echo "Timed out"; s=1; }
 		done
 		rm -f $CONT
 	fi
+	exit $s
 fi