diff --git a/perl-CPAN-Meta.spec b/perl-CPAN-Meta.spec
index 3d3c7e9..8381e34 100644
--- a/perl-CPAN-Meta.spec
+++ b/perl-CPAN-Meta.spec
@@ -1,7 +1,7 @@
 Name:           perl-CPAN-Meta
 Summary:        Distribution metadata for a CPAN dist
 Version:        2.113640
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/CPAN-Meta-2.113640.tar.gz
@@ -23,8 +23,12 @@ BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Test::More) >= 0.88
 BuildRequires:  perl(version) >= 0.82
 
+# obsolete/provide old tests subpackage
+# can be removed during F19 development cycle
+Obsoletes:      %{name}-tests < 2.113640-3
+Provides:       %{name}-tests = %{version}-%{release}
+
 %{?perl_default_filter}
-%{?perl_default_subpackage_tests}
 
 %description
 Software distributions released to the CPAN include a META.json or, for
@@ -36,6 +40,9 @@ in CPAN::Meta::Spec.
 %prep
 %setup -q -n CPAN-Meta-%{version}
 
+# silence rpmlint warnings
+sed -i '1s,#!.*perl,#!%{__perl},' t/*.t
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -52,11 +59,14 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 make test
 
 %files
-%doc Changes history LICENSE README Todo
+%doc Changes history LICENSE README Todo t/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 22 2012 Iain Arnell <iarnell@gmail.com> 2.113640-3
+- drop tests subpackage; move tests to main package documentation
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.113640-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild