diff --git a/acceptance/tests/environment/agent_runs_pluginsync_with_proper_environment.rb b/acceptance/tests/environment/agent_runs_pluginsync_with_proper_environment.rb
index 828344988..99103b16b 100644
--- a/acceptance/tests/environment/agent_runs_pluginsync_with_proper_environment.rb
+++ b/acceptance/tests/environment/agent_runs_pluginsync_with_proper_environment.rb
@@ -1,63 +1,63 @@
 # We noticed some strange behavior if an environment was changed between the
 # time where the node retrieved facts for itself and the catalog retrieved
 # facts puppet could pluginsync with the incorrect environment. For more
 # details see PUP-3591.
 test_name "Agent should pluginsync with the environment the agent resolves to"
 
 testdir = create_tmpdir_for_user master, 'environment_resolve'
 
 create_remote_file master, "#{testdir}/enc.rb", <<END
 #!#{master['puppetbindir']}/ruby
 filename = '#{testdir}/enc.lock'
 if !File.exists?(filename)
   puts "environment: production"
   f = File.new(filename, 'w')
   f.write("locked")
   f.close()
 else
   puts "environment: correct"
 end
 END
 on master, "chmod 755 #{testdir}/enc.rb"
 
 apply_manifest_on(master, <<-MANIFEST, :catch_failures => true)
   File {
     ensure => directory,
     mode => "0770",
     owner => #{master.puppet['user']},
     group => #{master.puppet['group']},
   }
   file {
     '#{testdir}/environments':;
     '#{testdir}/environments/production':;
     '#{testdir}/environments/correct/':;
     '#{testdir}/environments/correct/modules':;
     '#{testdir}/environments/correct/modules/amod':;
     '#{testdir}/environments/correct/modules/amod/lib':;
     '#{testdir}/environments/correct/modules/amod/lib/puppet':;
   }
   file { '#{testdir}/environments/correct/modules/amod/lib/puppet/foo.rb':
     ensure => file,
     mode => "0640",
     content => "#correct_version",
   }
 MANIFEST
 
 master_opts = {
   'main' => {
     'environmentpath' => "#{testdir}/environments",
   },
   'master' => {
     'node_terminus' => 'exec',
     'external_nodes' => "#{testdir}/enc.rb"
   },
 }
 
 with_puppet_running_on master, master_opts, testdir do
   agents.each do |agent|
-    run_agent_on(agent, "--no-daemonize --onetime --server #{master}")
-    on agent, "cat \"#{agent.puppet['vardir']}/lib/puppet/foo.rb\""
+    on(agent, puppet("agent", "-t", "--server #{master}"))
+    on(agent, "cat \"#{agent.puppet['vardir']}/lib/puppet/foo.rb\"")
     assert_match(/#correct_version/, stdout, "The plugin from environment 'correct' was not synced")
-    on agent, "rm -rf \"#{agent.puppet['vardir']}/lib\""
+    on(agent, "rm -rf \"#{agent.puppet['vardir']}/lib\"")
   end
 end
diff --git a/acceptance/tests/environment/use_enc_environment_for_pluginsync.rb b/acceptance/tests/environment/use_enc_environment_for_pluginsync.rb
index 22089df89..be1c26f03 100644
--- a/acceptance/tests/environment/use_enc_environment_for_pluginsync.rb
+++ b/acceptance/tests/environment/use_enc_environment_for_pluginsync.rb
@@ -1,55 +1,56 @@
 test_name "Agent should use environment given by ENC for pluginsync"
 
 testdir = create_tmpdir_for_user master, 'respect_enc_test'
 
 create_remote_file master, "#{testdir}/enc.rb", <<END
 #!#{master['puppetbindir']}/ruby
 puts <<YAML
 parameters:
 environment: special
 YAML
 END
 on master, "chmod 755 #{testdir}/enc.rb"
 
 apply_manifest_on(master, <<-MANIFEST, :catch_failures => true)
   File {
     ensure => directory,
     mode => "0770",
     owner => #{master.puppet['user']},
     group => #{master.puppet['group']},
   }
   file {
     '#{testdir}/environments':;
     '#{testdir}/environments/production':;
     '#{testdir}/environments/special/':;
     '#{testdir}/environments/special/modules':;
     '#{testdir}/environments/special/modules/amod':;
     '#{testdir}/environments/special/modules/amod/lib':;
     '#{testdir}/environments/special/modules/amod/lib/puppet':;
   }
   file { '#{testdir}/environments/special/modules/amod/lib/puppet/foo.rb':
     ensure => file,
     mode => "0640",
     content => "#special_version",
   }
 MANIFEST
 
 master_opts = {
   'main' => {
     'environmentpath' => "#{testdir}/environments",
   },
   'master' => {
     'node_terminus' => 'exec',
     'external_nodes' => "#{testdir}/enc.rb"
   },
 }
 
 with_puppet_running_on master, master_opts, testdir do
 
   agents.each do |agent|
+    agent_vardir = agent.puppet['vardir']
     run_agent_on(agent, "--no-daemonize --onetime --server #{master}")
-    on agent, "cat \"#{agent.puppet['vardir']}/lib/puppet/foo.rb\""
+    on agent, "cat \"#{agent_vardir}/lib/puppet/foo.rb\""
     assert_match(/#special_version/, stdout, "The plugin from environment 'special' was not synced")
-    on agent, "rm -rf \"#{agent.puppet['vardir']}/lib\""
+    on agent, "rm -rf \"#{agent_vardir}/lib\""
   end
 end