diff --git a/ChangeLog b/ChangeLog
index 7d222cf05e..6dcd71299a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Oct 29 23:32:36 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* test/profile_test_all.rb: added.
+	  You can use test-all profiler with the following command:
+	    RUBY_TEST_ALL_PROFILE=true make test-all
+	  This command generates ./test_all_profile and you can analyse
+	  which tests consume memories.
+
+	* test/runner.rb: ditto.
+
 Fri Oct 29 10:02:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* tool/enc-unicode.rb,
diff --git a/test/profile_test_all.rb b/test/profile_test_all.rb
new file mode 100644
index 0000000000..52eaf364aa
--- /dev/null
+++ b/test/profile_test_all.rb
@@ -0,0 +1,52 @@
+require 'objspace'
+
+#
+# purpose:
+#  Profile memory usage of each tests.
+#
+# usage:
+#   RUBY_TEST_ALL_PROFILE=true make test-all
+#
+# output:
+#   ./test_all_profile
+#
+# collected information:
+#   - ObjectSpace.memsize_of_all
+#   - GC.stat
+#   - /proc/self/statm (if it exists)
+#
+
+class MiniTest::Unit::TestCase
+  alias orig_run run
+
+  $test_all_profile_out = open('test_all_profile', 'w')
+  $test_all_profile_gc_stat_hash = {}
+
+  if FileTest.exist?('/proc/self/statm')
+    # for Linux (only?)
+    $test_all_profile_out.puts "name\tmemsize_of_all\t" +
+                                 (GC.stat.keys +
+                                  %w(size resident share text lib data dt)).join("\t")
+
+    def memprofile_test_all_result_result
+      "#{self.class}\##{self.__name__}\t" \
+      "#{ObjectSpace.memsize_of_all}\t" \
+      "#{GC.stat($test_all_profile_gc_stat_hash).values.join("\t")}\t" \
+      "#{File.read('/proc/self/statm').split(/\s+/).join("\t")}"
+    end
+  else
+    $test_all_profile_out.puts "name\tmemsize_of_alls\t" + GC.stat.keys.join("\t")
+    def memprofile_test_all_result_result
+      "#{self.class}\##{self.__name__}\t" \
+      "#{ObjectSpace.memsize_of_all}\t" \
+      "#{GC.stat($test_all_profile_gc_stat_hash).values.join("\t")}"
+    end
+  end
+
+  def run runner
+    result = orig_run(runner)
+    $test_all_profile_out.puts memprofile_test_all_result_result
+    $test_all_profile_out.flush
+    result
+  end
+end
diff --git a/test/runner.rb b/test/runner.rb
index c92cb2670f..b96081e7e2 100644
--- a/test/runner.rb
+++ b/test/runner.rb
@@ -6,6 +6,8 @@ require 'test/unit'
 src_testdir = File.dirname(File.expand_path(__FILE__))
 srcdir = File.dirname(src_testdir)
 
+require_relative 'profile_test_all' if ENV['RUBY_TEST_ALL_PROFILE'] == 'true'
+
 tests = Test::Unit.new {|files, options|
   options[:base_directory] = src_testdir
   if files.empty?