diff --git a/Gemfile b/Gemfile
index 7a19099..9a44a82 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,23 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 gemspec
 
-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
-
-
-# We don't put beaker in as a test dependency because we
-# don't want to create a transitive dependency
-group :acceptance_testing do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
-end
-
 group :release do
-  gem 'github_changelog_generator', :require => false
+  gem 'faraday-retry', require: false
+  gem 'github_changelog_generator', require: false
 end
diff --git a/beaker-openstack.gemspec b/beaker-openstack.gemspec
index 5ee4ea8..01bcfef 100644
--- a/beaker-openstack.gemspec
+++ b/beaker-openstack.gemspec
@@ -35,6 +35,5 @@ Gem::Specification.new do |s|
   # Run time dependencies
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
   s.add_runtime_dependency 'fog-openstack', '~> 1.0.0'
-
+  s.add_runtime_dependency 'beaker', '~> 5.6'
 end
-