diff --git a/namespace-clean-0.24-old-Test::More.patch b/namespace-clean-0.24-old-Test::More.patch
deleted file mode 100644
index 3a3b650..0000000
--- a/namespace-clean-0.24-old-Test::More.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -up ./t/07-debugger.t.orig ./t/07-debugger.t
---- ./t/07-debugger.t.orig	2012-11-26 18:47:12.000000000 +0000
-+++ ./t/07-debugger.t	2012-12-05 15:16:36.658012218 +0000
-@@ -26,6 +26,8 @@ BEGIN {
- 
- }
- 
-+plan tests => 4;
-+
- {
-     package Foo;
- 
-@@ -44,5 +46,3 @@ ok( !Foo->can("foo"), "foo cleaned up" )
- ok( !Foo->can("baz"), "baz cleaned up" );
- 
- Foo->bar();
--
--done_testing;
-diff -up ./t/08-const-sub.t.orig ./t/08-const-sub.t
---- ./t/08-const-sub.t.orig	2011-03-29 22:44:20.000000000 +0100
-+++ ./t/08-const-sub.t	2012-12-05 15:16:36.670012221 +0000
-@@ -1,7 +1,7 @@
- use strict;
- use warnings;
- 
--use Test::More 0.88;
-+use Test::More tests => 2;
- 
- use constant CONST => 123;
- use namespace::clean;
-@@ -10,5 +10,3 @@ my $x = CONST;
- is $x, 123;
- 
- ok eval("!defined(&CONST)");
--
--done_testing;
-diff -up ./t/09-fiddle-hinthash.t.orig ./t/09-fiddle-hinthash.t
---- ./t/09-fiddle-hinthash.t.orig	2011-12-22 11:07:06.000000000 +0000
-+++ ./t/09-fiddle-hinthash.t	2012-12-05 15:16:36.671012222 +0000
-@@ -1,7 +1,7 @@
- use strict;
- use warnings;
- 
--use Test::More 0.88;
-+use Test::More tests => 4;
- 
- {
-   package Bar;
-@@ -49,5 +49,3 @@ use Test::More 0.88;
-   }
- }
- 
--
--done_testing;
-diff -up ./t/10-pure-perl.t.orig ./t/10-pure-perl.t
---- ./t/10-pure-perl.t.orig	2012-11-26 18:47:12.000000000 +0000
-+++ ./t/10-pure-perl.t	2012-12-05 15:17:25.973028700 +0000
-@@ -8,6 +8,8 @@ plan skip_all => "PP tests already execu
- eval { require Variable::Magic }
-   or plan skip_all => "PP tests already executed";
- 
-+plan tests => 12;
-+
- $ENV{B_HOOKS_ENDOFSCOPE_IMPLEMENTATION} = 'PP';
- require B::Hooks::EndOfScope;
- ok( ($INC{'B/Hooks/EndOfScope/PP.pm'} && ! $INC{'B/Hooks/EndOfScope/XS.pm'}),
-@@ -42,5 +44,3 @@ for my $fn (bsd_glob("$Bin/*.t")) {
-   wait;
-   ok (! $?, "Exit $? from: @cmd");
- }
--
--done_testing;
diff --git a/perl-namespace-clean.spec b/perl-namespace-clean.spec
index 162ff35..de0d5bf 100644
--- a/perl-namespace-clean.spec
+++ b/perl-namespace-clean.spec
@@ -1,19 +1,13 @@
-# We need to patch the test suite if we have an old version of Test::More
-%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0)
-
 # With perl 5.8.9-5.12, we need Sub::Identify and Sub::Name
 %global fixup_rename_sub %(perl -e 'print (($] > 5.008_008_9 && $] < 5.013_006_1) ? 1 : 0);' 2>/dev/null || echo 0)
 
 Name:		perl-namespace-clean
 Summary:	Keep your namespace tidy
-Version:	0.24
-Release:	4%{?dist}
+Version:	0.25
+Release:	1%{?dist}
 License:	GPL+ or Artistic
-Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/namespace-clean/
 Source0:	http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/namespace-clean-%{version}.tar.gz
-Patch1:		namespace-clean-0.24-old-Test::More.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
 BuildRequires:	perl(base)
 BuildRequires:	perl(B::Hooks::EndOfScope) >= 0.12
@@ -35,14 +29,8 @@ Requires:	perl(Sub::Name) >= 0.04
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:	perl(B::Hooks::EndOfScope) >= 0.12
 
-# Obsolete/Provide old tests subpackage
-# Can be removed during F19 development cycle
-%if 0%{?perl_default_filter:1}
-Obsoletes:	%{name}-tests < 0.21-3
-Provides:	%{name}-tests = %{version}-%{release}
 # Avoid unwanted requires/provides that come with the test suite
-%{perl_default_filter}
-%endif
+%{?perl_default_filter}
 
 %description
 When you define a function, or import one, into a Perl package, it will
@@ -59,17 +47,11 @@ name, but they won't show up as methods on your class or instances.
 %prep
 %setup -q -n namespace-clean-%{version}
 
-# Patch test suite to work with Test::More < 0.88 if necessary
-%if %{old_test_more}
-%patch1 -p1
-%endif
-
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 %{_fixperms} %{buildroot}
@@ -77,15 +59,19 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 %check
 make test
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%doc Changes %{?perl_default_filter:t/}
+%doc Changes t/
 %{perl_vendorlib}/namespace/
 %{_mandir}/man3/namespace::clean.3pm*
 
 %changelog
+* Wed Mar  5 2014 Paul Howarth <paul@city-fan.org> - 0.25-1
+- Update to 0.25
+  - Fix incorrect ExtUtils::CBuilder detection routine leading to Makefile.PL
+    crashes when EU::CB is not available
+- Drop obsoletes/provides for old tests sub-package
+- Drop EL-5 support since build requirements can't be met there
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.24-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 60a3c8b..444ae3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb6f2e2bba5f028a0e939cc6f2639fba  namespace-clean-0.24.tar.gz
+da81d44f114a947b873f8df11a3c02ec  namespace-clean-0.25.tar.gz