2 files changed, 3 insertions, 0 deletions
diff --git a/test/thread/test_cv.rb b/test/thread/test_cv.rb
index 1e15d2e9ec..70cf4483a3 100644
--- a/test/thread/test_cv.rb
+++ b/test/thread/test_cv.rb
@@ -33,6 +33,8 @@ class TestConditionVariable < Test::Unit::TestCase
   end
 
   def test_condvar_wait_exception_handling
+    skip "MJIT thread is unexpected for this test, especially with --jit-wait" if RubyVM::MJIT.enabled?
+
     # Calling wait in the only thread running should raise a ThreadError of
     # 'stopping only thread'
     mutex = Mutex.new
diff --git a/test/thread/test_sync.rb b/test/thread/test_sync.rb
index 8241445faf..e3294ff824 100644
--- a/test/thread/test_sync.rb
+++ b/test/thread/test_sync.rb
@@ -59,6 +59,7 @@ class SyncTest < Test::Unit::TestCase
     }
 
     sleep 0.1 until t.stop?
+    sleep 1 if RubyVM::MJIT.enabled? # t.stop? behaves unexpectedly with --jit-wait
     t.raise
     t.join