diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index 3c33aedb6f..56d73eb509 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -90,6 +90,7 @@ module DRbBase
   end
 
   def teardown
+    return if @omitted
     @ext.stop_service if defined?(@ext) && @ext
     if defined?(@service_name) && @service_name
       @drb_service.manager.unregist(@service_name)
diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb
index 0254c7ab50..4369c6614b 100644
--- a/test/drb/test_drbssl.rb
+++ b/test/drb/test_drbssl.rb
@@ -41,6 +41,10 @@ end
 class TestDRbSSLCore < Test::Unit::TestCase
   include DRbCore
   def setup
+    if RUBY_PLATFORM.match?(/mingw/)
+      @omitted = true
+      omit 'This test seems to randomly hang on GitHub Actions MinGW'
+    end
     @drb_service = DRbSSLService.new
     super
     setup_service 'ut_drb_drbssl.rb'
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index dbe414b783..74d8d363b4 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -498,7 +498,7 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
   def setup
     if RUBY_PLATFORM.match?(/mingw/)
       @omitted = true
-      omit 'This test seems to randomly hang on GitHub Actions MinGW UCRT64'
+      omit 'This test seems to randomly hang on GitHub Actions MinGW'
     end
     super
     ThreadGroup.new.add(Thread.current)