3 files changed, 2 insertions, 3 deletions
diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb
index 4c1d2a24c..d075d8431 100755
--- a/test/executables/puppetbin.rb
+++ b/test/executables/puppetbin.rb
@@ -31,7 +31,7 @@ class TestPuppetBin < Test::Unit::TestCase
 
     def test_execution
         file = mktestmanifest()
-        @@tmpfiles << "/tmp/puppetbintesting"
+        @@tmpfiles << tempfile()
 
         output = nil
         cmd = "puppet"
diff --git a/test/executables/puppetca.rb b/test/executables/puppetca.rb
index 2fed58557..819ecf702 100755
--- a/test/executables/puppetca.rb
+++ b/test/executables/puppetca.rb
@@ -37,7 +37,7 @@ class TestPuppetCA < Test::Unit::TestCase
 
     def test_signing
         ca = nil
-        Puppet[:ssldir] = "/tmp/puppetcatest"
+        Puppet[:ssldir] = tempfile()
         @@tmpfiles << Puppet[:ssldir]
         Puppet[:autosign] = false
         assert_nothing_raised {
diff --git a/test/executables/puppetmodule.rb b/test/executables/puppetmodule.rb
index ba356f6cc..2e97a963a 100755
--- a/test/executables/puppetmodule.rb
+++ b/test/executables/puppetmodule.rb
@@ -47,7 +47,6 @@ class TestPuppetModule < Test::Unit::TestCase
 
         ENV["CFALLCLASSES"] = "yaytest:all"
 
-        Puppet.err :mark
         assert_nothing_raised {
             system(cmd + " " + file)
         }