diff --git a/Gemfile b/Gemfile
index 13ca5e6..77480e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,63 +1,54 @@
 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 :test do
   gem 'puppetlabs_spec_helper',                                     require: false
   gem 'rspec-puppet',                                               require: false, git: 'https://github.com/rodjek/rspec-puppet.git'
   gem 'rspec-puppet-facts',                                         require: false
   gem 'rspec-puppet-utils',                                         require: false
   gem 'puppet-lint-absolute_classname-check',                       require: false
   gem 'puppet-lint-leading_zero-check',                             require: false
   gem 'puppet-lint-trailing_comma-check',                           require: false
   gem 'puppet-lint-version_comparison-check',                       require: false
   gem 'puppet-lint-classes_and_types_beginning_with_digits-check',  require: false
   gem 'puppet-lint-unquoted_string-check',                          require: false
   gem 'puppet-lint-variable_contains_upcase',                       require: false
   gem 'metadata-json-lint',                                         require: false
   gem 'puppet-blacksmith',                                          require: false
   gem 'voxpupuli-release',                                          require: false, git: 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
   gem 'rubocop-rspec', '~> 1.5',                                    require: false if RUBY_VERSION >= '2.2.0'
   gem 'json_pure', '<= 2.0.1',                                      require: false if RUBY_VERSION < '2.0.0'
   gem 'rspec-its',                                                  require: false
 end
 
 group :development do
   gem 'travis',       require: false
   gem 'travis-lint',  require: false
   gem 'guard-rake',   require: false
 end
 
 group :system_tests do
-  gem 'serverspec',    :require => false
-  if (beaker_version = ENV['BEAKER_VERSION'])
-    gem 'beaker', *location_for(beaker_version)
-  end
-  if (beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION'])
-    gem 'beaker-rspec', *location_for(beaker_rspec_version)
-  else
-    gem 'beaker-rspec',  require: false
-  end
-  gem 'beaker-puppet_install_helper',  require: false
+  gem 'serverspec', require: false
+  gem 'beaker-rspec', require: false
+  gem 'beaker-puppet_install_helper', require: false
 end
 
-
-
 if (facterversion = ENV['FACTER_GEM_VERSION'])
   gem 'facter', facterversion.to_s, require: false, groups: [:test]
 else
   gem 'facter', require: false, groups: [:test]
 end
 
 ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
 gem 'puppet', puppetversion, require: false, groups: [:test]
 
 # vim: syntax=ruby