diff --git a/nixos/pkgs/zkapissuer/repo.nix b/nixos/pkgs/zkapissuer/repo.nix
index 52decb889ba564689c61537d5b48faed3e592c5c..6646a2e32eb8e5a747e4491ce43f706fee65724c 100644
--- a/nixos/pkgs/zkapissuer/repo.nix
+++ b/nixos/pkgs/zkapissuer/repo.nix
@@ -2,6 +2,6 @@
 fetchFromGitHub {
   owner = "PrivateStorageio";
   repo = "PaymentServer";
-  rev = "2ca189c51a5314eb476d1866d28ee483701af6f5";
-  sha256 = "1sb53lvi6alwdjhx4cv1gg7ywkqf18n1zjgdj3nigq3vjwxhdcpb";
+  rev = "ff30e85c231a3b5ad76426bbf8801f8f76884367";
+  sha256 = "1spz19f5z96shmfpazj0rv6877xvchf3gl49a4xahjbbsz39x34x";
 }
diff --git a/nixos/tests/run-client.py b/nixos/tests/run-client.py
index bcd01e1b04a9b41cb7aa75f29fd3247d995d2527..e6cde321bdeb8a2b2493c984cce116a0287b16d1 100755
--- a/nixos/tests/run-client.py
+++ b/nixos/tests/run-client.py
@@ -33,6 +33,10 @@ def main():
     config.add_section(u"storageclient.plugins.privatestorageio-zkapauthz-v1")
     config.set(u"storageclient.plugins.privatestorageio-zkapauthz-v1", u"redeemer", u"ristretto")
     config.set(u"storageclient.plugins.privatestorageio-zkapauthz-v1", u"ristretto-issuer-root-url", issuerURL)
+    # This has to agree with the PaymentServer configuration at the configured
+    # issuer location.  Presently PaymentServer has 50000 hard-coded as the
+    # correct value.
+    config.set(u"storageclient.plugins.privatestorageio-zkapauthz-v1", u"default-token-count", u"50000")
 
     with open("/tmp/client/tahoe.cfg", "wt") as cfg:
         config.write(cfg)