diff --git a/Gemfile b/Gemfile
index deb0a85..d65b689 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,18 +6,22 @@ else
   gem 'puppet', :require => false
 end
 
-gem 'rake',                   :require => false
-gem 'puppetlabs_spec_helper', :require => false
-gem 'puppet-lint',            :require => false
-gem 'puppet-syntax',          :require => false
-# The patch needed to properly test the nsstools_add_cert() function
-#   https://github.com/rodjek/rspec-puppet/pull/155
-#   https://github.com/rodjek/rspec-puppet/commit/03e94422fb9bbdd950d5a0bec6ead5d76e06616b
-gem 'rspec-puppet',
-  :git => 'https://github.com/rodjek/rspec-puppet.git',
-  :ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5',
-  :require => false
-# rspec 3 spews warnings with rspec-puppet 1.0.1
-gem 'rspec-core', '~> 2.0',   :require => false
+group :development, :test do
+  gem 'rake',                    :require => false
+  gem 'puppetlabs_spec_helper',  :require => false
+  gem 'puppet-lint', '>= 1.1.0', :require => false
+  gem 'puppet-syntax',           :require => false
+  gem 'rspec-puppet',
+    :git     => 'https://github.com/rodjek/rspec-puppet.git',
+    :ref     => 'v2.0.0',
+    :require => false
+end
+
+group :beaker do
+  gem 'serverspec',              :require => false
+  gem 'beaker',                  :require => false
+  gem 'beaker-rspec',            :require => false
+  gem 'pry',                     :require => false
+end
 
 # vim:ft=ruby