diff --git a/perl-Test-Script.spec b/perl-Test-Script.spec
index 199acbb..fd58b8c 100644
--- a/perl-Test-Script.spec
+++ b/perl-Test-Script.spec
@@ -1,35 +1,39 @@
 Name:           perl-Test-Script
 Version:        1.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform basic tests for scripts
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/Test-Script
-Source0:        https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Test-Script-%{version}.tar.gz
+Source0:        https://cpan.metacpan.org/modules/by-module/Test/Test-Script-%{version}.tar.gz
 BuildArch:      noarch
-
-BuildRequires:  %{__perl}
-BuildRequires:  %{__make}
-
+# Module Build
+BuildRequires:  coreutils
+BuildRequires:  findutils
+BuildRequires:  make
 BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+# Module Runtime
 BuildRequires:  perl(Capture::Tiny)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Exporter)
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(File::Path)
 BuildRequires:  perl(File::Spec) >= 0.80
-BuildRequires:  perl(File::Spec::Functions)
 BuildRequires:  perl(File::Spec::Unix)
 BuildRequires:  perl(File::Temp)
 BuildRequires:  perl(IO::Handle)
 BuildRequires:  perl(Probe::Perl) >= 0.01
-BuildRequires:  perl(Test2::API)
-BuildRequires:  perl(Test2::V0)
-BuildRequires:  perl(Test::More) >= 0.96
-BuildRequires:  perl(Text::ParseWords)
 BuildRequires:  perl(strict)
+BuildRequires:  perl(Test2::API) >= 1.302015
+BuildRequires:  perl(Test2::V0) >= 0.000060
+BuildRequires:  perl(Text::ParseWords)
 BuildRequires:  perl(warnings)
-
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Test Suite
+BuildRequires:  perl(Config)
+BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(Test::More)
+# Dependencies
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires:       perl(Text::ParseWords)
 
 %description
 The intent of this module is to provide a series of basic tests for scripts
@@ -39,23 +43,30 @@ in the bin directory of your Perl distribution.
 %setup -q -n Test-Script-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
-%{__make} %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
 
 %install
-%{__make} pure_install DESTDIR=$RPM_BUILD_ROOT
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{make_install}
+%{_fixperms} -c %{buildroot}
 
 %check
-%{__make} test
+make test
 
 %files
 %doc Changes README
 %license LICENSE
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%{perl_vendorlib}/Test/
+%{_mandir}/man3/Test::Script.3*
 
 %changelog
+* Mon Sep  9 2019 Paul Howarth <paul@city-fan.org> - 1.25-2
+- Tidy up for EPEL-8 build
+  - Use author-independent source URL
+  - Classify buildreqs by usage
+  - Modernize spec using %%{make_build} and %%{make_install}
+  - Make %%files list more explicit
+
 * Wed Oct 03 2018 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.25-1
 - Update to 1.25.