diff --git a/ChangeLog b/ChangeLog
index 056f2cfe6a..bebf51eae9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 16 07:12:28 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/runner.rb (main): ignore -j option for compatibility
+	  with test/unit.
+
 Sat Jun 16 07:11:52 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/test/unit.rb (Test::Unit::Runner#puke): modify only result and
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index 40faa04234..95981eeca2 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -105,6 +105,8 @@ Usage: #{File.basename($0, '.*')} --ruby=PATH [--sets=NAME,NAME,...]
     -h, --help                      Print this message and quit.
 End
       exit true
+    when /\A-j/
+      true
     else
       false
     end