diff --git a/Gemfile b/Gemfile
index c2e58ed..74a16f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,15 +10,18 @@ def location_for(place, fake_version = nil)
   end
 end
 
-group :development, :test do
+group :development, :unit_tests do
   gem 'rake', '~> 10.1.0',       :require => false
   gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
   gem 'puppet-lint',             :require => false
   gem 'pry',                     :require => false
   gem 'simplecov',               :require => false
+end
+
+group :system_tests do
   gem 'beaker-rspec',            :require => false
+  gem 'serverspec',              :require => false
 end
 
 ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']