diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index 7697b4fa7..f84c79389 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -944,6 +944,7 @@ then
     exit_fail "Reported table wrong: $TABLE"
 fi
 DIAG=`jq -r .row_minor_inconsistencies[0].diagnostic < test-wire-audit.json`
+DIAG=`echo "$DIAG" | awk '{print $1 " " $2 " " $3}'`
 if test "x$DIAG" != "xexecution date missmatch"
 then
     exit_fail "Reported diagnostic wrong: $DIAG"
diff --git a/src/auditordb/test-auditor-db-postgres.conf b/src/auditordb/test-auditor-db-postgres.conf
index e06d511c1..b08195eb8 100644
--- a/src/auditordb/test-auditor-db-postgres.conf
+++ b/src/auditordb/test-auditor-db-postgres.conf
@@ -7,4 +7,5 @@ DB = postgres
 CONFIG = "postgres:///talercheck"
 
 [taler]
-CURRENCY = "EUR"
\ No newline at end of file
+CURRENCY = "EUR"
+
diff --git a/src/exchange/test-taler-exchange-aggregator-postgres.conf b/src/exchange/test-taler-exchange-aggregator-postgres.conf
index c2c8aef1d..b6c18fd5b 100644
--- a/src/exchange/test-taler-exchange-aggregator-postgres.conf
+++ b/src/exchange/test-taler-exchange-aggregator-postgres.conf
@@ -35,6 +35,20 @@ IDLE_RESERVE_EXPIRATION_TIME = 4 weeks
 CONFIG = postgres:///talercheck
 
 
+[exchangedb]
+
+# After how long do we close idle reserves?  The exchange
+# and the auditor must agree on this value.  We currently
+# expect it to be globally defined for the whole system,
+# as there is no way for wallets to query this value.  Thus,
+# it is only configurable for testing, and should be treated
+# as constant in production.
+IDLE_RESERVE_EXPIRATION_TIME = 4 weeks
+
+# After how long do we forget about reserves?  Should be above
+# the legal expiration timeframe of withdrawn coins.
+LEGAL_RESERVE_EXPIRATION_TIME = 7 years
+
 [account-1]
 
 # What is the account URL?