diff --git a/tests/test-gpg.t b/tests/test-gpg.t
--- a/tests/test-gpg.t
+++ b/tests/test-gpg.t
@@ -7,8 +7,11 @@ Test the GPG extension
   > gpg=
   > 
   > [gpg]
-  > cmd=gpg --no-permission-warning --no-secmem-warning --no-auto-check-trustdb --homedir "$TESTDIR/gpg"
+  > cmd=gpg --no-permission-warning --no-secmem-warning --no-auto-check-trustdb
   > EOF
+  $ GNUPGHOME="$TESTTMP/gpg"; export GNUPGHOME
+  $ cp -R "$TESTDIR/gpg" "$GNUPGHOME"
+
   $ hg init r
   $ cd r
   $ echo foo > foo
@@ -36,12 +39,4 @@ Test the GPG extension
   e63c23eaa88a is signed by:
    hgtest
 
-verify that this test has not modified the trustdb.gpg file back in
-the main hg working dir
-  $ md5sum.py "$TESTDIR/gpg/trustdb.gpg"
-  f6b9c78c65fa9536e7512bb2ceb338ae  */gpg/trustdb.gpg (glob)
-
-don't leak any state to next test run
-  $ rm -f "$TESTDIR/gpg/random_seed"
-
   $ cd ..