diff --git a/perl-MooseX-NonMoose.spec b/perl-MooseX-NonMoose.spec
index a90d645..13e6ca6 100644
--- a/perl-MooseX-NonMoose.spec
+++ b/perl-MooseX-NonMoose.spec
@@ -1,22 +1,47 @@
+# Run extra test
+%if ! (0%{?rhel})
+%bcond_without perl_MooseX_NonMoose_enables_extra_test
+%else
+%bcond_with perl_MooseX_NonMoose_enables_extra_test
+%endif
+
 Name:           perl-MooseX-NonMoose
 Version:        0.26
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Easy subclassing of non-Moose classes
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/MooseX-NonMoose/
 Source0:        http://www.cpan.org/authors/id/D/DO/DOY/MooseX-NonMoose-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  make
 BuildRequires:  perl-generators
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Run-time
 BuildRequires:  perl(List::MoreUtils)
+BuildRequires:  perl(Module::Runtime)
+BuildRequires:  perl(Moose::Exporter)
+BuildRequires:  perl(Moose::Role) >= 2.0000
+BuildRequires:  perl(Moose::Util)
+BuildRequires:  perl(Try::Tiny)
+# Test
+BuildRequires:  perl(base)
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(IO::Handle)
+BuildRequires:  perl(IPC::Open3)
 BuildRequires:  perl(Moose) >= 1.15
-BuildRequires:  perl(MooseX::GlobRef)
-BuildRequires:  perl(MooseX::InsideOut)
-BuildRequires:  perl(Test::Exception)
+BuildRequires:  perl(Test::Fatal)
 BuildRequires:  perl(Test::Moose)
 BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Test::Fatal)
+# Extra tests
+%if %{with perl_MooseX_NonMoose_enables_extra_test}
+BuildRequires:  perl(IO::File)
+BuildRequires:  perl(MooseX::GlobRef)
+BuildRequires:  perl(MooseX::InsideOut) >= 0.100
+%endif
 Requires:       perl(Moose) >= 1.15
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -39,15 +64,11 @@ modules, or even classes that don't inherit from anything at all.
 %setup -q -n MooseX-NonMoose-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
 make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=%{buildroot}
-
-find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
-
 %{_fixperms} %{buildroot}/*
 
 %check
@@ -60,6 +81,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 17 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.26-10
+- Specify all dependencies; Modernize spec file
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild