4 files changed, 10 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
diff --git a/test/lib/puppettest/exetest.rb b/test/lib/puppettest/exetest.rb
index be148a169..05de56c0f 100644
--- a/test/lib/puppettest/exetest.rb
+++ b/test/lib/puppettest/exetest.rb
@@ -54,6 +54,7 @@ module PuppetTest::ExeTest
         args += " --confdir %s" % Puppet[:confdir]
         args += " --rundir %s" % File.join(Puppet[:vardir], "run")
         args += " --vardir %s" % Puppet[:vardir]
+        args += " --certdnsnames %s" % Puppet[:certdnsnames]
         args += " --masterport %s" % @@port
         args += " --user %s" % Puppet::Util::SUIDManager.uid
         args += " --group %s" % Puppet::Util::SUIDManager.gid
diff --git a/test/ral/types/filesources.rb b/test/ral/types/filesources.rb
index 6180eed18..0f283be79 100755
--- a/test/ral/types/filesources.rb
+++ b/test/ral/types/filesources.rb
@@ -547,6 +547,7 @@ class TestFileSources < Test::Unit::TestCase
 
         Puppet[:masterport] = 8762
         Puppet[:name] = "puppetmasterd"
+        Puppet[:certdnsnames] = "localhost"
 
         serverpid = nil
         assert_nothing_raised() {
@@ -592,6 +593,7 @@ class TestFileSources < Test::Unit::TestCase
 
         Puppet[:autosign] = true
         Puppet[:masterport] = @port
+        Puppet[:certdnsnames] = "localhost"
 
         serverpid = nil
         assert_nothing_raised("Could not start on port %s" % @port) {