diff --git a/spec/acceptance/hiera_spec.rb b/spec/acceptance/hiera_spec.rb
index 2bac176..26adb79 100644
--- a/spec/acceptance/hiera_spec.rb
+++ b/spec/acceptance/hiera_spec.rb
@@ -84,7 +84,7 @@ class myclass {
 
     it 'finds it in puppet agent' do
       make_site_pp(default, pp, manifestsdir)
-      expect(on(default, puppet('agent', '-t', '--server', '$(hostname -f)'), acceptable_exit_codes: [0, 2]).stdout.strip).to match(%r{found output})
+      expect(on(default, 'puppet agent -t --server $(hostname -f)', acceptable_exit_codes: [0, 2]).stdout.strip).to match(%r{found output})
     end
   end
 end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 40b745a..4a5f052 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -3,10 +3,10 @@
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
 configure_beaker do |host|
-  install_module_from_forge_on(host, 'puppetlabs-puppetserver_gem', '>= 0')
+  install_module_via_pmt_on(host, 'puppetlabs-puppetserver_gem', '>= 0')
   unless ENV['BEAKER_provision'] == 'no'
     install_package(host, 'puppetserver')
-    on host, puppet('resource', 'service', 'puppetserver', 'ensure=running')
+    on host, 'puppet resource service puppetserver ensure=running'
   end
 end
 
@@ -26,7 +26,7 @@ def wait_for_puppetserver(host, max_retries)
 def make_site_pp(host, pp, path)
   on host, "mkdir -p #{path}"
   create_remote_file(host, File.join(path, 'site.pp'), pp)
-  on host, "chown -R #{puppet_user(host)}:#{puppet_group(host)} #{path}"
+  on host, "chown -R puppet:puppet #{path}"
   on host, "chmod -R 0755 #{path}"
   on host, 'service puppetserver restart'
   wait_for_puppetserver(host, 3)