diff -ru x509g3/tests/CA/3-cre_certs.sh post-x509g3/tests/CA/3-cre_certs.sh
--- x509g3/tests/CA/3-cre_certs.sh	2004-02-21 22:09:36.000000000 +0200
+++ post-x509g3/tests/CA/3-cre_certs.sh	2005-03-02 21:56:13.000000000 +0200
@@ -41,7 +41,7 @@
 test "x$TEST_SSH_SSHKEYGEN" = "x" && { echo "Please define TEST_SSH_SSHKEYGEN"; exit 1; }
 test -z "$1" && usage
 
-while ! test -z "$1"; do
+while test -n "$1"; do
   case $1 in
     -f|\
     -file)
@@ -49,7 +49,7 @@
       if test -z "$1"; then
         usage
       fi
-      if ! test -z "${SSH_BASE_KEY}"; then
+      if test -n "${SSH_BASE_KEY}"; then
         usage
       fi
       SSH_BASE_KEY="$1"
@@ -62,7 +62,7 @@
       if test -z "$1"; then
         usage
       fi
-      if ! test -z "$SSH_CERT_TYPE"; then
+      if test -n "$SSH_CERT_TYPE"; then
         usage
       fi
       SSH_CERT_TYPE="$1"
@@ -87,7 +87,7 @@
       if test -z "$1"; then
         usage
       fi
-      if ! test -z "${SSH_BASE_DN_CN}"; then
+      if test -n "${SSH_BASE_DN_CN}"; then
         usage
       fi
       SSH_BASE_DN_CN="$1"
diff -ru x509g3/tests/CA/functions post-x509g3/tests/CA/functions
--- x509g3/tests/CA/functions	2004-02-17 21:23:33.000000000 +0200
+++ post-x509g3/tests/CA/functions	2005-03-02 21:55:52.000000000 +0200
@@ -108,7 +108,7 @@
 
 # ===
 show_status () {
-  if ! test -z "$2"; then
+  if test -n "$2"; then
     printf '%s' "$2"
   fi
   if test $1 -eq 0; then
diff -ru x509g3/tests/CA/openssh_tests.sh post-x509g3/tests/CA/openssh_tests.sh
--- x509g3/tests/CA/openssh_tests.sh	2004-02-21 22:05:17.000000000 +0200
+++ post-x509g3/tests/CA/openssh_tests.sh	2005-03-02 21:52:33.000000000 +0200
@@ -257,15 +257,17 @@
     cat "${SSH_ERRLOG}"; printf '%s' "${norm}"
   else
     if test "x$must_fail" = "x1"; then
-      if ! fgrep 'Permission denied (publickey)' "${SSH_ERRLOG}" > /dev/null; then
+      if fgrep 'Permission denied (publickey)' "${SSH_ERRLOG}" > /dev/null; then
+        printf '%s' "${done}"
+      else
         retval=33
         printf '%s' "${warn}"
-      else
-        printf '%s' "${done}"
       fi
       cat "${SSH_ERRLOG}"; printf '%s' "${norm}"
     else
-      if ! fgrep "$msg" "${SSH_REPLY}" > /dev/null; then
+      if fgrep "$msg" "${SSH_REPLY}" > /dev/null; then
+        :
+      else
         retval=33
         printf '%s' "${warn}"
         cat "${SSH_REPLY}"; printf '%s' "${norm}"