diff --git a/tests/ChangeLog b/tests/ChangeLog
index a25e82b6..3db4b94c 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-02  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgsm/t-keylist.c (main): Skip unknown keys.  Newer versions of
+	GPGSM import more keys than older ones.
+
 2005-12-06  Werner Koch  <wk@g10code.com>
 
 	* gpg/t-keylist.c (main): Changed for that secondary keys now have
diff --git a/tests/gpgsm/t-keylist.c b/tests/gpgsm/t-keylist.c
index 79a61eaf..0f1cf333 100644
--- a/tests/gpgsm/t-keylist.c
+++ b/tests/gpgsm/t-keylist.c
@@ -106,6 +106,15 @@ main (int argc, char **argv)
 	  exit (1);
 	}
 
+      if (strcmp (key->subkeys->fpr, keys[i].fpr))
+	{
+	  fprintf (stderr, "Warning: Skipping unknown key %s\n",
+		   key->subkeys->fpr);
+	  continue;
+	}
+      else
+	printf ("Checking key %s\n", key->subkeys->fpr);
+
       /* Global key flags.  */
       if (key->revoked)
 	{