diff --git a/perl-PPIx-Utilities.spec b/perl-PPIx-Utilities.spec
index 199a020..db6a4fc 100644
--- a/perl-PPIx-Utilities.spec
+++ b/perl-PPIx-Utilities.spec
@@ -1,12 +1,13 @@
 Name:		perl-PPIx-Utilities
 Version:	1.001000
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Extensions to PPI
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/PPIx-Utilities/
 Source0:	http://search.cpan.org/CPAN/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-%{version}.tar.gz
 BuildArch:	noarch
+# Build:
 BuildRequires:	perl(ExtUtils::MakeMaker)
 # Run-time:
 BuildRequires:	perl(base)
@@ -23,9 +24,20 @@ BuildRequires:	perl(PPI::Dumper) >= 1.208
 BuildRequires:	perl(Task::Weaken)
 BuildRequires:	perl(Test::Deep)
 BuildRequires:	perl(Test::More)
-Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-%{?perl_default_filter}
+# Extra tests:
+# PPI needed by Perl::Critic, so don't run extra tests when bootstrapping
+%if 0%{!?perl_bootstrap:1}
+BuildRequires:	aspell-en
+BuildRequires:	perl(File::Slurp)
+BuildRequires:	perl(Perl::Critic::Policy::Miscellanea::RequireRcsKeywords)
+BuildRequires:	perl(Test::Perl::Critic)
+BuildRequires:	perl(Test::Distribution)
+BuildRequires:	perl(Test::Kwalitee)
+BuildRequires:	perl(Test::Pod)
+BuildRequires:	perl(Test::Pod::Coverage)
+%endif
+# Run-time:
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 This is a collection of functions for dealing with PPI objects, many of
@@ -48,6 +60,9 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \;
 
 %check
 make test
+%if 0%{!?perl_bootstrap:1}
+make test TEST_FILES="$(echo $(find xt/ -name '*.t' | grep -Fv copyright.t))"
+%endif
 
 %files
 %doc Changes LICENSE README
@@ -58,6 +73,10 @@ make test
 %{_mandir}/man3/PPIx::Utilities::Statement.3pm*
 
 %changelog
+* Fri Oct 26 2012 Paul Howarth <paul@city-fan.org> - 1.001000-8
+- Drop redundant %%perl_default_filter
+- Run extra tests (and include necessary buildreqs) except when bootstrapping
+
 * Thu Oct 25 2012 Petr Pisar <ppisar@redhat.com> - 1.001000-7
 - Specify all dependencies