1 files changed, 16 insertions, 2 deletions
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
index d7d19e97c9..a4d46e2f10 100644
--- a/bootstraptest/test_thread.rb
+++ b/bootstraptest/test_thread.rb
@@ -242,6 +242,20 @@ assert_equal 'true', %{
   end
 }
 
+assert_equal 'true', %{
+  Thread.new{}.join
+  begin
+    Process.waitpid2 fork{
+      Thread.new{
+        sleep 0.1
+      }.join
+    }
+    true
+  rescue NotImplementedError
+    true
+  end
+}
+
 assert_equal 'ok', %{
   open("zzz_t1.rb", "w") do |f|
     f.puts <<-END
@@ -289,7 +303,7 @@ assert_normal_exit %q{
   }.each {|t|
     t.join
   }
-}
+} unless rjit_enabled? # flaky
 
 assert_equal 'ok', %q{
   def m
@@ -483,7 +497,7 @@ assert_equal 'foo', %q{
   [th1, th2].each {|t| t.join }
   GC.start
   f.call.source
-} unless ENV['RUN_OPTS'] =~ /rjit/ # flaky
+} unless rjit_enabled? # flaky
 assert_normal_exit %q{
   class C
     def inspect