diff --git a/Gemfile b/Gemfile
index 439ed4f..4d6f71a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,12 +3,20 @@ source 'https://rubygems.org'
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
 
+  # Pin google-api-client after it released a ruby 2.0 only version
+  gem 'google-api-client', '0.9.4'
+
   gem 'metadata-json-lint'
+  # This is nice and all, but let's not worry about it until we've actually
+  # got puppet 4.x sorted
+  # 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-empty_string-check'
   gem 'puppet-lint-leading_zero-check'
   gem 'puppet-lint-variable_contains_upcase'
   gem 'puppet-lint-spaceship_operator_without_tag-check'