diff --git a/perl-CGI-Compile.spec b/perl-CGI-Compile.spec
index 99aca33..e1408bc 100644
--- a/perl-CGI-Compile.spec
+++ b/perl-CGI-Compile.spec
@@ -1,7 +1,10 @@
+# Perform optional tests
+%bcond_without perl_CGI_Compile_enables_optional_test
+
 Name:           perl-CGI-Compile
 Summary:        Compile .cgi scripts to a code reference like ModPerl::Registry
 Version:        0.24
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL+ or Artistic
 
 Source0:        https://cpan.metacpan.org/authors/id/R/RK/RKITOVER/CGI-Compile-%{version}.tar.gz 
@@ -11,6 +14,7 @@ BuildArch:      noarch
 
 BuildRequires:  perl-interpreter
 BuildRequires:  perl-generators
+BuildRequires:  perl(:VERSION) >= 5.8.1
 BuildRequires:  perl(Module::Build::Tiny) >= 0.034
 BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
@@ -23,25 +27,28 @@ BuildRequires:  perl(File::pushd)
 BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(File::Spec::Functions)
 BuildRequires:  perl(File::Temp)
+BuildRequires:  perl(Sub::Name)
 # Tests:
-BuildRequires:  perl(base)
 BuildRequires:  perl(Capture::Tiny)
-BuildRequires:  perl(Exporter)
+BuildRequires:  perl(CGI)
 BuildRequires:  perl(lib)
-BuildRequires:  perl(Sub::Name)
+BuildRequires:  perl(POSIX)
 BuildRequires:  perl(Switch)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::NoWarnings)
 BuildRequires:  perl(Test::Requires)
+BuildRequires:  perl(Try::Tiny)
+%if %{with perl_CGI_Compile_enables_optional_test}
 # Optional tests:
-BuildRequires:  perl(CGI)
 %if !%{defined perl_bootstrap}
 # Break build-cycle: perl-Plack → perl-CGI-Compile → perl-Plack
 BuildRequires:  perl(CGI::Emulate::PSGI)
 BuildRequires:  perl(HTTP::Request::Common)
 BuildRequires:  perl(Plack::Test)
 %endif
+BuildRequires:  perl(Sub::Identify)
 # Test::Pod 1.41 not used
+%endif
 
 %{?perl_default_filter}
 
@@ -65,6 +72,7 @@ sed -i -e '1s,#!.*perl,#!/usr/bin/perl,' t/*.t
 %{_fixperms} %{buildroot}/*
 
 %check
+unset AUTHOR_TESTING AUTOMATED_TESTING
 ./Build test
 
 
@@ -74,6 +82,9 @@ sed -i -e '1s,#!.*perl,#!/usr/bin/perl,' t/*.t
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Feb 06 2020 Petr Pisar <ppisar@redhat.com> - 0.24-2
+- Specify all dependencies
+
 * Sun Feb 02 2020 Emmanuel Seyman <emmanuel@seyman.fr> - 0.24-1
 - Update to 0.24