diff --git a/acceptance/tests/allow_arbitrary_node_name_fact_for_apply.rb b/acceptance/tests/allow_arbitrary_node_name_fact_for_apply.rb
index d7cf2dcac..e4a1f8cc0 100644
--- a/acceptance/tests/allow_arbitrary_node_name_fact_for_apply.rb
+++ b/acceptance/tests/allow_arbitrary_node_name_fact_for_apply.rb
@@ -1,30 +1,33 @@
 test_name "node_name_fact should be used to determine the node name for puppet apply"
 
 success_message = "node_name_fact setting was correctly used to determine the node name"
 
 node_names = []
 
 on agents, facter('kernel') do
   node_names << stdout.chomp
 end
 
 node_names.uniq!
 
 manifest = %Q[
   Exec { path => "/usr/bin:/bin" }
   node default {
     exec { "false": }
   }
 ]
 
 node_names.each do |node_name|
   manifest << %Q[
     node "#{node_name}" {
-      exec { "echo #{success_message}": }
+      exec { "%s": }
     }
   ]
 end
 
-on agents, puppet_apply("--verbose --node_name_fact kernel"), :stdin => manifest do
-  assert_match(success_message, stdout)
+agents.each do |agent|
+  echo_cmd = agent.echo(success_message)
+  on agent, puppet_apply("--verbose --node_name_fact kernel"), :stdin => manifest % echo_cmd do
+    assert_match(/#{success_message}.*executed successfully/, stdout)
+  end
 end
diff --git a/acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb b/acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb
index 2dbbb3ef4..0605dd373 100644
--- a/acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb
+++ b/acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb
@@ -1,15 +1,15 @@
 test_name "#3172: puppet kick with hostnames on the command line"
 step "verify that we trigger our host"
 
 target = 'working.example.org'
 agents.each do |host|
   if host['platform'].include?('windows')
     on(host, puppet_kick(target), :acceptable_exit_codes => [1]) {
-      assert_match(/Puppet kick is not supported/, stdout)
+      assert_match(/Puppet kick is not supported/, stderr)
     }
   else
     on(host, puppet_kick(target), :acceptable_exit_codes => [3]) {
       assert_match(/Triggering #{target}/, stdout, "didn't trigger #{target} on #{host}" )
     }
   end
 end