diff --git a/Gemfile b/Gemfile
index 6c4870f..99014ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,20 +1,16 @@
 source 'https://rubygems.org'
 
-group :test do
-  gem 'rest-client', '~> 1.6.8', :require => false, :platforms => :ruby_18
-end
-
-group :rake, :test do
-  gem 'puppetlabs_spec_helper', '>=0.8.2', :require => false
-  gem 'puppet-blacksmith',       :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-end
-
 group :rake do
-  gem 'rspec-puppet', '>=2.1.0', :require => false
-  gem 'rake',         '>=0.9.2.2'
-  gem 'puppet-lint',  '~> 2.0'
+  gem 'puppetlabs_spec_helper', '~> 1.1', :require => false
+  gem 'rspec-puppet',           '~> 2.3', :require => false
+  gem 'puppet-lint',            '~> 2.0', :require => false
+  gem 'puppet-blacksmith',                :require => false
+  gem 'rake',                             :require => false
+end
+
+group :system_tests do
+  gem 'beaker-rspec', :require => false
+  gem 'beaker',       :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']