diff --git a/Gemfile b/Gemfile
index a4a3b2043..b3cfbe6cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ group :test do
   gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 3.5',  :require => false
+  gem 'puppet_metadata',            :require => false, :git => 'https://github.com/voxpupuli/puppet_metadata.git', :ref => 'refs/pull/122/head'
 end
 
 group :development do
@@ -16,6 +16,8 @@ group :development do
 end
 
 group :system_tests do
+  gem 'beaker',                          :require => false, :git => 'https://github.com/voxpupuli/beaker.git', :ref => 'refs/pull/1853/head'
+  gem 'beaker-hostgenerator',            :require => false, :git => 'https://github.com/voxpupuli/beaker-hostgenerator.git', :ref => 'refs/pull/359/head'
   gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 end
 
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index fc8dc92b0..9ccc4f4b3 100755
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -8,7 +8,8 @@
     install_puppet_module_via_pmt_on(host, 'puppetlabs-apt')
   when 'RedHat'
     # Soft dep on epel for Passenger
-    install_package(host, 'epel-release')
+    install_puppet_module_via_pmt_on(host, 'puppet-epel')
+    apply_manifest('include epel')
   end
 
   # Fake keys.