diff --git a/perl-Module-Install-ReadmeFromPod.spec b/perl-Module-Install-ReadmeFromPod.spec
index 9967c84..8b7289c 100644
--- a/perl-Module-Install-ReadmeFromPod.spec
+++ b/perl-Module-Install-ReadmeFromPod.spec
@@ -1,3 +1,5 @@
+# Perform optional tests
+%{bcond_without perl_Module_Install_ReadmeFromPod_enablas_optional_test}
 # Support output to PDF
 %{bcond_without perl_Module_Install_ReadmeFromPod_enables_pdf}
 
@@ -14,10 +16,9 @@ Patch0:         Module-Install-ReadmeFromPod-0.26-Regenerate-README-in-UTF-8.pat
 Patch1:         Module-Install-ReadmeFromPod-0.30-Do-not-test-PDF-file-for-new-lines.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
-BuildRequires:  findutils
 BuildRequires:  make
-BuildRequires:  perl-interpreter
 BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(Config)
 BuildRequires:  perl(inc::Module::Install)
 BuildRequires:  perl(lib)
@@ -49,9 +50,11 @@ BuildRequires:  perl(File::Path)
 BuildRequires:  perl(File::Temp)
 BuildRequires:  perl(Test::InDistDir)
 BuildRequires:  perl(Test::More) >= 0.47
+%if %{with perl_Module_Install_ReadmeFromPod_enablas_optional_test}
 # Optional tests:
 BuildRequires:  perl(Test::Pod) >= 1.00
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.00
+%endif
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 %if %{with perl_Module_Install_ReadmeFromPod_enables_pdf}
 Suggests:       perl(App::pod2pdf)
@@ -85,12 +88,11 @@ sed -i -e '/^inc\// d' MANIFEST
 chmod -x tools/git-log.pl
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
 
 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -delete
+%{make_install}
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check