diff --git a/acceptance/tests/ensure_puppet-agent_paths.rb b/acceptance/tests/ensure_puppet-agent_paths.rb
index e04d6f29e..957da48e4 100644
--- a/acceptance/tests/ensure_puppet-agent_paths.rb
+++ b/acceptance/tests/ensure_puppet-agent_paths.rb
@@ -1,161 +1,161 @@
 # ensure installs and code honor new puppet-agent path spec:
 # https://github.com/puppetlabs/puppet-specifications/blob/master/file_paths.md
 test_name 'PUP-4033: Ensure aio path spec is honored'
 
 # include file_exists?
 require 'puppet/acceptance/temp_file_utils'
 extend Puppet::Acceptance::TempFileUtils
 
 def config_options(platform)
   case platform
   when /windows/
     if platform =~ /2003/
       common_app_data = 'C:/Documents and Settings/All Users/Application Data'
     else
       common_app_data = 'C:/ProgramData'
     end
     puppetlabs_data = "#{common_app_data}/PuppetLabs"
 
     codedir = "#{puppetlabs_data}/code"
     confdir = "#{puppetlabs_data}/puppet/etc"
     vardir = "#{puppetlabs_data}/puppet/cache"
     logdir = "#{puppetlabs_data}/puppet/var/log"
     rundir = "#{puppetlabs_data}/puppet/var/run"
     sep = ";"
   else
     codedir = '/etc/puppetlabs/code'
     confdir = '/etc/puppetlabs/puppet'
     vardir = '/opt/puppetlabs/puppet/cache'
     logdir = '/var/log/puppetlabs'
     rundir = '/var/run/puppetlabs'
     sep = ":"
   end
 
   [
     # code
     {:name => :codedir,         :expected => codedir,                     :installed => :dir},
     {:name => :environmentpath, :expected => "#{codedir}/environments"},
     {:name => :hiera_config,    :expected => "#{codedir}/hiera.yaml"},
 
     # confdir
     {:name => :confdir,         :expected => confdir,                     :installed => :dir},
     {:name => :rest_authconfig, :expected => "#{confdir}/auth.conf"},
     {:name => :autosign,        :expected => "#{confdir}/autosign.conf"},
     {:name => :binder_config,   :expected => ""},
     {:name => :csr_attributes,  :expected => "#{confdir}/csr_attributes.yaml"},
     {:name => :trusted_oid_mapping_file, :expected => "#{confdir}/custom_trusted_oid_mapping.yaml"},
     {:name => :deviceconfig,    :expected => "#{confdir}/device.conf"},
     {:name => :fileserverconfig, :expected => "#{confdir}/fileserver.conf"},
     {:name => :config,          :expected => "#{confdir}/puppet.conf",    :installed => :file},
     {:name => :route_file,      :expected => "#{confdir}/routes.yaml"},
     {:name => :ssldir,          :expected => "#{confdir}/ssl",            :installed => :dir},
 
     # vardir
     {:name => :vardir,          :expected => "#{vardir}",                 :installed => :dir},
     {:name => :bucketdir,       :expected => "#{vardir}/bucket"},
     {:name => :clientyamldir,   :expected => "#{vardir}/client_yaml",     :installed => :dir},
     {:name => :client_datadir,  :expected => "#{vardir}/client_data",     :installed => :dir},
     {:name => :clientbucketdir, :expected => "#{vardir}/clientbucket",    :installed => :dir},
     {:name => :devicedir,       :expected => "#{vardir}/devices"},
     {:name => :pluginfactdest,  :expected => "#{vardir}/facts.d",         :installed => :dir},
     {:name => :libdir,          :expected => "#{vardir}/lib",             :installed => :dir},
     {:name => :factpath,        :expected => "#{vardir}/lib/facter#{sep}#{vardir}/facts", :not_path => true},
     {:name => :module_working_dir, :expected => "#{vardir}/puppet-module"},
     {:name => :reportdir,       :expected => "#{vardir}/reports"},
     {:name => :server_datadir,  :expected => "#{vardir}/server_data"},
     {:name => :statedir,        :expected => "#{vardir}/state",           :installed => :dir},
     {:name => :yamldir,         :expected => "#{vardir}/yaml"},
 
     # logdir/rundir
     {:name => :logdir,          :expected => logdir,                      :installed => :dir},
     {:name => :rundir,          :expected => rundir,                      :installed => :dir},
     {:name => :pidfile,         :expected => "#{rundir}/agent.pid"},
   ]
 end
 
 step 'test configprint outputs'
 agents.each do |agent|
-  config_options(agent[:platform]).each do |config_option|
-    on(agent, puppet_agent('--configprint ' "#{config_option[:name]}")) do
-      assert_match(config_option[:expected], stdout)
+  on(agent, puppet_agent('--configprint all')) do
+    config_options(agent[:platform]).each do |config_option|
+      assert_match("#{config_option[:name]} = #{config_option[:expected]}", stdout)
     end
   end
 end
 
 step 'test puppet genconfig entries'
 agents.each do |agent|
   on(agent, puppet_agent('--genconfig')) do
     config_options(agent[:platform]).each do |config_option|
       assert_match("#{config_option[:name]} = #{config_option[:expected]}", stdout)
     end
   end
 end
 
 step 'test puppet config paths exist'
 agents.each do |agent|
   config_options(agent[:platform]).select {|v| !v[:not_path] }.each do |config_option|
     path = config_option[:expected]
     case config_option[:installed]
     when :dir
       if !dir_exists?(agent, path)
         fail_test("Failed to find expected directory '#{path}' on agent '#{agent}'")
       end
     when :file
       if !file_exists?(agent, path)
         fail_test("Failed to find expected file '#{path}' on agent '#{agent}'")
       end
     end
   end
 end
 
 
 # mco.bat removed until it's added back to the MSI
 public_binaries = {
   :posix => ['puppet', 'facter', 'hiera', 'mco', 'cfacter'],
   :win   => ['puppet.bat', 'facter.bat', 'hiera.bat', 'cfacter.bat']
 }
 
 def locations(platform, ruby_arch, type)
   if type != 'aio'
     return '/usr/bin'
   end
 
   case platform
   when /windows/
     # If undefined, ruby_arch defaults to x86
     if ruby_arch == 'x64'
       ruby_arch = /-64/
     else
       ruby_arch = /-32/
     end
     if platform =~ ruby_arch
       return 'C:/Program Files/Puppet Labs/Puppet/bin'
     else
       return 'C:/Program Files (x86)/Puppet Labs/Puppet/bin'
     end
   else
     return '/opt/puppetlabs/bin'
   end
 end
 
 step 'test puppet binaries exist'
 agents.each do |agent|
   dir = locations(agent[:platform], agent[:ruby_arch], @options[:type])
   os = agent['platform'] =~ /windows/ ? :win : :posix
 
   # Filter out cfacter outside of aio, as we don't install it as part of Puppet acceptance runs yet.
   public_binaries[os].select {|v| @options[:type] == 'aio' || v !~ /cfacter/}.each do |binary|
     path = File.join(dir, binary)
     case os
     when :win
       if !file_exists?(agent, path)
         fail_test("Failed to find expected binary '#{path}' on agent '#{agent}'")
       end
     when :posix
       if !link_exists?(agent, path)
         fail_test("Failed to find expected symbolic link '#{path}' on agent '#{agent}'")
       end
     end
   end
 end