9 files changed, 11 insertions, 18 deletions
diff --git a/t/Mock/Facebook.pm b/t/Mock/Facebook.pm
index 68c63f2d5..eb882af21 100644
--- a/t/Mock/Facebook.pm
+++ b/t/Mock/Facebook.pm
@@ -1,6 +1,6 @@
 package t::Mock::Facebook;
 
-use JSON;
+use JSON::MaybeXS;
 use Web::Simple;
 use MooX::Types::MooseLike::Base qw(:all);
 
diff --git a/t/Mock/MapIt.pm b/t/Mock/MapIt.pm
index a3bfb10d4..754cc327e 100644
--- a/t/Mock/MapIt.pm
+++ b/t/Mock/MapIt.pm
@@ -1,6 +1,6 @@
 package t::Mock::MapIt;
 
-use JSON;
+use JSON::MaybeXS;
 use Web::Simple;
 
 use mySociety::Locale;
diff --git a/t/Mock/Nominatim.pm b/t/Mock/Nominatim.pm
index 3f3cef69a..5c8c549d1 100644
--- a/t/Mock/Nominatim.pm
+++ b/t/Mock/Nominatim.pm
@@ -1,6 +1,6 @@
 package t::Mock::Nominatim;
 
-use JSON;
+use JSON::MaybeXS;
 use Web::Simple;
 
 has json => (
diff --git a/t/cobrand/seesomething.t b/t/cobrand/seesomething.t
index 09114f6f9..4da1c9c6e 100644
--- a/t/cobrand/seesomething.t
+++ b/t/cobrand/seesomething.t
@@ -2,7 +2,6 @@ use strict;
 use warnings;
 use DateTime;
 use Test::More;
-use JSON;
 
 use FixMyStreet;
 use FixMyStreet::TestMech;
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index b686f78ae..777e9735f 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -6,7 +6,6 @@ use warnings;
 use DateTime;
 use Test::More;
 use Test::LongString;
-use JSON;
 use Path::Tiny;
 
 # Check that you have the required locale installed - the following
diff --git a/t/open311/endpoint.t b/t/open311/endpoint.t
index 7e684c491..38314f079 100644
--- a/t/open311/endpoint.t
+++ b/t/open311/endpoint.t
@@ -6,12 +6,11 @@ use Test::MockTime ':all';
 
 use Open311::Endpoint;
 use Data::Dumper;
-use JSON;
+use JSON::MaybeXS;
 
 use t::open311::endpoint::Endpoint1;
 
 my $endpoint = t::open311::endpoint::Endpoint1->new;
-my $json = JSON->new;
 
 subtest "GET Service List" => sub {
     my $res = $endpoint->run_test_request( GET => '/services.xml' );
@@ -43,7 +42,7 @@ CONTENT
 
     $res = $endpoint->run_test_request( GET => '/services.json' );
     ok $res->is_success, 'json success';
-    is_deeply $json->decode($res->content),
+    is_deeply decode_json($res->content),
         [ {
                "keywords" => "deep,hole,wow",
                "group" => "highways",
@@ -111,7 +110,7 @@ CONTENT
 
     $res = $endpoint->run_test_request( GET => '/services/POT.json' );
     ok $res->is_success, 'json success';
-    is_deeply $json->decode($res->content),
+    is_deeply decode_json($res->content),
         {
             "service_code" => "POT",
             "attributes" => [
@@ -209,7 +208,7 @@ subtest "POST Service Request valid test" => sub {
     ok $res->is_success, 'valid request'
         or diag $res->content;
 
-    is_deeply $json->decode($res->content),
+    is_deeply decode_json($res->content),
         [ {
             "service_notice" => "This is a test service",
             "service_request_id" => 0
diff --git a/t/open311/endpoint/mysociety.t b/t/open311/endpoint/mysociety.t
index c63e03e43..d0ad60602 100644
--- a/t/open311/endpoint/mysociety.t
+++ b/t/open311/endpoint/mysociety.t
@@ -6,12 +6,11 @@ use Test::MockTime ':all';
 
 use Open311::Endpoint;
 use Data::Dumper;
-use JSON;
+use JSON::MaybeXS;
 
 use t::open311::endpoint::Endpoint2;
 
 my $endpoint = t::open311::endpoint::Endpoint2->new;
-my $json = JSON->new;
 
 subtest "POST OK" => sub {
     diag "Serves as sanity test of subclassing, as well as preparing our data";
@@ -31,7 +30,7 @@ subtest "POST OK" => sub {
     ok $res->is_success, 'valid request'
         or diag $res->content;
 
-    is_deeply $json->decode($res->content),
+    is_deeply decode_json($res->content),
         [ {
             "service_notice" => "This is a test service",
             "service_request_id" => 0
diff --git a/t/open311/endpoint/spark.t b/t/open311/endpoint/spark.t
index 589f39baf..015876c94 100644
--- a/t/open311/endpoint/spark.t
+++ b/t/open311/endpoint/spark.t
@@ -4,10 +4,8 @@ use Test::More;
 
 use Open311::Endpoint;
 use Data::Dumper;
-use JSON;
 
 my $endpoint = Open311::Endpoint->new;
-my $json = JSON->new;
 
 subtest "Spark test" => sub {
     my $spark = $endpoint->spark;
diff --git a/t/open311/endpoint/warwick.t b/t/open311/endpoint/warwick.t
index 5c47cd529..e5f124c8d 100644
--- a/t/open311/endpoint/warwick.t
+++ b/t/open311/endpoint/warwick.t
@@ -5,7 +5,7 @@ use Test::LongString;
 use Test::MockTime ':all';
 
 use Data::Dumper;
-use JSON;
+use JSON::MaybeXS;
 
 use FixMyStreet::DB;
 
@@ -19,7 +19,6 @@ use Open311::PopulateServiceList;
 use Open311::GetServiceRequestUpdates;
 
 my $endpoint = t::open311::endpoint::Endpoint_Warwick->new;
-my $json = JSON->new;
 
 subtest "GET Service List" => sub {
     my $res = $endpoint->run_test_request( GET => '/services.xml' );
@@ -59,7 +58,7 @@ subtest "POST OK" => sub {
     ok $res->is_success, 'valid request'
         or diag $res->content;
 
-    is_deeply $json->decode($res->content),
+    is_deeply decode_json($res->content),
         [ {
             "service_notice" => "Warwickshire Open311 Endpoint",
             "service_request_id" => 1001