9 files changed, 40 insertions, 77 deletions
diff --git a/test/testunit/tests_for_parallel/misc.rb b/test/testunit/tests_for_parallel/misc.rb
deleted file mode 100644
index f60b25d6c3..0000000000
--- a/test/testunit/tests_for_parallel/misc.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# FIXME: more portability code
-if caller(7) && /block in non_options/ =~ caller(7)[0]
-  class TestCaseForParallelTest < Test::Unit::TestCase;end
-else
-  module Test
-    module Unit
-      class Worker
-        def run_tests
-          _run_anything :ptest
-        end
-      end
-      class Runner
-        def run_tests
-          _run_anything :ptest
-        end
-      end
-    end
-  end
-  module MiniTest
-    class Unit
-      class << TestCase
-        alias ptest_suites test_suites
-        def ptest_methods;[];end
-      end
-    end
-  end
-
-  class TestCaseForParallelTest < Test::Unit::TestCase
-    class << self
-      undef ptest_methods
-      def ptest_methods
-        public_instance_methods(true).grep(/^ptest/).map { |m| m.to_s }
-      end
-    end
-  end
-end
diff --git a/test/testunit/tests_for_parallel/ptest_first.rb b/test/testunit/tests_for_parallel/ptest_first.rb
new file mode 100644
index 0000000000..66c7704a45
--- /dev/null
+++ b/test/testunit/tests_for_parallel/ptest_first.rb
@@ -0,0 +1,7 @@
+require 'test/unit'
+
+class TestA < Test::Unit::TestCase
+  def test_nothing_test
+  end
+end
+
diff --git a/test/testunit/tests_for_parallel/ptest_forth.rb b/test/testunit/tests_for_parallel/ptest_forth.rb
new file mode 100644
index 0000000000..c778a2ecc9
--- /dev/null
+++ b/test/testunit/tests_for_parallel/ptest_forth.rb
@@ -0,0 +1,16 @@
+require 'test/unit'
+
+class TestE < Test::Unit::TestCase
+  def test_not_fail
+    assert_equal(1,1)
+  end
+
+  def test_always_skip
+    skip "always"
+  end
+
+  def test_always_fail
+    assert_equal(0,1)
+  end
+end
+
diff --git a/test/testunit/tests_for_parallel/ptest_second.rb b/test/testunit/tests_for_parallel/ptest_second.rb
new file mode 100644
index 0000000000..7004d68493
--- /dev/null
+++ b/test/testunit/tests_for_parallel/ptest_second.rb
@@ -0,0 +1,11 @@
+require 'test/unit'
+
+class TestB < Test::Unit::TestCase
+  def test_nothing
+  end
+end
+
+class TestC < Test::Unit::TestCase
+  def test_nothing
+  end
+end
diff --git a/test/testunit/tests_for_parallel/test_third.rb b/test/testunit/tests_for_parallel/ptest_third.rb
index 61124b291a..338fc32a91 100644
--- a/test/testunit/tests_for_parallel/test_third.rb
+++ b/test/testunit/tests_for_parallel/ptest_third.rb
@@ -1,8 +1,7 @@
 require 'test/unit'
-require_relative "misc.rb"
 
-class TestD < TestCaseForParallelTest
-  def ptest_fail_at_worker
+class TestD < Test::Unit::TestCase
+  def test_fail_at_worker
     #if /test\/unit\/parallel\.rb/ =~ $0
     if on_parallel_worker?
       assert_equal(0,1)
diff --git a/test/testunit/tests_for_parallel/runner.rb b/test/testunit/tests_for_parallel/runner.rb
index 88413effc5..261880ad2b 100644
--- a/test/testunit/tests_for_parallel/runner.rb
+++ b/test/testunit/tests_for_parallel/runner.rb
@@ -1,7 +1,10 @@
 require 'rbconfig'
 require 'test/unit'
-require_relative 'misc'
 
 src_testdir = File.dirname(File.expand_path(__FILE__))
 
+class Test::Unit::Runner
+  @@testfile_prefix = "ptest"
+end
+
 exit Test::Unit::AutoRunner.run(true, src_testdir)
diff --git a/test/testunit/tests_for_parallel/test_first.rb b/test/testunit/tests_for_parallel/test_first.rb
deleted file mode 100644
index 93fcd67e8e..0000000000
--- a/test/testunit/tests_for_parallel/test_first.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'test/unit'
-require_relative "misc.rb"
-
-class TestA < TestCaseForParallelTest
-  def ptest_nothing_test
-  end
-end
-
diff --git a/test/testunit/tests_for_parallel/test_forth.rb b/test/testunit/tests_for_parallel/test_forth.rb
deleted file mode 100644
index 9a4e66f390..0000000000
--- a/test/testunit/tests_for_parallel/test_forth.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'test/unit'
-require_relative "misc.rb"
-
-class TestE < TestCaseForParallelTest
-  def ptest_not_fail
-    assert_equal(1,1)
-  end
-
-  def ptest_always_skip
-    skip "always"
-  end
-
-  def ptest_always_fail
-    assert_equal(0,1)
-  end
-end
-
diff --git a/test/testunit/tests_for_parallel/test_second.rb b/test/testunit/tests_for_parallel/test_second.rb
deleted file mode 100644
index fbc24a8793..0000000000
--- a/test/testunit/tests_for_parallel/test_second.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'test/unit'
-require_relative "misc.rb"
-
-class TestB < TestCaseForParallelTest
-  def ptest_nothing
-  end
-end
-
-class TestC < TestCaseForParallelTest
-  def ptest_nothing
-  end
-end