diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 62dddaae..40a26e2a 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -1,123 +1,124 @@
 # Makefile.am for the tests of the Python bindings.
 # Copyright (C) 2016 g10 Code GmbH
 #
 # This file is part of GPGME.
 #
 # GPGME is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # GPGME is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
 # Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <https://www.gnu.org/licenses/>.
 
 GPG = gpg
 GPG_AGENT = gpg-agent
 
 test_srcdir = $(top_srcdir)/tests/gpg
 
 GNUPGHOME=$(abs_builddir)
 TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) \
 	LC_ALL=C GPG_AGENT_INFO= \
 	top_srcdir=$(top_srcdir) \
 	srcdir=$(srcdir) \
 	LD_LIBRARY_PATH="../../../src/.libs:$(LD_LIBRARY_PATH)"
 
 py_tests ?= t-wrapper.py \
 	t-callbacks.py \
 	t-data.py \
 	t-encrypt.py \
 	t-encrypt-sym.py \
 	t-encrypt-sign.py \
 	t-sign.py \
 	t-signers.py \
 	t-decrypt.py \
 	t-verify.py \
 	t-decrypt-verify.py \
 	t-sig-notation.py \
 	t-export.py \
 	t-import.py \
 	t-edit.py \
 	t-keylist.py \
 	t-keylist-from-data.py \
 	t-wait.py \
 	t-encrypt-large.py \
 	t-file-name.py \
 	t-idiomatic.py \
 	t-protocol-assuan.py \
 	t-quick-key-creation.py \
 	t-quick-subkey-creation.py \
 	t-quick-key-manipulation.py \
 	t-quick-key-signing.py
 
 XTESTS = initial.py $(py_tests) final.py
 EXTRA_DIST = support.py $(XTESTS) encrypt-only.asc sign-only.asc \
              run-tests.py
 
 # XXX: Currently, one cannot override automake's 'check' target.  As a
 # workaround, we avoid defining 'TESTS', thus automake will not emit
 # the 'check' target.  For extra robustness, we merely define a
 # dependency on 'xcheck', so this hack should also work even if
 # automake would emit the 'check' target, as adding dependencies to
 # targets is okay.
 check: xcheck
 
 .PHONY: xcheck
 
 xcheck:	all
 	$(TESTS_ENVIRONMENT) $(PYTHON) $(srcdir)/run-tests.py \
 	  --interpreters="$(PYTHONS)" --srcdir=$(srcdir) $(TESTFLAGS) \
 	  $(XTESTS)
 
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg-agent.conf pubring.kbx~ gpg.conf pubring.gpg~ \
 	random_seed .gpg-v21-migrated tofu.db \
         pubring-stamp gpg-sample.stamp
 
 private_keys = \
         $(test_srcdir)/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD \
         $(test_srcdir)/76F7E2B35832976B50A27A282D9B87E44577EB66 \
         $(test_srcdir)/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD \
         $(test_srcdir)/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F \
         $(test_srcdir)/7A030357C0F253A5BBCD282FFC4E521B37558F5C
 
 clean-local:
 	-$(TESTS_ENVIRONMENT) $(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR -- private-keys-v1.d openpgp-revocs.d S.gpg-agent sshcontrol
 
 
 BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
            gpg-sample.stamp
 
 gpg-sample.stamp: $(private_keys)
 	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
           cp $$k private-keys-v1.d/$${k#$(test_srcdir)/}.key; \
         done
 	echo x > ./gpg-sample.stamp
 
 pubring-stamp: $(test_srcdir)/pubdemo.asc gpg-sample.stamp
 	$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
                --import $(test_srcdir)/pubdemo.asc
 	-$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
 		--import $(test_srcdir)/secdemo.asc
+	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	echo x > ./pubring-stamp
 
 gpg.conf:
 # This is required for t-sig-notations.
 	echo no-force-v3-sigs > ./gpg.conf
 	echo default-key A0FF4590BB6122EDEF6E3C542D727CC768697734 >> ./gpg.conf
 
 gpg-agent.conf:
 # This is required for gpg2, which does not support command fd.
 	echo pinentry-program $(abs_top_srcdir)/tests/gpg/pinentry >$@
 	echo disable-scdaemon >> $@
 
 
 # end-of-file
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index 601d5062..d9713d90 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -1,145 +1,146 @@
 # Makefile.am - Makefile for GPGME Qt tests.
 # Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik
 # Software engineering by Intevation GmbH
 #
 # This file is part of GPGME.
 #
 # GPGME is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of the
 # License, or (at your option) any later version.
 #
 # GPGME is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
 # Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <https://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
 GPG = gpg
 
 GNUPGHOME=$(abs_builddir)
 TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME)
 
 EXTRA_DIST = initial.test final.test
 
 the_tests = \
 	t-addexistingsubkey \
 	t-decryptverify \
 	t-keylist t-keylocate t-ownertrust t-tofuinfo \
 	t-encrypt t-verify t-various t-config t-remarks t-trustsignatures \
 	t-changeexpiryjob t-wkdlookup t-import t-revokekey t-setprimaryuserid
 
 TESTS = initial.test $(the_tests) final.test
 
 moc_files = \
 	t-addexistingsubkey.moc \
 	t-decryptverify.moc \
 	t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \
 	t-encrypt.moc t-support.hmoc t-wkspublish.moc t-verify.moc \
 	t-various.moc t-config.moc t-remarks.moc t-trustsignatures.moc \
 	t-changeexpiryjob.moc t-wkdlookup.moc t-import.moc t-revokekey.moc \
 	t-setprimaryuserid.moc
 
 AM_LDFLAGS = -no-install
 
 if WANT_QT5
 LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
         ../../../src/libgpgme.la @GPGME_QT5_LIBS@ @GPG_ERROR_LIBS@ \
         @GPGME_QT5TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++
 
 AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
               @GPG_ERROR_CFLAGS@ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ \
               @LIBASSUAN_CFLAGS@ @GPGME_QT5TEST_CFLAGS@ -DBUILDING_QGPGME \
               -I$(top_srcdir)/lang/qt/src \
               -DTOP_SRCDIR="$(top_srcdir)"
 endif
 if WANT_QT6
 LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgmeqt6.la \
         ../../../src/libgpgme.la @GPGME_QT6_LIBS@ @GPG_ERROR_LIBS@ \
         @GPGME_QT6TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++
 
 AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
               @GPG_ERROR_CFLAGS@ @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ \
               @LIBASSUAN_CFLAGS@ @GPGME_QT6TEST_CFLAGS@ -DBUILDING_QGPGME \
               -I$(top_srcdir)/lang/qt/src \
               -DTOP_SRCDIR="$(top_srcdir)"
 endif
 
 support_src = t-support.h t-support.cpp
 
 t_addexistingsubkey_SOURCES = t-addexistingsubkey.cpp $(support_src)
 t_decryptverify_SOURCES = t-decryptverify.cpp $(support_src)
 t_keylist_SOURCES = t-keylist.cpp $(support_src)
 t_keylocate_SOURCES = t-keylocate.cpp $(support_src)
 t_ownertrust_SOURCES = t-ownertrust.cpp $(support_src)
 t_tofuinfo_SOURCES = t-tofuinfo.cpp $(support_src)
 t_encrypt_SOURCES = t-encrypt.cpp $(support_src)
 t_wkspublish_SOURCES = t-wkspublish.cpp $(support_src)
 t_verify_SOURCES = t-verify.cpp $(support_src)
 t_various_SOURCES = t-various.cpp $(support_src)
 t_config_SOURCES = t-config.cpp $(support_src)
 t_remarks_SOURCES = t-remarks.cpp $(support_src)
 t_trustsignatures_SOURCES = t-trustsignatures.cpp $(support_src)
 t_changeexpiryjob_SOURCES = t-changeexpiryjob.cpp $(support_src)
 t_wkdlookup_SOURCES = t-wkdlookup.cpp $(support_src)
 t_import_SOURCES = t-import.cpp $(support_src)
 t_revokekey_SOURCES = t-revokekey.cpp $(support_src)
 t_setprimaryuserid_SOURCES = t-setprimaryuserid.cpp $(support_src)
 run_decryptverifyarchivejob_SOURCES = run-decryptverifyarchivejob.cpp
 run_encryptarchivejob_SOURCES = run-encryptarchivejob.cpp
 run_exportjob_SOURCES = run-exportjob.cpp
 run_importjob_SOURCES = run-importjob.cpp
 run_keyformailboxjob_SOURCES = run-keyformailboxjob.cpp
 run_receivekeysjob_SOURCES = run-receivekeysjob.cpp
 run_refreshkeysjob_SOURCES = run-refreshkeysjob.cpp
 run_signarchivejob_SOURCES = run-signarchivejob.cpp
 
 nodist_t_keylist_SOURCES = $(moc_files)
 
 BUILT_SOURCES = $(moc_files) pubring-stamp
 
 noinst_PROGRAMS = \
 	t-addexistingsubkey \
 	t-decryptverify \
 	t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \
 	run-keyformailboxjob t-wkspublish t-verify t-various t-config t-remarks \
 	t-trustsignatures t-changeexpiryjob t-wkdlookup t-import t-revokekey \
 	t-setprimaryuserid \
 	run-decryptverifyarchivejob \
 	run-encryptarchivejob \
 	run-importjob run-exportjob run-receivekeysjob run-refreshkeysjob \
 	run-signarchivejob
 
 
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
 	random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp $(moc_files) \
 	gpg.conf tofu.db reader_0.status reader_1.status
 
 clean-local:
 	-$(TESTS_ENVIRONMENT) $(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR  private-keys-v1.d crls.d
 
 pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \
 	             $(top_srcdir)/tests/gpg/secdemo.asc
 	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	echo "ignore-invalid-option allow-loopback-pinentry" > $(abs_builddir)/gpg-agent.conf
 	echo "allow-loopback-pinentry" >> gpg-agent.conf
 	echo "ignore-invalid-option pinentry-mode" > gpg.conf
 	echo "pinentry-mode loopback" >> gpg.conf
 	$(TESTS_ENVIRONMENT) $(GPG) --no-permission-warning \
            --import $(top_srcdir)/tests/gpg/pubdemo.asc
 	$(TESTS_ENVIRONMENT) $(GPG) --no-permission-warning \
 		   --passphrase "abc" \
            --import $(top_srcdir)/tests/gpg/secdemo.asc
+	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	touch pubring-stamp
 
 .cpp.moc:
 	$(MOC) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
 
 .h.hmoc:
 	$(MOC) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index c4a4ce42..6a82ca68 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -1,126 +1,127 @@
 # Copyright (C) 2000 Werner Koch (dd9jn)
 # Copyright (C) 2001, 2004, 2005, 2009 g10 Code GmbH
 #
 # This file is part of GPGME.
 #
 # GPGME is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of the
 # License, or (at your option) any later version.
 #
 # GPGME is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
 # Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <https://gnu.org/licenses/>.
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 ## Process this file with automake to produce Makefile.in
 
 GPG = gpg
 GPG_AGENT = gpg-agent
 
 GNUPGHOME=$(abs_builddir)
 TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) LC_ALL=C GPG_AGENT_INFO= \
                     top_srcdir=$(top_srcdir)
 
 # The keylist tests must come after the import and the edit test.
 noinst_HEADERS = t-support.h
 
 if HAVE_W32_SYSTEM
 tests_unix =
 else
 tests_unix = t-eventloop t-thread1 t-thread-keylist t-thread-keylist-verify
 endif
 
 c_tests = \
         t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers		\
 	t-decrypt t-verify t-decrypt-verify t-sig-notation t-export	\
 	t-import t-edit t-keylist t-keylist-sig t-keylist-secret-sig t-wait \
 	t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed t-edit-sign \
 	$(tests_unix)
 
 TESTS = initial.test $(c_tests) final.test
 
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
 	random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp \
 	gpg-sample.stamp tofu.db *.conf.gpgconf.bak
 
 private_keys = \
         13CD0F3BDF24BE53FE192D62F18737256FF6E4FD \
         76F7E2B35832976B50A27A282D9B87E44577EB66 \
         A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD \
         13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F \
         7A030357C0F253A5BBCD282FFC4E521B37558F5C
 
 
 EXTRA_DIST = initial.test final.test \
         pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
 	cipher-3.asc cipher-no-sig.asc \
 	geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys) \
 	gpg.conf.in
 
 BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
            gpg-sample.stamp
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 AM_LDFLAGS = -no-install
 LDADD = ../../src/libgpgme.la @LDADD_FOR_TESTS_KLUDGE@
 
 WITH_THREAD_CPPFLAGS =  -I$(top_builddir)/src @GPG_ERROR_MT_CFLAGS@
 WITH_THREAD_LDADD = ../../src/libgpgme.la \
 	@GPG_ERROR_MT_LIBS@ @LDADD_FOR_TESTS_KLUDGE@
 t_thread1_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
 t_thread1_LDADD = $(WITH_THREAD_LDADD)
 t_thread_keylist_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
 t_thread_keylist_LDADD = $(WITH_THREAD_LDADD)
 t_thread_keylist_verify_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
 t_thread_keylist_verify_LDADD = $(WITH_THREAD_LDADD)
 t_cancel_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
 t_cancel_LDADD = $(WITH_THREAD_LDADD)
 
 # We don't run t-genkey and t-cancel in the test suite, because it
 # takes too long
 tests_skipped = t-genkey
 if !HAVE_W32_SYSTEM
 tests_skipped += t-cancel
 endif
 
 noinst_PROGRAMS = $(c_tests) $(tests_skipped)
 
 
 clean-local:
 	-$(TESTS_ENVIRONMENT) $(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR private-keys-v1.d
 
 gpg-sample.stamp: $(srcdir)/$(private_keys)
 	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
 	  cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \
 	done
 	echo x > ./gpg-sample.stamp
 
 pubring-stamp: $(srcdir)/pubdemo.asc gpg-sample.stamp
 	$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
 		--import $(srcdir)/pubdemo.asc
 	-$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
 		--import $(srcdir)/secdemo.asc
 	-$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
 		--import-ownertrust $(srcdir)/ownertrust.txt
+	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	echo x > ./pubring-stamp
 
 gpg.conf: $(srcdir)/gpg.conf.in
 	cp $(srcdir)/gpg.conf.in gpg.conf
 
 gpg-agent.conf:
 # This is required for gpg2, which does not support command fd for the
 # passphrase.  disable-scdaemon is required so that we don't try using
 # a key from a smartcard reader (error might be: Unusable secret key)
 	echo pinentry-program $(abs_srcdir)/pinentry > ./gpg-agent.conf
 	echo disable-scdaemon >> ./gpg-agent.conf
 
 
 # end-of-file
diff --git a/tests/json/Makefile.am b/tests/json/Makefile.am
index 9b2cf71c..90fba79e 100644
--- a/tests/json/Makefile.am
+++ b/tests/json/Makefile.am
@@ -1,110 +1,111 @@
 # Copyright (C) 2018 Bundesamt für Sicherheit in der Informationstechnik
 #                    Software engineering by Intevation GmbH
 #
 # This file is part of GPGME.
 #
 # GPGME is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of the
 # License, or (at your option) any later version.
 #
 # GPGME is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
 # Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <https://gnu.org/licenses/>.
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 ## Process this file with automake to produce Makefile.in
 
 GPGME_JSON=$(abs_builddir)/../../src/gpgme-json
 GPG = gpg
 
 GNUPGHOME=$(abs_builddir)
 TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) LC_ALL=C GPG_AGENT_INFO= \
                     top_srcdir=$(top_srcdir) gpgme_json=$(GPGME_JSON)
 
 c_tests = t-json
 
 TESTS = initial.test $(c_tests) final.test
 
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
 	random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp \
 	gpg-sample.stamp tofu.db *.conf.gpgconf.bak
 
 private_keys = \
         $(top_srcdir)/tests/gpg/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD \
         $(top_srcdir)/tests/gpg/76F7E2B35832976B50A27A282D9B87E44577EB66 \
         $(top_srcdir)/tests/gpg/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD \
         $(top_srcdir)/tests/gpg/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F \
         $(top_srcdir)/tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C
 
 
 EXTRA_DIST = initial.test final.test \
 		t-chunking.in.json t-chunking.out.json \
 		t-config.in.json t-config-opt.in.json \
 		t-config-opt.out.json t-config.out.json \
 		t-createkey.in.json t-createkey.out.json \
 		t-decrypt.in.json t-decrypt.out.json \
 		t-decrypt-verify.in.json t-decrypt-verify.out.json \
 		t-delete.in.json t-delete.out.json \
 		t-encrypt.in.json t-encrypt.out.json \
 		t-encrypt-sign.in.json t-encrypt-sign.out.json \
 		t-export.in.json t-export.out.json \
 		t-export-secret-info.in.json t-export-secret-info.out.json \
 		t-import.in.json t-import.out.json \
 		t-keylist.in.json t-keylist.out.json \
 		t-keylist-secret.in.json t-keylist-secret.out.json \
 		t-sign.in.json t-sign.out.json \
 		t-sig-notations.in.json t-sig-notations.out.json \
 		t-verify.in.json t-verify.out.json \
 		t-version.in.json t-version.out.json
 
 BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
            gpg-sample.stamp
 t_json_SOURCES = t-json.c
 AM_LDFLAGS = -no-install
 LDADD = ../../src/libgpgme.la @LDADD_FOR_TESTS_KLUDGE@
 t_json_LDADD = ../../src/cJSON.o -lm ../../src/libgpgme.la @GPG_ERROR_LIBS@ \
 	       @LDADD_FOR_TESTS_KLUDGE@
 
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 
 noinst_PROGRAMS = $(c_tests)
 
 clean-local:
 	-$(TESTS_ENVIRONMENT) $(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR private-keys-v1.d
 	-rm -fR openpgp-revocs.d
 
 gpg-sample.stamp: $(private_keys)
 	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
           cp $$k private-keys-v1.d/$$(basename $$k).key; \
         done
 	echo x > ./gpg-sample.stamp
 
 pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc gpg-sample.stamp
 	$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
                --import $(top_srcdir)/tests/gpg/pubdemo.asc
 	-$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
 		--import $(top_srcdir)/tests/gpg/secdemo.asc
+	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	echo x > ./pubring-stamp
 
 gpg.conf:
 # This is required for t-sig-notations.
 	echo no-force-v3-sigs > ./gpg.conf
 
 gpg-agent.conf:
 # This is required for gpg2, which does not support command fd for the
 # passphrase.  disable-scdaemon is required so that we don't try using
 # a key from a smartcard reader (error might be: Unusable secret key)
 	echo pinentry-program $(abs_srcdir)/../gpg/pinentry > ./gpg-agent.conf
 	echo disable-scdaemon >> ./gpg-agent.conf
 
 
 # end-of-file