4 files changed, 11 insertions, 3 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 54161f888c..d418912f35 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -107,6 +107,10 @@ jobs:
 
       - run: make hello
 
+      - name: runirb
+        run: |
+          echo IRB::VERSION | make runirb RUNOPT="-- -f"
+
       - name: Set test options for skipped tests
         run: |
           set -x
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index ac7963649b..041cb412fd 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -99,6 +99,10 @@ jobs:
 
       - run: $SETARCH make hello
 
+      - name: runirb
+        run: |
+          echo IRB::VERSION | $SETARCH make runirb RUNOPT="-- -f"
+
       - name: Set test options for skipped tests
         run: |
           set -x
diff --git a/common.mk b/common.mk
index f94ad33d88..e5a4d34a0a 100644
--- a/common.mk
+++ b/common.mk
@@ -1427,8 +1427,8 @@ run: yes-fake miniruby$(EXEEXT) PHONY
 runruby: $(PROGRAM) PHONY
 	RUBY_ON_BUG='gdb -x $(srcdir)/.gdbinit -p' $(RUNRUBY) $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT)
 
-runirb: $(PROGRAM) PHONY
-	RUBY_ON_BUG='gdb -x $(srcdir)/.gdbinit -p' $(RUNRUBY) $(RUNOPT0) -r irb -e 'IRB.start("make runirb")' $(RUNOPT)
+runirb: $(PROGRAM) update-default-gemspecs
+	RUBY_ON_BUG='gdb -x $(srcdir)/.gdbinit -p' $(RUNRUBY) $(RUNOPT0) -rrubygems -r irb -e 'IRB.start("make runirb")' $(RUNOPT)
 
 parse: yes-fake miniruby$(EXEEXT) PHONY
 	$(BTESTRUBY) --dump=parsetree_with_comment,insns $(TESTRUN_SCRIPT)
diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index a0dcc5625e..a71d7dce7e 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -10,7 +10,7 @@ github_actions = ENV["GITHUB_ACTIONS"] == "true"
 
 allowed_failures = ENV['TEST_BUNDLED_GEMS_ALLOW_FAILURES'] || ''
 if RUBY_PLATFORM =~ /mswin|mingw/
-  allowed_failures = [allowed_failures, "irb"].join(',')
+  allowed_failures = [allowed_failures, "rbs,debug,irb"].join(',')
 end
 allowed_failures = allowed_failures.split(',').uniq.reject(&:empty?)