diff --git a/src/cmd/ksh93/tests/_common b/src/cmd/ksh93/tests/_common
index a3dfbc72e..8c1cb7e3f 100644
--- a/src/cmd/ksh93/tests/_common
+++ b/src/cmd/ksh93/tests/_common
@@ -19,7 +19,12 @@ _message()
 {
 	print -r $'\t'"${Command}[$1]: ${@:2}" >&2
 }
-alias err_exit='_message "$((Errors++,LINENO))"'   # inaccurate err_exit name kept for historical integrity :)
+function err_exit
+{
+	_message "$@"
+	let Errors+=1
+}
+alias err_exit='err_exit $LINENO'  # inaccurate err_exit name kept for historical integrity :)
 alias warning='_message "$LINENO" "warning:"'
 
 Command=${0##*/}
diff --git a/src/cmd/ksh93/tests/builtins.sh b/src/cmd/ksh93/tests/builtins.sh
index ab931664d..297be3928 100755
--- a/src/cmd/ksh93/tests/builtins.sh
+++ b/src/cmd/ksh93/tests/builtins.sh
@@ -963,7 +963,7 @@ EOF
 # Builtins should handle unrecognized options correctly
 while IFS= read -r bltin <&3
 do	case $bltin in
-	echo | test | true | false | \[ | : | getconf | */getconf | uname | */uname | login | newgrp)
+	echo | test | true | false | \[ | : | getconf | */getconf | uname | */uname | Dt* | X* | login | newgrp )
 		continue ;;
 	/*/*)	expect="Usage: ${bltin##*/} "
 		actual=$({ PATH=${bltin%/*}; "${bltin##*/}" --this-option-does-not-exist; } 2>&1) ;;
diff --git a/src/cmd/ksh93/tests/pty.sh b/src/cmd/ksh93/tests/pty.sh
index 3877c865d..83b2bd0b0 100755
--- a/src/cmd/ksh93/tests/pty.sh
+++ b/src/cmd/ksh93/tests/pty.sh
@@ -391,7 +391,7 @@ r history
 fi
 
 # err_exit #
-((SHOPT_VSH)) && tst $LINENO <<"!"
+((SHOPT_VSH)) && whence -q vi && tst $LINENO <<"!"
 L POSIX sh 137(C)
 
 # If the User Portability Utilities Option is supported and shell