diff --git a/src/libostree/ostree-gpg-verifier.c b/src/libostree/ostree-gpg-verifier.c
index a279348e..95ed36ee 100644
--- a/src/libostree/ostree-gpg-verifier.c
+++ b/src/libostree/ostree-gpg-verifier.c
@@ -87,6 +87,7 @@ verify_result_finalized_cb (gpointer data,
    *     finalize() method, but I didn't want this keyring hack
    *     bleeding into multiple classes. */
 
+  ot_gpgme_kill_agent (tmp_dir);
   (void) glnx_shutil_rm_rf_at (AT_FDCWD, tmp_dir, NULL, NULL);
 }
 
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index da128c6a..c6860408 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -2300,11 +2300,15 @@ out:
   if (remote != NULL)
     ostree_remote_unref (remote);
 
-  if (source_tmp_dir != NULL)
+  if (source_tmp_dir != NULL) {
+    ot_gpgme_kill_agent (source_tmp_dir);
     (void) glnx_shutil_rm_rf_at (AT_FDCWD, source_tmp_dir, NULL, NULL);
+  }
 
-  if (target_tmp_dir != NULL)
+  if (target_tmp_dir != NULL) {
+    ot_gpgme_kill_agent (target_tmp_dir);
     (void) glnx_shutil_rm_rf_at (AT_FDCWD, target_tmp_dir, NULL, NULL);
+  }
 
   g_prefix_error (error, "GPG: ");