diff --git a/test/zdtm.sh b/test/zdtm.sh
index c11c2ccf3..9c65c141c 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -426,10 +426,14 @@ EOF
 	done
 
 	echo Check results $PID
-	stop_test $tdir $tname
+	stop_test $tdir $tname || {
+		echo "Unable to stop $tname ($PID)"
+		return 2
+	}
+
 	sltime=1
 	for i in `seq 50`; do
-		test -f $test.out && break
+		kill -0 $PID > /dev/null 2>&1 || break;
 		echo Waiting...
 		sleep 0.$sltime
 		[ $sltime -lt 9 ] && sltime=$((sltime+1))