diff --git a/ChangeLog b/ChangeLog
index 6ef5a3f60a..3f2ffb792d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 23 19:59:16 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_settracefunc.rb: check the target thread.
+
 Thu Jan 23 14:26:44 2014  Zachary Scott  <e@zzak.io>
 
 	* lib/fileutils.rb: [DOC] Fix typo in options_of() example [Bug #9392]
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index 947178eb37..e1f01315e5 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -1028,6 +1028,7 @@ class TestSetTraceFunc < Test::Unit::TestCase
   def test_a_call
     events = []
     TracePoint.new(:a_call){|tp|
+      next if !target_thread?
       events << tp.event
     }.enable{
       1.times{
@@ -1049,6 +1050,7 @@ class TestSetTraceFunc < Test::Unit::TestCase
   def test_a_return
     events = []
     TracePoint.new(:a_return){|tp|
+      next if !target_thread?
       events << tp.event
     }.enable{
       1.times{