diff --git a/acceptance/config/git/options.rb b/acceptance/config/git/options.rb
index 9a47e1d72..f841b593e 100644
--- a/acceptance/config/git/options.rb
+++ b/acceptance/config/git/options.rb
@@ -1,18 +1,17 @@
 {
   :install => [
     'facter#stable',
     'hiera#stable',
     'puppet',
   ],
   :pre_suite => [
     'setup/git/pre-suite/000_EnvSetup.rb',
     'setup/git/pre-suite/010_TestSetup.rb',
     'setup/git/pre-suite/020_PuppetUserAndGroup.rb',
     'setup/common/pre-suite/025_StopFirewall.rb',
     'setup/git/pre-suite/030_PuppetMasterSanity.rb',
     'setup/common/pre-suite/040_ValidateSignCert.rb',
     'setup/git/pre-suite/060_InstallModules.rb',
     'setup/common/pre-suite/070_InstallCACerts.rb',
-    'setup/common/pre-suite/100_SetParser.rb',
   ],
 }
diff --git a/acceptance/config/packages/options.rb b/acceptance/config/packages/options.rb
index f7370612d..4b563435e 100644
--- a/acceptance/config/packages/options.rb
+++ b/acceptance/config/packages/options.rb
@@ -1,12 +1,11 @@
 {
   :type => 'foss-packages',
   :pre_suite => [
     'setup/packages/pre-suite/010_Install.rb',
     'setup/packages/pre-suite/015_PackageHostsPresets.rb',
     'setup/common/pre-suite/025_StopFirewall.rb',
     'setup/common/pre-suite/040_ValidateSignCert.rb',
     'setup/packages/pre-suite/045_EnsureMasterStartedOnPassenger.rb',
     'setup/common/pre-suite/070_InstallCACerts.rb',
-    'setup/common/pre-suite/100_SetParser.rb',
   ],
 }
diff --git a/acceptance/setup/common/pre-suite/100_SetParser.rb b/acceptance/setup/common/pre-suite/100_SetParser.rb
deleted file mode 100644
index 99d0d67bd..000000000
--- a/acceptance/setup/common/pre-suite/100_SetParser.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-test_name "add parser=#{ENV['PARSER']} to all puppet.conf (only if $PARSER is set)" do
-
-  parser = ENV['PARSER']
-  next if parser.nil?
-
-  hosts.each do |host|
-    step "adjust #{host} puppet.conf" do
-      temp = host.tmpdir('parser-set')
-      opts = {
-        'main' => {
-           'parser' => parser
-        }
-      }
-      lay_down_new_puppet_conf(host, opts, temp)
-    end
-  end
-end