diff --git a/nixos/modules/tests/private-storage.nix b/nixos/modules/tests/private-storage.nix
index c37c9d5579167b2a71ae88514f22797145c2bf73..5c44c755bc9cdf612de9bcc5fcd23d03293c83cf 100644
--- a/nixos/modules/tests/private-storage.nix
+++ b/nixos/modules/tests/private-storage.nix
@@ -122,9 +122,16 @@ import <nixpkgs/nixos/tests/make-test.nix> {
       $client->waitForOpenPort(3456);
 
       # Get some ZKAPs from the issuer.
-      $client->succeed('${get-passes} http://127.0.0.1:3456 http://issuer');
+      eval {
+        $client->succeed('set -eo pipefail; ${get-passes} http://127.0.0.1:3456 http://issuer:8081 | systemd-cat');
+      } or do {
+        my $error = $@ || 'Unknown failure';
+        my ($code, $log) = $client->execute('cat /tmp/stdout /tmp/stderr');
+        $client->log($log);
+        die $@;
+      };
 
       # The client should be prepped now.  Make it try to use some storage.
-      $client->succeed('${exercise-storage}');
+      $client->succeed('set -eo pipefail; ${exercise-storage} | systemd-cat');
     '';
 }