Index: zsh-5.9/Test/D07multibyte.ztst =================================================================== --- zsh-5.9.orig/Test/D07multibyte.ztst +++ zsh-5.9/Test/D07multibyte.ztst @@ -6,7 +6,7 @@ unset -m LC_\* mb_ok= langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8 - $(locale -a 2>/dev/null | egrep 'utf8|UTF-8')) + ${(M)$(locale -a 2>/dev/null):#*.(utf8|UTF-8)} ) for LANG in $langs; do if [[ é = ? ]]; then mb_ok=1 Index: zsh-5.9/Test/E01options.ztst =================================================================== --- zsh-5.9.orig/Test/E01options.ztst +++ zsh-5.9/Test/E01options.ztst @@ -651,7 +651,7 @@ >noktarg1 >0 1 - showopt() { setopt | egrep 'localoptions|ksharrays'; } + showopt() { setopt | grep -E 'localoptions|ksharrays'; } f1() { setopt localoptions ksharrays; showopt } f2() { setopt ksharrays; showopt } setopt kshoptionprint