1 files changed, 5 insertions, 20 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 8a1907f..4d85e7d 100755
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,36 +1,21 @@
 #! /usr/bin/env ruby -S rspec
+require 'puppet'
 require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
-
-UNSUPPORTED_PLATFORMS = []
+require 'beaker/module_install_helper'
 
 run_puppet_install_helper
+install_ca_certs unless ENV['PUPPET_INSTALL_TYPE'] =~ /pe/i
+install_module_on(hosts)
+install_module_dependencies_on(hosts)
 
 RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
   # Readable test descriptions
   c.formatter = :documentation
 
   # Configure all nodes in nodeset
   c.before :suite do
-    if ENV['FUTURE_PARSER'] == 'yes'
-      default[:default_apply_opts] ||= {}
-      default[:default_apply_opts].merge!({:parser => 'future'})
-    end
-
-    copy_root_module_to(default, :source => proj_root, :module_name => 'stdlib')
-  end
-end
-
-def is_future_parser_enabled?
-  if default[:type] == 'aio' || ENV['PUPPET_INSTALL_TYPE'] == 'agent'
-    return true
-  elsif default[:default_apply_opts]
-    return default[:default_apply_opts][:parser] == 'future'
   end
-  return false
 end
 
 def get_puppet_version