diff --git a/Gemfile b/Gemfile
index fe3741cf..62a287f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,15 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
+def location_for(place, fake_version = nil)
+  if place =~ /^(git:[^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
+
 group :development, :test do
   gem 'nokogiri'
   gem 'mime-types', '<2.0',     :require => false
@@ -9,11 +19,24 @@ group :development, :test do
   gem 'puppet-lint',            :require => false
   gem 'simplecov',              :require => false
   gem 'rspec',                  :require => false
-  gem 'beaker-rspec',           :require => false
   gem 'yard',                   :require => false
   gem 'pry',                    :require => false
 end
 
+beaker_version = ENV['BEAKER_VERSION']
+beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
+group :system_tests do
+  if beaker_version
+    gem 'beaker', *location_for(beaker_version)
+  end
+  if beaker_rspec_version
+    gem 'beaker-rspec', *location_for(beaker_rspec_version)
+  else
+    gem 'beaker-rspec',  :require => false
+  end
+  gem 'serverspec',    :require => false
+end
+
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion,  :require => false
 else