diff --git a/deployment_scripts/puppet/manifests/Gemfile b/deployment_scripts/puppet/manifests/Gemfile
index e4105df7f..7d2ce4e5d 100644
--- a/deployment_scripts/puppet/manifests/Gemfile
+++ b/deployment_scripts/puppet/manifests/Gemfile
@@ -18,4 +18,6 @@ group :development, :test do
   gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.4.0'
   # Newer puppetlabs_spec_helper depends on rubocop-rspec that requires ruby >= 2.2.0
   gem 'puppetlabs_spec_helper', '~> 1.1.1'
+  # puppet-lint >= 2.2.0 don't support Puppet 3.x anymore
+  gem 'puppet-lint', '~> 2.1.0'
 end
diff --git a/deployment_scripts/puppet/modules/fuel_lma_collector/Gemfile b/deployment_scripts/puppet/modules/fuel_lma_collector/Gemfile
index 585f6b784..e8a2c49ed 100644
--- a/deployment_scripts/puppet/modules/fuel_lma_collector/Gemfile
+++ b/deployment_scripts/puppet/modules/fuel_lma_collector/Gemfile
@@ -21,5 +21,7 @@ group :development, :test do
   gem 'rspec-puppet-facts'
   # Newer puppetlabs_spec_helper depends on rubocop-rspec that requires ruby >= 2.2.0
   gem 'puppetlabs_spec_helper', '~> 1.1.1'
+  # puppet-lint >= 2.2.0 don't support Puppet 3.x anymore
+  gem 'puppet-lint', '~> 2.1.0'
   gem 'metadata-json-lint'
 end
diff --git a/deployment_scripts/puppet/modules/heka/Gemfile b/deployment_scripts/puppet/modules/heka/Gemfile
index 585f6b784..e8a2c49ed 100644
--- a/deployment_scripts/puppet/modules/heka/Gemfile
+++ b/deployment_scripts/puppet/modules/heka/Gemfile
@@ -21,5 +21,7 @@ group :development, :test do
   gem 'rspec-puppet-facts'
   # Newer puppetlabs_spec_helper depends on rubocop-rspec that requires ruby >= 2.2.0
   gem 'puppetlabs_spec_helper', '~> 1.1.1'
+  # puppet-lint >= 2.2.0 don't support Puppet 3.x anymore
+  gem 'puppet-lint', '~> 2.1.0'
   gem 'metadata-json-lint'
 end
diff --git a/deployment_scripts/puppet/modules/lma_collector/Gemfile b/deployment_scripts/puppet/modules/lma_collector/Gemfile
index 585f6b784..e8a2c49ed 100644
--- a/deployment_scripts/puppet/modules/lma_collector/Gemfile
+++ b/deployment_scripts/puppet/modules/lma_collector/Gemfile
@@ -21,5 +21,7 @@ group :development, :test do
   gem 'rspec-puppet-facts'
   # Newer puppetlabs_spec_helper depends on rubocop-rspec that requires ruby >= 2.2.0
   gem 'puppetlabs_spec_helper', '~> 1.1.1'
+  # puppet-lint >= 2.2.0 don't support Puppet 3.x anymore
+  gem 'puppet-lint', '~> 2.1.0'
   gem 'metadata-json-lint'
 end