diff --git a/Puppetfile b/Puppetfile
index 1c56363d5..45c0471cf 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -131,7 +131,7 @@ mod 'nssdb',
   :git => 'https://github.com/rcritten/puppet-nssdb.git'
 
 mod 'ntp',
-  :commit => '413a705d3b61eda9fb3651affb8cf79251c11d98',
+  :commit => 'e02640f066279808e9bd6cfa49b90e7792c0fa00',
   :git => 'https://github.com/puppetlabs/puppetlabs-ntp'
 
 mod 'openstack_extras',
diff --git a/ntp/Gemfile b/ntp/Gemfile
index 2b1b7cd8d..bfe64b186 100644
--- a/ntp/Gemfile
+++ b/ntp/Gemfile
@@ -28,6 +28,7 @@ group :system_tests do
     gem 'beaker-rspec',  :require => false
   end
   gem 'serverspec',    :require => false
+  gem 'beaker-puppet_install_helper', :require => false
 end
 
 
diff --git a/ntp/spec/spec_helper_acceptance.rb b/ntp/spec/spec_helper_acceptance.rb
index 643fadf80..f2ac52d31 100644
--- a/ntp/spec/spec_helper_acceptance.rb
+++ b/ntp/spec/spec_helper_acceptance.rb
@@ -1,26 +1,13 @@
 require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
 
 UNSUPPORTED_PLATFORMS = ['windows', 'Darwin']
 
 unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  # This will install the latest available package on el and deb based
-  # systems fail on windows and osx, and install via gem on other *nixes
-  foss_opts = {
-    :default_action => 'gem_install',
-    :version        => (ENV['PUPPET_VERSION'] || '3.8.1'),
-  }
-
-  if default.is_pe?; then
-    install_pe;
-  else
-    install_puppet(foss_opts);
-  end
+
+  run_puppet_install_helper
 
   hosts.each do |host|
-    unless host.is_pe?
-      on host, "/bin/echo '' > #{host['hieraconf']}"
-    end
-    on host, "mkdir -p #{host['distmoduledir']}"
     if host['platform'] =~ /sles-12/i || host['platform'] =~ /solaris-11/i
       apply_manifest_on(host, 'package{"git":}')
       on host, 'git clone -b 4.6.x https://github.com/puppetlabs/puppetlabs-stdlib /etc/puppetlabs/puppet/modules/stdlib'