diff --git a/gnupg-2.0.14-tests-s2kcount.patch b/gnupg-2.0.14-tests-s2kcount.patch
new file mode 100644
index 0000000..178e5e8
--- /dev/null
+++ b/gnupg-2.0.14-tests-s2kcount.patch
@@ -0,0 +1,64 @@
+We have to use fixed s2k-count number otherwise the gpg2 would
+want to consult gpg-agent which is not yet installed in the mock
+chroot.
+diff -up gnupg-2.0.14/tests/openpgp/conventional-mdc.test.s2k gnupg-2.0.14/tests/openpgp/conventional-mdc.test
+--- gnupg-2.0.14/tests/openpgp/conventional-mdc.test.s2k	2009-09-21 18:53:46.000000000 +0200
++++ gnupg-2.0.14/tests/openpgp/conventional-mdc.test	2010-01-11 10:42:36.000000000 +0100
+@@ -21,9 +21,9 @@ for ciph in `all_cipher_algos`; do
+         dd if=data-80000 of=z bs=1 count=$i 2>/dev/null
+     fi
+     echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
+-	--force-mdc --cipher $ciph -c -o x --yes z
++	--force-mdc --cipher $ciph -c -o x --yes --s2k-count 65536 z
+     echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
+-	-o y --yes x
++	-o y --yes --s2k-count 96 x
+     cmp z y || error "$ciph/$i: mismatch"
+   done
+ done
+diff -up gnupg-2.0.14/tests/openpgp/conventional.test.s2k gnupg-2.0.14/tests/openpgp/conventional.test
+--- gnupg-2.0.14/tests/openpgp/conventional.test.s2k	2009-09-21 18:53:46.000000000 +0200
++++ gnupg-2.0.14/tests/openpgp/conventional.test	2010-01-11 10:43:00.000000000 +0100
+@@ -12,8 +12,8 @@
+ 
+ #info Checking conventional encryption
+ for i in plain-2 data-32000 ; do
+-    echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -c -o x --yes $i
+-    echo "Hier spricht HAL" | $GPG --passphrase-fd 0    -o y --yes x
++    echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -c -o x --yes --s2k-count 65536 $i
++    echo "Hier spricht HAL" | $GPG --passphrase-fd 0    -o y --yes --s2k-count 65536 x
+     cmp $i y || error "$i: mismatch"
+ done
+ 
+@@ -21,8 +21,8 @@ for a in `all_cipher_algos`; do
+     echo_n "$a "
+     for i in plain-1 data-80000 ; do
+       echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
+-					  --cipher-algo $a -c -o x --yes $i
+-      echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes x
++					  --cipher-algo $a -c -o x --yes --s2k-count 65536 $i
++      echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes --s2k-count 65536 x
+       cmp $i y || error "$i: ($a) mismatch"
+     done
+ done
+diff -up gnupg-2.0.14/tests/openpgp/genkey1024.test.s2k gnupg-2.0.14/tests/openpgp/genkey1024.test
+--- gnupg-2.0.14/tests/openpgp/genkey1024.test.s2k	2009-09-21 18:53:46.000000000 +0200
++++ gnupg-2.0.14/tests/openpgp/genkey1024.test	2010-01-11 10:43:14.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ . $srcdir/defs.inc || exit 3
+ 
+-../../g10/gpg2 --quiet --batch --debug-quick-random --homedir . --gen-key <<EOF
++../../g10/gpg2 --quiet --batch --debug-quick-random --homedir . --s2k-count 65536 --gen-key <<EOF
+ Key-Type: DSA
+ Key-Length: 1024
+ Subkey-Type: ELG
+@@ -24,7 +24,7 @@ Passphrase: abc
+ EOF
+ 
+ if have_pubkey_algo "RSA"; then
+-../../g10/gpg2 --quiet --batch --debug-quick-random --homedir . --gen-key <<EOF
++../../g10/gpg2 --quiet --batch --debug-quick-random --homedir . --s2k-count 65536 --gen-key <<EOF
+ Key-Type: RSA
+ Key-Length: 1024
+ Key-Usage: sign,encrypt
diff --git a/gnupg2.spec b/gnupg2.spec
index 38dc704..9a49596 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -11,6 +11,7 @@ Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.
 # svn export svn://cvs.gnupg.org/gnupg/trunk gnupg2; tar cjf gnupg-<date>svn.tar.bz2 gnupg2
 #Source0: gnupg2-20090809svn.tar.bz2
 Patch1:  gnupg-2.0.13-insttools.patch
+Patch2:  gnupg-2.0.14-tests-s2kcount.patch
 
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +73,7 @@ to the base GnuPG package
 %setup -q -n gnupg-%{version}
 
 %patch1 -p1 -b .insttools
+%patch2 -p1 -b .s2k
 
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
 # Note: this is just the name of the default shared lib to load in scdaemon,
@@ -185,8 +187,9 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Jan  8 2010 Tomas Mraz <tmraz@redhat.com> - 2.0.14-1
+* Mon Jan 11 2010 Tomas Mraz <tmraz@redhat.com> - 2.0.14-1
 - new upstream version
+- fix a few tests so they do not need to execute gpg-agent
 
 * Tue Dec  8 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.0.13-4
 - Explicitly BR libassuan-static in accordance with the Packaging