diff --git a/ChangeLog b/ChangeLog
index 1c205462a5..4582b5ebf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep 30 07:46:07 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rdoc/test_rdoc_markup_attribute_manager.rb: Test with clean
+	  SPECIALS.
+	* test/rubygems/gemutilities.rb: Restore ENV['HOME'] after test.
+	* test/runner.rb: Pass -n argument down to miniunit.
+
 Tue Sep 30 01:02:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (token_info_push, token_info_pop): do nothing for evaled
diff --git a/test/rdoc/test_rdoc_markup_attribute_manager.rb b/test/rdoc/test_rdoc_markup_attribute_manager.rb
index eea87822a8..cf10ff9f2f 100644
--- a/test/rdoc/test_rdoc_markup_attribute_manager.rb
+++ b/test/rdoc/test_rdoc_markup_attribute_manager.rb
@@ -5,6 +5,9 @@ require "rdoc/markup/to_html_crossref"
 class TestRDocMarkupAttributeManager < Test::Unit::TestCase
 
   def setup
+    @orig_special = RDoc::Markup::AttributeManager::SPECIAL
+    RDoc::Markup::AttributeManager::SPECIAL.replace Hash.new
+
     @am = RDoc::Markup::AttributeManager.new
 
     @bold_on  = @am.changed_attribute_by_name([], [:BOLD])
@@ -28,6 +31,10 @@ class TestRDocMarkupAttributeManager < Test::Unit::TestCase
     @wombat_off   = @am.changed_attribute_by_name([:WOMBAT], [])
   end
 
+  def teardown
+    RDoc::Markup::AttributeManager::SPECIAL.replace @orig_special
+  end
+
   def crossref(text)
     crossref_bitmap = RDoc::Markup::Attribute.bitmap_for(:_SPECIAL_) |
                       RDoc::Markup::Attribute.bitmap_for(:CROSSREF)
diff --git a/test/rubygems/gemutilities.rb b/test/rubygems/gemutilities.rb
index 8083875f43..f118f89a7b 100644
--- a/test/rubygems/gemutilities.rb
+++ b/test/rubygems/gemutilities.rb
@@ -57,6 +57,7 @@ class RubyGemTestCase < Test::Unit::TestCase
     @latest_usrcache = File.join(@gemhome, ".gem", "latest_user_cache")
     @userhome = File.join @tempdir, 'userhome'
 
+    @orig_ENV_HOME = ENV['HOME']
     ENV['HOME'] = @userhome
     Gem.instance_variable_set :@user_home, nil
 
@@ -131,6 +132,12 @@ class RubyGemTestCase < Test::Unit::TestCase
     ENV.delete 'GEM_PATH'
 
     Gem.clear_paths
+
+    if @orig_ENV_HOME then
+      ENV['HOME'] = @orig_ENV_HOME
+    else
+      ENV.delete 'HOME'
+    end
   end
 
   def install_gem gem
diff --git a/test/runner.rb b/test/runner.rb
index fb72c71556..fe827f921c 100644
--- a/test/runner.rb
+++ b/test/runner.rb
@@ -33,6 +33,8 @@ until ARGV.empty? do
     other.push(*ARGV)
     ARGV.clear
     break
+  when /^-(n|-name)$/ then
+    other.push arg, ARGV.shift
   when /^-/ then
     other << arg
   else