2 files changed, 2 insertions, 32 deletions
diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb
index 12744a8a7b..bd533e6444 100644
--- a/test/optparse/test_summary.rb
+++ b/test/optparse/test_summary.rb
@@ -1,8 +1,6 @@
-require 'test/unit'
-require 'optparse'
+require 'test_optparse'
 
-class TestOptionParser < Test::Unit::TestCase; end
-class TestOptionParser::SummaryTest < Test::Unit::TestCase
+class TestOptionParser::SummaryTest < TestOptionParser
   def test_short_clash
     r = nil
     o = OptionParser.new do |opts|
diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb
index d40c9da4d4..5ae521e4f6 100644
--- a/test/ruby/test_marshal.rb
+++ b/test/ruby/test_marshal.rb
@@ -72,34 +72,6 @@ class TestMarshal < Test::Unit::TestCase
     assert_equal("marshal data too short", e.message)
   end
 
-  class DumpTest
-    def marshal_dump
-      loop { Thread.pass }
-    end
-  end
-
-  class LoadTest
-    def marshal_dump
-      nil
-    end
-    def marshal_load(obj)
-      loop { Thread.pass }
-    end
-  end
-
-  def test_context_switch
-    o = DumpTest.new
-    Thread.new { Marshal.dump(o) }
-    GC.start
-    assert(true, '[ruby-dev:39425]')
-
-    o = LoadTest.new
-    m = Marshal.dump(o)
-    Thread.new { Marshal.load(m) }
-    GC.start
-    assert(true, '[ruby-dev:39425]')
-  end
-
   def test_taint
     x = Object.new
     x.taint