1 files changed, 9 insertions, 1 deletions
diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb
index 3d727adf04..01e5cc68f6 100644
--- a/test/ruby/test_struct.rb
+++ b/test/ruby/test_struct.rb
@@ -535,6 +535,8 @@ module TestStruct
   end
 
   def test_named_structs_are_not_rooted
+    omit 'skip on riscv64-linux CI machine. See https://github.com/ruby/ruby/pull/13422' if ENV['RUBY_DEBUG'] == 'ci' && /riscv64-linux/ =~ RUBY_DESCRIPTION
+
     # [Bug #20311]
     assert_no_memory_leak([], <<~PREP, <<~CODE, rss: true)
       code = proc do
@@ -542,12 +544,18 @@ module TestStruct
         Struct.send(:remove_const, :A)
       end
 
-      1_000.times(&code)
+      10_000.times(&code)
     PREP
       50_000.times(&code)
     CODE
   end
 
+  def test_frozen_subclass
+    test = Class.new(@Struct.new(:a)).freeze.new(a: 0)
+    assert_kind_of(@Struct, test)
+    assert_equal([:a], test.members)
+  end
+
   class TopStruct < Test::Unit::TestCase
     include TestStruct