--- a/tests/test-gpg.t	Fri Aug 26 00:16:51 2016 +0000
+++ b/tests/test-gpg.t	Mon Aug 29 22:59:39 2016 +0900
@@ -12,11 +12,16 @@
   $ GNUPGHOME="$TESTTMP/gpg"; export GNUPGHOME
   $ cp -R "$TESTDIR/gpg" "$GNUPGHOME"
 
-Start gpg-agent, which is required by GnuPG v2, and migrate secret keys
+Start gpg-agent, which is required by GnuPG v2
+
+#if gpg21
+  $ gpg-connect-agent -q --subst /serverpid '/echo ${get serverpid}' /bye \
+  > >> $DAEMON_PIDS
+#endif
+
+and migrate secret keys
 
 #if gpg2
-  $ gpg-connect-agent -q --subst /serverpid '/echo ${get serverpid}' /bye \
-  > >> $DAEMON_PIDS
   $ gpg --no-permission-warning --no-secmem-warning --list-secret-keys \
   > > /dev/null 2>&1
 #endif