1 files changed, 10 insertions, 4 deletions
diff --git a/spec/ruby/core/tracepoint/self_spec.rb b/spec/ruby/core/tracepoint/self_spec.rb
index 8bfd09301e..bf9a2b6a45 100644
--- a/spec/ruby/core/tracepoint/self_spec.rb
+++ b/spec/ruby/core/tracepoint/self_spec.rb
@@ -4,17 +4,23 @@ require_relative 'fixtures/classes'
 describe 'TracePoint#self' do
   it 'return the trace object from event' do
     trace = nil
-    TracePoint.new(:line) { |tp| trace = tp.self }.enable do
-      trace.equal?(self).should be_true
+    TracePoint.new(:line) { |tp|
+      next unless TracePointSpec.target_thread?
+      trace = tp.self
+    }.enable do
+      trace.equal?(self).should == true
     end
   end
 
   it 'return the class object from a class event' do
     trace = nil
-    TracePoint.new(:class) { |tp| trace = tp.self }.enable do
+    TracePoint.new(:class) { |tp|
+      next unless TracePointSpec.target_thread?
+      trace = tp.self
+    }.enable do
       class TracePointSpec::C
       end
     end
-    trace.should equal TracePointSpec::C
+    trace.should.equal? TracePointSpec::C
   end
 end