5 files changed, 6 insertions, 5 deletions
diff --git a/test/other/tc_log.rb b/test/other/tc_log.rb
index edfb44f8e..b00024636 100644
--- a/test/other/tc_log.rb
+++ b/test/other/tc_log.rb
@@ -16,6 +16,7 @@ class TestLog < Test::Unit::TestCase
     def teardown
         system("rm -f %s" % @@logfile)
         Puppet::Log.destination(:console)
+        Puppet[:loglevel] = :notice
     end
 
     def getlevels
diff --git a/test/other/tc_metrics.rb b/test/other/tc_metrics.rb
index 5c0f33fd0..1dd73a305 100644
--- a/test/other/tc_metrics.rb
+++ b/test/other/tc_metrics.rb
@@ -48,7 +48,7 @@ class TestMetric < Test::Unit::TestCase
     def setup
         Puppet[:rrddir] = File.join(Dir.getwd,"rrdtests")
         Puppet[:rrdgraph] = true
-        Puppet[:loglevel] = :debug
+        Puppet[:loglevel] = :debug if __FILE__ == $0
     end
 
     def teardown
diff --git a/test/other/tc_selector.rb b/test/other/tc_selector.rb
index 1f01ea87a..7c8ffbd68 100644
--- a/test/other/tc_selector.rb
+++ b/test/other/tc_selector.rb
@@ -13,11 +13,11 @@ class TestSelector < Test::Unit::TestCase
     def setup
         @os = Puppet::Fact["operatingsystem"]
         @hostname = Puppet::Fact["hostname"]
+
+        Puppet[:loglevel] = :debug if __FILE__ == $0
     end
 
     def test_values
-        Puppet[:debug] = 1
-
         selector = nil
         assert_nothing_raised() {
             selector = Puppet::Selector.new { |select|
diff --git a/test/other/tc_state.rb b/test/other/tc_state.rb
index bd8d1c24e..5ab5a7cb3 100644
--- a/test/other/tc_state.rb
+++ b/test/other/tc_state.rb
@@ -11,7 +11,7 @@ require 'test/unit'
 
 class TestStorage < Test::Unit::TestCase
     def setup
-        Puppet[:debug] = true
+        Puppet[:loglevel] = :debug if __FILE__ == $0
         Puppet[:statefile] = "/var/tmp/puppetteststate"
     end
 
diff --git a/test/other/tc_transactions.rb b/test/other/tc_transactions.rb
index d5f2c5da7..ec1b9f277 100644
--- a/test/other/tc_transactions.rb
+++ b/test/other/tc_transactions.rb
@@ -11,7 +11,7 @@ require 'test/unit'
 
 class TestTransactions < Test::Unit::TestCase
     def setup
-        Puppet[:debug] = true
+        Puppet[:loglevel] = :debug if __FILE__ == $0
 
         @groups = %x{groups}.chomp.split(/ /)
         unless @groups.length > 1