diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 253eb84f0a..85df8e2b9e 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -497,6 +497,7 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
 
   def setup
     if RUBY_PLATFORM.match?(/mingw/) && ENV['MSYSTEM'] == 'UCRT64'
+      @omitted = true
       omit 'This test seems to randomly hang on GitHub Actions MinGW UCRT64'
     end
     super
@@ -506,6 +507,9 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
     @server = DRb.start_service("druby://localhost:0")
   end
   def teardown
+    return if @omitted
+    @omitted = false
+
     # implementation-dependent
     @ts_base.instance_eval{
       if th = @keeper