diff --git a/Gemfile b/Gemfile
index a9e0734a4..cc4048aec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,11 +21,15 @@ group :development, :unit_tests do
   gem 'json',                    :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  
+  else
     gem 'beaker-rspec',  :require => false
   end
   gem 'serverspec',    :require => false