diff --git a/ChangeLog b/ChangeLog
index c5540dc6e3..5383162367 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 23 00:40:10 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/test_syslog.rb: Fix to make a lot of test failure if
+	  the platform doesn't support syslog.
+
 Sat Jan 22 11:49:55 2011  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support
diff --git a/test/test_syslog.rb b/test/test_syslog.rb
index e9fc375c90..fe865bdd18 100644
--- a/test/test_syslog.rb
+++ b/test/test_syslog.rb
@@ -6,7 +6,12 @@
 # If in doubt, ask your admin.
 
 require 'test/unit'
-require 'syslog'
+
+begin
+  require 'syslog'
+rescue LoadError
+  # suppress error messages.
+end
 
 class TestSyslog < Test::Unit::TestCase
   def test_new
@@ -159,4 +164,4 @@ class TestSyslog < Test::Unit::TestCase
 
     assert_equal(format('<#%s: opened=false>', Syslog), Syslog.inspect)
   end
-end
+end if defined?(Syslog)