diff --git a/onceover.gemspec b/onceover.gemspec
index 034fb31..557b746 100644
--- a/onceover.gemspec
+++ b/onceover.gemspec
@@ -31,12 +31,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'r10k', '>=2.1.0'
   s.add_runtime_dependency 'rake', '>= 10.0.0'
   s.add_runtime_dependency 'rspec', '>= 3.0.0'
-  s.add_runtime_dependency 'rspec-puppet', ">= 2.4.0"
+  s.add_runtime_dependency 'rspec-puppet', ">= 2.4.0", '< 6.0.0'
   s.add_runtime_dependency 'rspec_junit_formatter', '>= 0.2.0'
   s.add_runtime_dependency 'terminal-table', '>= 1.8.0'
   s.add_runtime_dependency 'versionomy', '>= 0.5.0'
 
-  s.add_development_dependency 'cucumber', '~> 4.1'
+  s.add_development_dependency 'cucumber', '>= 4.1', '< 10.0.0'
   s.add_development_dependency 'pry', '~> 0.13.1'
   # We need to depend on rubocop <= 1.12 in order to support Ruby 2.4 (Puppet
   # 5). Once we drop support for Puppet 5 we can re-open this
diff --git a/templates/spec_helper.rb.erb b/templates/spec_helper.rb.erb
index 2b02b1c..b1358a5 100644
--- a/templates/spec_helper.rb.erb
+++ b/templates/spec_helper.rb.erb
@@ -19,11 +19,9 @@ RSpec.configure do |c|
   # Also add JUnit output in case people want to use that
   c.add_formatter('RSpecJUnitFormatter','<%= repo.tempdir %>/spec.xml')
 
-  c.parser                = 'future'
 <% @formatters.each do |fm| -%>
   c.formatter             = '<%= fm %>'
 <% end -%>
-  c.trusted_server_facts  = true
   c.environmentpath       = '<%= environmentpath %>'
   c.module_path           = '<%= modulepath %>'
 <% if repo.hiera_config_file_relative_path %>