diff --git a/.perlcriticrc b/.perlcriticrc
new file mode 100644
index 000000000000..b91a2d5790f0
--- /dev/null
+++ b/.perlcriticrc
@@ -0,0 +1,8 @@
+[-Perl::Critic::Policy::BuiltinFunctions::ProhibitStringyEval]
+
+[Perl::Critic::Policy::HashKeyQuotes]
+
+[Perl::Critic::Policy::ConsistentQuoteLikeWords]
+
+[Perl::Critic::Policy::ControlStructures::ProhibitDeepNests]
+max_nests = 8
diff --git a/.travis.yml b/.travis.yml
index 23437502a64c..a74811ca3d6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,4 +21,3 @@ install:
   - make prepare
 script:
   - make test
-  - make perlcritic
diff --git a/Makefile b/Makefile
index f5fcdd5048d1..14b5c761c161 100644
--- a/Makefile
+++ b/Makefile
@@ -83,13 +83,10 @@ test-static: tidy test-merge test-dry test-no-wait_idle test-unused-modules test
 ifeq ($(TESTS),compile)
 test: test-compile
 else
-test: unit-test test-static test-compile
+test: unit-test test-static test-compile perlcritic
 endif
 
-PERLCRITIC=PERL5LIB=tools/lib/perlcritic:$$PERL5LIB perlcritic --quiet \
-	--exclude Perl::Critic::Policy::BuiltinFunctions::ProhibitStringyEval \
-	--include Perl::Critic::Policy::HashKeyQuote \
-	--include Perl::Critic::Policy::ConsistentQuoteLikeWords
+PERLCRITIC=PERL5LIB=tools/lib/perlcritic:$$PERL5LIB perlcritic --quiet --gentle
 
 .PHONY: perlcritic
 perlcritic: tools/lib/
diff --git a/lib/migration.pm b/lib/migration.pm
index 5cb3ad93e593..37643d29ee44 100644
--- a/lib/migration.pm
+++ b/lib/migration.pm
@@ -24,7 +24,7 @@ use testapi;
 use utils;
 use registration;
 use qam 'remove_test_repositories';
-use version_utils qw(sle_version_at_least is_sle is_sles4sap);
+use version_utils qw(is_sle is_sles4sap);
 
 our @EXPORT = qw(
   setup_sle