diff --git a/perl-Perl-Critic.spec b/perl-Perl-Critic.spec
index a357ecf..76f8e53 100644
--- a/perl-Perl-Critic.spec
+++ b/perl-Perl-Critic.spec
@@ -1,5 +1,3 @@
-%bcond_with authortests
-
 Name:           perl-Perl-Critic
 Version:        1.116
 Release:        2%{?dist}
@@ -75,8 +73,8 @@ BuildRequires:  perl(Test::Deep)
 BuildRequires:  perl(Test::Memory::Cycle)
 BuildRequires:  perl(Test::More)
 
-# Author tests
-%if %{with authortests}
+# Author tests: not run if we're bootstrapping
+%if 0%{!?perl_bootstrap:1}
 BuildRequires:  perl(Devel::EnforceEncapsulation)
 BuildRequires:  perl(Perl::Critic::Policy::Editor::RequireEmacsFileVariables)
 BuildRequires:  perl(Perl::Critic::Policy::ErrorHandling::RequireUseOfExceptions)
@@ -134,11 +132,7 @@ find . -type f -exec chmod -c -x {} +
 
 
 %check
-%if %{with authortests}
-LC_ALL=en_US ./Build authortest
-%else
-LC_ALL=en_US ./Build test
-%endif
+LC_ALL=en_US ./Build %{!?perl_bootstrap:author}test
 
 
 %files
@@ -159,6 +153,7 @@ LC_ALL=en_US ./Build test
 %changelog
 * Wed Jun 29 2011 Paul Howarth <paul@city-fan.org> - 1.116-2
 - move BR: perl(Test::Perl::Critic) to author test section where it belongs
+- run the author tests if we're not bootstrapping
 
 * Mon May 16 2011 Paul Howarth <paul@city-fan.org> - 1.116-1
 - update to 1.116