3 files changed, 11 insertions, 2 deletions
diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb
index 4a3eb7946..3f9ebda78 100755
--- a/test/executables/puppetbin.rb
+++ b/test/executables/puppetbin.rb
@@ -36,8 +36,15 @@ class TestPuppetBin < Test::Unit::TestCase
         @@tmpfiles << "/tmp/puppetbintesting"
 
         output = nil
+        cmd = "puppet"
+        cmd += " --verbose"
+        #cmd += " --fqdn %s" % fqdn
+        cmd += " --confdir %s" % Puppet[:puppetconf]
+        cmd += " --vardir %s" % Puppet[:puppetvar]
+        cmd += " --logdest %s" % "/dev/null"
+
         assert_nothing_raised {
-            system("puppet --logdest /dev/null %s" % file)
+            system(cmd + " " + file)
         }
         assert($? == 0, "Puppet exited with code %s" % $?.to_i)
 
diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb
index 72cf1f031..547405779 100755
--- a/test/executables/puppetd.rb
+++ b/test/executables/puppetd.rb
@@ -38,7 +38,8 @@ class TestPuppetDExe < Test::Unit::TestCase
         cmd += " --verbose"
         #cmd += " --fqdn %s" % fqdn
         cmd += " --port %s" % @@port
-        cmd += " --ssldir %s" % Puppet[:ssldir]
+        cmd += " --confdir %s" % Puppet[:puppetconf]
+        cmd += " --vardir %s" % Puppet[:puppetvar]
         cmd += " --server localhost"
 
         # and verify our daemon runs
diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb
index 7051f02a7..6b67e5e37 100755
--- a/test/executables/puppetmasterd.rb
+++ b/test/executables/puppetmasterd.rb
@@ -81,6 +81,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
         assert_instance_of(Puppet::TransBucket, retval,
             "Retrieved non-transportable object")
         stopmasterd
+        sleep(1)
     end
 
     # verify that we can run puppetmasterd in parse-only mode