diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 4271ba04a..815a560c7 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -299,8 +299,8 @@
        (finally (unlink-recursively ,ephemeral-home-directory)
 	 (dynamic-wind
 	     (lambda ()
-	       (force ,setup)
-	       (setenv "GNUPGHOME" ,ephemeral-home-directory #t))
+	       (setenv "GNUPGHOME" ,ephemeral-home-directory #t)
+	       (with-working-directory ,ephemeral-home-directory (force ,setup)))
 	     (lambda () ,@expressions)
 	     (lambda () (setenv "GNUPGHOME" ,original-home-directory #t)))))))