4 files changed, 11 insertions, 7 deletions
diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index 89ca5246e..9e2e7c524 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -124,8 +124,13 @@ subtest 'check non public reports are not displayed on around page' => sub {
     ok $private->update( { non_public => 1 } ), 'problem marked non public';
 
     $mech->get_ok('/');
-    $mech->submit_form_ok( { with_fields => { pc => 'EH99 1SP' } },
-        "good location" );
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
+        MAPIT_URL => 'http://mapit.mysociety.org/',
+    }, sub {
+        $mech->submit_form_ok( { with_fields => { pc => 'EH99 1SP' } },
+            "good location" );
+    };
     $mech->content_lacks( 'Around page Test 3 for 2651',
         'problem marked non public is not visible' );
 };
diff --git a/t/app/helpers/send_email_sample.txt b/t/app/helpers/send_email_sample.txt
index 0f7406172..87604008c 100644
--- a/t/app/helpers/send_email_sample.txt
+++ b/t/app/helpers/send_email_sample.txt
@@ -23,4 +23,4 @@ pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
 culpa qui officia deserunt mollit anim id est laborum.
 
 Yours,=20=20
-FixMyStreet.=20=
+FixMyStreet.=
diff --git a/t/app/helpers/send_email_sample_mime.txt b/t/app/helpers/send_email_sample_mime.txt
index 0649d1ceb..1747204f7 100644
--- a/t/app/helpers/send_email_sample_mime.txt
+++ b/t/app/helpers/send_email_sample_mime.txt
@@ -28,7 +28,7 @@ pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
 culpa qui officia deserunt mollit anim id est laborum.
 
 Yours,=20=20
-FixMyStreet.=20=
+FixMyStreet.=
 
 --BOUNDARY
 Content-Type: image/gif; name="foo.gif"
diff --git a/t/app/load_general_config.t b/t/app/load_general_config.t
index 1051aac3f..16ca2fc54 100644
--- a/t/app/load_general_config.t
+++ b/t/app/load_general_config.t
@@ -5,7 +5,6 @@ use Test::More tests => 2;
 
 use_ok 'FixMyStreet::App';
 
-# GAZE_URL chosen as it is unlikely to change
-is FixMyStreet::App->config->{GAZE_URL},    #
-  'http://gaze.mysociety.org/gaze',         #
+is FixMyStreet::App->config->{GAZE_URL},
+  'https://gaze.mysociety.org/gaze',
   "check that known config param is loaded";