3 files changed, 8 insertions, 9 deletions
diff --git a/tests/gpg/t-keylist-sig.c b/tests/gpg/t-keylist-sig.c
index e3e577bd..b89ba33d 100644
--- a/tests/gpg/t-keylist-sig.c
+++ b/tests/gpg/t-keylist-sig.c
@@ -310,10 +310,9 @@ main (int argc, char **argv)
 		   key->subkeys->next->keyid);
 	  exit (1);
 	}
-      if (key->subkeys->next->fpr)
+      if (!key->subkeys->next->fpr)
 	{
-	  fprintf (stderr, "Secondary key has unexpectedly a fingerprint: %s\n",
-		   key->subkeys->next->fpr);
+	  fprintf (stderr, "Secondary key has unexpectedly no fingerprint\n");
 	  exit (1);
 	}
       if (key->subkeys->next->expires)
@@ -467,7 +466,7 @@ main (int argc, char **argv)
         after importing the secret key.  We disable this test for
         now. */
 #ifdef __GNUC__
-#warning test disabled due to problems with gpg 1.3.4
+#warning test disabled due to problems with gpg 1.3.4 generated key
 #endif
       if (key->uids && (!key->uids->next->signatures /*|| key->uids->next->signatures->next*/))
 	{
diff --git a/tests/gpg/t-keylist.c b/tests/gpg/t-keylist.c
index b7354904..c8c71d0c 100644
--- a/tests/gpg/t-keylist.c
+++ b/tests/gpg/t-keylist.c
@@ -361,10 +361,9 @@ main (int argc, char **argv)
                    key->subkeys->next->keyid, keys[i].sec_keyid );
 	  exit (1);
 	}
-      if (key->subkeys->next->fpr)
+      if (!key->subkeys->next->fpr)
 	{
-	  fprintf (stderr, "Secondary key has unexpectedly a fingerprint: %s\n",
-		   key->subkeys->next->fpr);
+	  fprintf (stderr, "Secondary key has unexpectedly no fingerprint\n");
 	  exit (1);
 	}
       if (key->subkeys->next->expires)
diff --git a/tests/gpgsm/t-keylist.c b/tests/gpgsm/t-keylist.c
index e06082c2..cd01aff3 100644
--- a/tests/gpgsm/t-keylist.c
+++ b/tests/gpgsm/t-keylist.c
@@ -245,9 +245,10 @@ main (int argc, char **argv)
 	  fprintf (stderr, "Primary key unexpectedly unusable for certifications\n");
 	  exit (1);
 	}
-      if (key->subkeys->secret)
+      if (key->subkeys->secret != keys[i].secret)
 	{
-	  fprintf (stderr, "Primary key unexpectedly secret\n");
+	  fprintf (stderr, "Primary Key unexpectedly%s secret\n",
+		   key->secret ? "" : " not");
 	  exit (1);
 	}
       if (key->subkeys->pubkey_algo != GPGME_PK_RSA)