2 files changed, 7 insertions, 0 deletions
diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb
index 3dd3856fd..d770ff91e 100755
--- a/test/executables/puppetd.rb
+++ b/test/executables/puppetd.rb
@@ -12,9 +12,11 @@ class TestPuppetDExe < Test::Unit::TestCase
     include PuppetTest::ExeTest
     def setup
         super
+        Puppet[:certdnsnames] = "localhost"
         # start the master
         @manifest = startmasterd
 
+
         @cmd = "puppetd"
         @cmd += " --verbose"
         @cmd += " --test"
diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb
index 16f7f0f5c..6d4ddf56f 100755
--- a/test/executables/puppetmasterd.rb
+++ b/test/executables/puppetmasterd.rb
@@ -9,6 +9,11 @@ require 'socket'
 
 class TestPuppetMasterD < Test::Unit::TestCase
     include PuppetTest::ExeTest
+    def setup
+        super
+        Puppet[:certdnsnames] = "localhost"
+    end
+
     def getcerts
         include Puppet::Daemon
         if self.readcerts