diff --git a/Gemfile b/Gemfile
index c87fabc..3100928 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,14 +1,25 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'puppetlabs_spec_helper',   :require => false
-  gem 'puppet-lint', '~> 0.3.2'
-  gem 'rake', '10.1.1'
-  gem 'rspec-puppet', '~> 1.0.1', :require => false
-  gem 'beaker-rspec', '~> 2.2.4', :require => false
-  gem 'rspec', '< 2.99'
+  gem 'puppetlabs_spec_helper', :require => false
+  gem 'rspec-puppet', '~> 2.1.0', :require => false
+
+  gem 'metadata-json-lint'
+# Needs fix for LP: #1467625
+# gem 'puppet-lint-param-docs'
+# gem 'puppet-lint-absolute_classname-check'
+# gem 'puppet-lint-absolute_template_path'
+# gem 'puppet-lint-trailing_newline-check'
+
+  # Puppet 4.x related lint checks
+  gem 'puppet-lint-unquoted_string-check'
+  gem 'puppet-lint-leading_zero-check'
+  gem 'puppet-lint-variable_contains_upcase'
+  gem 'puppet-lint-numericvariable'
+
   gem 'json'
   gem 'webmock'
+  gem 'beaker-rspec', :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']