diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 3f6248f9e..d26d38303 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -192,7 +192,7 @@
 
 (define (tool which)
   (case which
-    ((gpg gpg-agent scdaemon gpgsm dirmngr)
+    ((gpg gpg-agent scdaemon gpgsm keyboxd dirmngr)
      (:gc:c:pgmname (assoc (symbol->string which) gpg-components)))
     (else
      (tool-hardcoded which))))
diff --git a/tests/openpgp/setup.scm b/tests/openpgp/setup.scm
index 22c89a389..b92dc0701 100755
--- a/tests/openpgp/setup.scm
+++ b/tests/openpgp/setup.scm
@@ -38,7 +38,7 @@
       (for-each
        (lambda (t)
 	 (log (pad t 25) (tool t)))
-       '(gpgconf gpg gpg-agent scdaemon gpgsm dirmngr gpg-connect-agent
+       '(gpgconf gpg gpg-agent scdaemon gpgsm keyboxd dirmngr gpg-connect-agent
 		 gpg-preset-passphrase gpgtar pinentry)))
 
 (setenv "GNUPGHOME" (getcwd) #t)