3 files changed, 3 insertions, 2 deletions
diff --git a/test/lib/test/unit/assertions.rb b/test/lib/test/unit/assertions.rb
index 5425bf7f10..789e2d6c3d 100644
--- a/test/lib/test/unit/assertions.rb
+++ b/test/lib/test/unit/assertions.rb
@@ -694,6 +694,9 @@ eom
       end
 
       def assert_no_memory_leak(args, prepare, code, message=nil, limit: 2.0, rss: false, **opt)
+        # TODO: consider choosing some appropriate limit for MJIT and stop skipping this once it does not randomly fail
+        skip 'assert_no_memory_leak may consider MJIT memory usage as leak' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
+
         require_relative '../../memory_status'
         raise MiniTest::Skip, "unsupported platform" unless defined?(Memory::Status)
 
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 3faa4e1fdb..82e2128358 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -3815,7 +3815,6 @@ __END__
   end
 
   def test_select_leak
-    skip 'assert_no_memory_leak may consider MJIT memory usage as leak' if RubyVM::MJIT.enabled?
     # avoid malloc arena explosion from glibc and jemalloc:
     env = {
       'MALLOC_ARENA_MAX' => '1',
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index 185c5c9ec5..1a6d87f11f 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -647,7 +647,6 @@ CODE
   end
 
   def test_crypt
-    skip 'assert_no_memory_leak may consider MJIT memory usage as leak' if RubyVM::MJIT.enabled?
     assert_equal(S('aaGUC/JkO9/Sc'), S("mypassword").crypt(S("aa")))
     assert_not_equal(S('aaGUC/JkO9/Sc'), S("mypassword").crypt(S("ab")))
     assert_raise(ArgumentError) {S("mypassword").crypt(S(""))}