diff --git a/beaker_puppet_helpers.gemspec b/beaker_puppet_helpers.gemspec
index 9aee6b9..9312c47 100644
--- a/beaker_puppet_helpers.gemspec
+++ b/beaker_puppet_helpers.gemspec
@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker', '>= 4', '< 6'
+  s.add_runtime_dependency 'beaker', '~> 5.2'
   s.add_runtime_dependency 'puppet-modulebuilder', '>= 0.3', '< 2'
 end
diff --git a/lib/beaker_puppet_helpers/dsl.rb b/lib/beaker_puppet_helpers/dsl.rb
index 34d2965..de2df51 100644
--- a/lib/beaker_puppet_helpers/dsl.rb
+++ b/lib/beaker_puppet_helpers/dsl.rb
@@ -173,7 +173,7 @@ def apply_manifest_on(hosts, manifest, opts = {}, &block)
 
         puppet_apply_opts = host[:default_apply_opts].merge(puppet_apply_opts) if host[:default_apply_opts].respond_to? :merge
 
-        file_path = host.tmpfile(%(apply_manifest_#{Time.now.strftime('%H%M%S%L')}.pp))
+        file_path = host.tmpfile(%(apply_manifest_#{Time.now.strftime('%H%M%S%L')}), '.pp')
         begin
           create_remote_file(host, file_path, "#{manifest}\n")
 
diff --git a/lib/beaker_puppet_helpers/install_utils.rb b/lib/beaker_puppet_helpers/install_utils.rb
index 1d8b709..b61c6e1 100644
--- a/lib/beaker_puppet_helpers/install_utils.rb
+++ b/lib/beaker_puppet_helpers/install_utils.rb
@@ -99,8 +99,7 @@ def self.puppet_package_name(host, prefer_aio: true)
     def self.wget_on(host, url)
       extension = File.extname(url)
       name = File.basename(url, extension)
-      # Can't use host.tmpfile since we need to set an extension
-      target = host.exec(Beaker::Command.new("mktemp -t '#{name}-XXXXXX#{extension}'")).stdout.strip
+      target = host.tmpfile(name, extension)
       begin
         host.exec(Beaker::Command.new("wget -O '#{target}' '#{url}'"))
         yield target
diff --git a/lib/beaker_puppet_helpers/module_utils.rb b/lib/beaker_puppet_helpers/module_utils.rb
index 905182d..74cb9bc 100644
--- a/lib/beaker_puppet_helpers/module_utils.rb
+++ b/lib/beaker_puppet_helpers/module_utils.rb
@@ -43,7 +43,7 @@ def install_local_module_on(hosts, source = '.')
       source_path = builder.build
       begin
         block_on hosts do |host|
-          target_file = host.tmpfile('puppet_module')
+          target_file = host.tmpfile('puppet_module', '.tar.gz')
           begin
             host.do_scp_to(source_path, target_file, {})
             install_puppet_module_via_pmt_on(host, target_file)