diff --git a/Build.PL b/Build.PL
index 939b65d..3d1a458 100644
--- a/Build.PL
+++ b/Build.PL
@@ -8,7 +8,6 @@ my $builder = Module::Build->new(
         'Module::Build' => '0.4004',
     },
     test_requires    => {
-        'Test::DescribeMe' => 0,
         'Test::More' => '0.88',
     },
     requires => {
diff --git a/t/spelling.t b/t/spelling.t
index a57a236..0875fdc 100644
--- a/t/spelling.t
+++ b/t/spelling.t
@@ -1,16 +1,22 @@
-use Test::DescribeMe qw(author);
-use Test::More import => [qw(done_testing)];
-use Test::Spelling qw(add_stopwords all_pod_files_spelling_ok set_spell_cmd);
+use Test::More import => [qw(plan)];
+
+plan skip_all => 'Author test' unless $ENV{AUTHOR_TESTING};
+
+if (eval { require Test::Spelling }) {
+    Test::Spelling->import(qw(add_stopwords all_pod_files_spelling_ok set_spell_cmd));
+} else {
+    plan skip_all => 'Test::Spelling required to spell check';
+}
 
 add_stopwords(<DATA>);
 set_spell_cmd('aspell list -l en_GB -p /dev/null');
-all_pod_files_spelling_ok;
-done_testing;
+all_pod_files_spelling_ok();
 
 __DATA__
 API
 Dieckow
 GmbH
-Ingy's
+Ingy
+git-dch
 merchantability
 Sipwise