4 files changed, 8 insertions, 4 deletions
diff --git a/test/executables/tc_puppetbin.rb b/test/executables/tc_puppetbin.rb
index 158666f47..4a3eb7946 100755
--- a/test/executables/tc_puppetbin.rb
+++ b/test/executables/tc_puppetbin.rb
@@ -21,7 +21,8 @@ libdirs = $:.find_all { |dir|
 }
 ENV["RUBYLIB"] = libdirs.join(":")
 
-class TestPuppetBin < ServerTest
+class TestPuppetBin < Test::Unit::TestCase
+	include ServerTest
     def test_version
         output = nil
         assert_nothing_raised {
diff --git a/test/executables/tc_puppetca.rb b/test/executables/tc_puppetca.rb
index 1ef3203e1..61b83b178 100755
--- a/test/executables/tc_puppetca.rb
+++ b/test/executables/tc_puppetca.rb
@@ -21,7 +21,8 @@ libdirs = $:.find_all { |dir|
 }
 ENV["RUBYLIB"] = libdirs.join(":")
 
-class TestPuppetCA < ServerTest
+class TestPuppetCA < Test::Unit::TestCase
+	include ServerTest
     def mkcert(hostname)
         cert = nil
         assert_nothing_raised {
diff --git a/test/executables/tc_puppetd.rb b/test/executables/tc_puppetd.rb
index bc78e6896..e7a55b480 100755
--- a/test/executables/tc_puppetd.rb
+++ b/test/executables/tc_puppetd.rb
@@ -22,7 +22,8 @@ libdirs = $:.find_all { |dir|
 }
 ENV["RUBYLIB"] = libdirs.join(":")
 
-class TestPuppetDExe < ExeTest
+class TestPuppetDExe < Test::Unit::TestCase
+	include ExeTest
     def test_normalstart
         # start the master
         file = startmasterd
diff --git a/test/executables/tc_puppetmasterd.rb b/test/executables/tc_puppetmasterd.rb
index 9367cce80..7051f02a7 100755
--- a/test/executables/tc_puppetmasterd.rb
+++ b/test/executables/tc_puppetmasterd.rb
@@ -14,7 +14,8 @@ require 'facter'
 
 # $Id$
 
-class TestPuppetMasterD < ExeTest
+class TestPuppetMasterD < Test::Unit::TestCase
+	include ExeTest
     def getcerts
         include Puppet::Daemon
         if self.readcerts