diff --git a/Gemfile b/Gemfile
index 31fa1a2..4d6f71a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,9 @@ 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
@@ -13,7 +16,6 @@ group :development, :test do
 
   # Puppet 4.x related lint checks
   gem 'puppet-lint-unquoted_string-check'
-  # Hold off on the empty string check for now
   gem 'puppet-lint-empty_string-check'
   gem 'puppet-lint-leading_zero-check'
   gem 'puppet-lint-variable_contains_upcase'
@@ -25,7 +27,10 @@ group :development, :test do
   else
     gem 'puppet', '~> 3.0', :require => false
   end
+end
 
+group :system_tests do
+  gem 'beaker-rspec', :require => false
 end
 
 # vim:ft=ruby