diff --git a/tests/openpgp/ChangeLog b/tests/openpgp/ChangeLog
index 118e03a79..078c28676 100644
--- a/tests/openpgp/ChangeLog
+++ b/tests/openpgp/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-19  Werner Koch  <wk@g10code.com>
+
+	* mkdemodirs (GPG): Use --no-options.
+
 2008-09-29  Werner Koch  <wk@g10code.com>
 
 	* clearsig.test: Replace -sat by --clearsign.
diff --git a/tests/openpgp/mkdemodirs b/tests/openpgp/mkdemodirs
index 217908078..7e6ec2c10 100755
--- a/tests/openpgp/mkdemodirs
+++ b/tests/openpgp/mkdemodirs
@@ -2,7 +2,11 @@
 
 set -e
 
-GPG="../g10/gpg2 --batch --quiet --no-secmem-warning --allow-secret-key-import"
+# We need to use --no-options so that a gpg.conf from an older version
+# of gpg is not used.
+GPG="../g10/gpg2 --no-options --batch --quiet
+     --no-secmem-warning --allow-secret-key-import"
+
 NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India
        Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo
        Sierra Tango Uniform Victor Whisky XRay Yankee Zulu'