diff --git a/src/mhd/mhd_legal.c b/src/mhd/mhd_legal.c
index dfda58ac9..137cc436a 100644
--- a/src/mhd/mhd_legal.c
+++ b/src/mhd/mhd_legal.c
@@ -658,6 +658,9 @@ TALER_MHD_legal_load (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
     if (lang[0] == '.')
       continue;
+    if (0 == strcmp (lang,
+                     "locale"))
+      continue;
     load_language (legal,
                    path,
                    lang);
diff --git a/src/testing/taler-unified-setup.sh b/src/testing/taler-unified-setup.sh
index 48e164c2f..7bf14d4fb 100755
--- a/src/testing/taler-unified-setup.sh
+++ b/src/testing/taler-unified-setup.sh
@@ -570,7 +570,7 @@ then
              --timeout=1 \
              --user admin \
              --password secret \
-             "http://localhost:8082/" \
+             "http://localhost:${BANK_PORT}/" \
              -o /dev/null \
              -O /dev/null >/dev/null || continue
         OK="1"