Index: b/tests/openpgp/default-key.test
===================================================================
--- b/tests/openpgp/default-key.test
+++ b/tests/openpgp/default-key.test
@@ -35,7 +35,7 @@
     info "Trying --default-key $x"
 
     if ! echo | $GPG --default-key "$x" -s | $GPG --verify --status-fd=1 \
-            | grep -q 'VALIDSIG 5FBA84ACE02DCB17DA3DFF6BBCA43C441EA97479'
+            | grep 'VALIDSIG 5FBA84ACE02DCB17DA3DFF6BBCA43C441EA97479' >/dev/null
     then
         echo | $GPG --default-key "$x" -s | $GPG --verify --status-fd=2
         error "Unexpected key used for signing (not the signing subkey, specified \"$x\")."
@@ -59,7 +59,7 @@
                      --default-key "$x" --encrypt-to-default-key \
                      -r 439F02CA -e \
             | $GPG --list-packets \
-            | grep -q "keyid[ ][A-F0-9]*45117079"
+            | grep "keyid[ ][A-F0-9]*45117079" >/dev/null
     then
         echo | $GPG --trust-model=always \
                     --default-key "$x" --encrypt-to-default-key \
Index: b/tests/openpgp/gpgtar.test
===================================================================
--- b/tests/openpgp/gpgtar.test
+++ b/tests/openpgp/gpgtar.test
@@ -59,7 +59,7 @@
           >"$FILELIST"
     for F in $TESTFILES
     do
-	grep -qe "\\b${F}\\b" "$FILELIST"
+        awk '{print $NF}' "$FILELIST" | grep "^${F}$" >/dev/null
     done
 
     $TOOL --gpg "$GPG"  --gpg-args "$GPGARGS" $EXTRACT_FLAGS \
@@ -67,7 +67,7 @@
           "${TESTDIR}/test.tar.pgp"
     for F in $TESTFILES
     do
-	diff -q "$F" "${TESTDIR}/$F"
+	cmp "$F" "${TESTDIR}/$F"
     done
   )
 }
Index: b/tests/openpgp/use-exact-key.test
===================================================================
--- b/tests/openpgp/use-exact-key.test
+++ b/tests/openpgp/use-exact-key.test
@@ -32,7 +32,7 @@
 for x in 8BC90111 3E880CFF F5F77B83 45117079 1EA97479
 do
     if ! echo | $GPG -s -u "$x" | $GPG --verify --status-fd=1 \
-            | grep -q 'VALIDSIG 5FBA84ACE02DCB17DA3DFF6BBCA43C441EA97479'
+            | grep 'VALIDSIG 5FBA84ACE02DCB17DA3DFF6BBCA43C441EA97479' >/dev/null
     then
         echo | $GPG -s -u "$x" | $GPG --verify --status-fd=2
         error "Unexpected key used for signing (not the signing subkey, specified \"$x\")."
@@ -44,7 +44,7 @@
 for x in 8BC90111 F5F77B83 1EA97479
 do
     if ! echo | $GPG -s -u "$x!" | $GPG --verify --status-fd=1 \
-            | grep -q "VALIDSIG [0-9A-F]*$x "
+            | grep "VALIDSIG [0-9A-F]*$x " >/dev/null
     then
         echo | $GPG -s -u "$x!" | $GPG --verify --status-fd=2
         error "Unexpected key used for signing (specified: \"$x!\")."