diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index 43359f9..5da72c3 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -3,7 +3,7 @@
 
 Name:		perl-Package-Stash
 Version:	0.33
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Routines for manipulating stashes
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -21,16 +21,19 @@ BuildRequires:	perl(File::Temp)
 BuildRequires:	perl(lib)
 BuildRequires:	perl(Package::DeprecationManager)
 BuildRequires:	perl(Package::Stash::XS) >= 0.24
-BuildRequires:	perl(Pod::Coverage::TrustPod)
 BuildRequires:	perl(Scalar::Util)
-BuildRequires:	perl(Test::EOL)
 BuildRequires:	perl(Test::Fatal)
 BuildRequires:	perl(Test::More)
+BuildRequires:	perl(Test::Requires)
+# Optional tests:
+%if ! (0%{?rhel} >= 7)
+BuildRequires:	perl(Pod::Coverage::TrustPod)
+BuildRequires:	perl(Test::EOL)
+BuildRequires:	perl(Test::LeakTrace)
 BuildRequires:	perl(Test::NoTabs)
 BuildRequires:	perl(Test::Pod)
 BuildRequires:	perl(Test::Pod::Coverage)
-BuildRequires:	perl(Test::Requires)
-BuildRequires:	perl(Test::LeakTrace)
+%endif
 BuildRequires:	perl(Test::Script)
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 # For performance and consistency
@@ -62,7 +65,11 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \;
 %{_fixperms} %{buildroot}
 
 %check
+%if ! (0%{?rhel} >= 7)
 make test AUTHOR_TESTING=1 RELEASE_TESTING=1
+%else
+make test
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -75,6 +82,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Package::Stash::PP.3pm*
 
 %changelog
+* Mon Aug 27 2012 Petr Pisar <ppisar@redhat.com> - 0.33-7
+- Disable author tests on RHEL >= 7
+
 * Fri Aug 24 2012 Paul Howarth <paul@city-fan.org> - 0.33-6
 - Drop EPEL-4 support
   - Drop %%defattr, redundant since rpm 4.4