diff --git a/common.mk b/common.mk
index 6b11bec33b..5c78ebd02a 100644
--- a/common.mk
+++ b/common.mk
@@ -1363,8 +1363,9 @@ no-test-bundled-gems:
 # Override this to allow failure of specific gems on CI
 # TEST_BUNDLED_GEMS_ALLOW_FAILURES =
 
+BUNDLED_GEMS =
 test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS)
-	$(Q) $(XRUBY) $(tooldir)/test-bundled-gems.rb
+	$(Q) $(XRUBY) $(tooldir)/test-bundled-gems.rb $(BUNDLED_GEMS)
 
 test-bundler-precheck: $(TEST_RUNNABLE)-test-bundler-precheck
 no-test-bundler-precheck:
diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index 6928c7691c..b8da545098 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -11,6 +11,7 @@ ruby = ENV['RUBY'] || RbConfig.ruby
 File.foreach("#{gem_dir}/bundled_gems") do |line|
   next if /^\s*(?:#|$)/ =~ line
   gem = line.split.first
+  next if ARGV.any? {|pat| !File.fnmatch?(pat, gem)}
   puts "\nTesting the #{gem} gem"
 
   test_command = "#{ruby} -C #{gem_dir}/src/#{gem} -Ilib #{rake} test"