diff --git a/Makefile.PL b/Makefile.PL
index 5f4c282..e0a9c04 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -28,6 +28,15 @@ if($online_tests) {
 	unlink('t/online.enabled');
 }
 
+my $dist = {
+	COMPRESS => 'gzip -9f',
+	SUFFIX => 'gz'
+};
+
+if($^O eq 'darwin') {
+	$dist->{'TAR'} = 'gtar';
+}
+
 WriteMakefile(
 	NAME	=> 'Geo::Coder::Abbreviations',
 	AUTHOR	=> q{Nigel Horne <njh@bandsman.co.uk>},
@@ -48,7 +57,7 @@ WriteMakefile(
 		'JSON::MaybeXS' => 0,
 		'LWP::Simple::WithCache' => 0,
 		'LWP::Protocol::https' => 0,
-	}, dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
+	}, dist => $dist,
 	clean => { FILES => 'Geo-Coder-Abbreviations-*' },
 	META_MERGE => {
 		'meta-spec' => { version => 2 },
diff --git a/t/eof.t b/t/eof.t
index f61ae39..b30f021 100644
--- a/t/eof.t
+++ b/t/eof.t
@@ -2,15 +2,10 @@
 
 use strict;
 use warnings;
+use Test::DescribeMe qw(author);
 use Test::Needs 'Test::EOF';
 use Test::Most;
 
-BEGIN {
-	if($ENV{'AUTHOR_TESTING'}) {
-		Test::EOF->import();
-		all_perl_files_ok({ minimum_newlines => 1, maximum_newlines => 4 });
-		done_testing();
-	} else {
-		plan(skip_all => 'Author tests not required for installation');
-	}
-}
+Test::EOF->import();
+all_perl_files_ok({ minimum_newlines => 1, maximum_newlines => 4 });
+done_testing();
diff --git a/t/eol.t b/t/eol.t
index 4a4d26c..2465d3c 100644
--- a/t/eol.t
+++ b/t/eol.t
@@ -2,14 +2,9 @@
 
 use strict;
 use warnings;
+use Test::DescribeMe qw(author);
 use Test::Needs 'Test::EOL';
 use Test::Most;
 
-BEGIN {
-	if($ENV{'AUTHOR_TESTING'}) {
-		Test::EOL->import();
-		all_perl_files_ok({ trailing_whitespace => 1 });
-	} else {
-		plan(skip_all => 'Author tests not required for installation');
-	}
-}
+Test::EOL->import();
+all_perl_files_ok({ trailing_whitespace => 1 });
diff --git a/t/metrics.t b/t/metrics.t
index 76d5dac..8bdb7e6 100644
--- a/t/metrics.t
+++ b/t/metrics.t
@@ -1,4 +1,4 @@
-#!perl -wT
+#!perl -w
 
 use strict;
 use warnings;
diff --git a/t/no404s.t b/t/no404s.t
index a9534d2..a8a58e6 100644
--- a/t/no404s.t
+++ b/t/no404s.t
@@ -1,4 +1,4 @@
-#!perl -wT
+#!perl -w
 
 use strict;
 use warnings;
diff --git a/t/strict.t b/t/strict.t
index 344a3f8..1291cba 100644
--- a/t/strict.t
+++ b/t/strict.t
@@ -3,16 +3,10 @@
 use strict;
 use warnings;
 
+use Test::DescribeMe qw(author);
 use Test::Most;
+use Test::Needs 'Test::Strict';
 
-unless($ENV{AUTHOR_TESTING}) {
-    plan(skip_all => 'Author tests not required for installation');
-}
-
-eval 'use Test::Strict';
-if($@) {
-	plan(skip_all => 'Test::Strict required for testing use strict');
-} else {
-	all_perl_files_ok();
-	warnings_ok('lib/Geo/Coder/Abbreviations.pm');
-}
+Test::Strict->import();
+all_perl_files_ok();
+warnings_ok('lib/Geo/Coder/Abbreviations.pm');
diff --git a/t/vars.t b/t/vars.t
index 16fa4e6..46622a5 100644
--- a/t/vars.t
+++ b/t/vars.t
@@ -3,12 +3,9 @@
 use strict;
 use warnings;
 
+use Test::DescribeMe qw(author);
 use Test::Most;
 use Test::Needs 'Test::Vars';
 
-if($ENV{'AUTHOR_TESTING'}) {
-	Test::Vars->import();
-	all_vars_ok(ignore_vars => { '$self' => 0 });
-} else {
-	plan(skip_all => 'Author tests not required for installation');
-}
+Test::Vars->import();
+all_vars_ok(ignore_vars => { '$self' => 0 });
diff --git a/t/version.t b/t/version.t
index 6551247..7fd1e9a 100644
--- a/t/version.t
+++ b/t/version.t
@@ -2,15 +2,10 @@
 
 use strict;
 use warnings;
+use Test::DescribeMe qw(author);
 use Test::Needs 'Test::Version';
 use Test::Most;
 
-BEGIN {
-	if($ENV{'AUTHOR_TESTING'}) {
-		Test::Version->import();
-		version_all_ok();
-		done_testing();
-	} else {
-		plan(skip_all => 'Author tests not required for installation');
-	}
-}
+Test::Version->import();
+version_all_ok();
+done_testing();