diff --git a/ChangeLog b/ChangeLog
index 03bc6072d8..27efff5d33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 27 11:27:50 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#_prepare_run): fix operator
+	  precedence, so that platform and TERM should be counted.
+
 Sun May 27 10:02:33 2012  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* ext/date/date_strftime.c: allows %Ok and %Ol.
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index b48f49815b..3048adefac 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -671,7 +671,7 @@ module Test
         when :always
           color = true
         when :auto, nil
-          color = @options[:job_status] == :replace and /mswin|mingw/ !~ RUBY_PLATFORM and /dumb/ !~ ENV["TERM"]
+          color = @options[:job_status] == :replace && /mswin|mingw/ !~ RUBY_PLATFORM && /dumb/ !~ ENV["TERM"]
         else
           color = false
         end