diff --git a/common.mk b/common.mk
index 393e53acae..ea2e0c919d 100644
--- a/common.mk
+++ b/common.mk
@@ -1605,7 +1605,7 @@ install-for-test-bundled-gems: update-default-gemspecs
 test-bundled-gems-fetch: yes-test-bundled-gems-fetch
 yes-test-bundled-gems-fetch:
 	$(ACTIONS_GROUP)
-	$(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb src bundled_gems
+	$(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb BUNDLED_GEMS="$(BUNDLED_GEMS)" src bundled_gems
 	$(ACTIONS_ENDGROUP)
 no-test-bundled-gems-fetch:
 
diff --git a/tool/fetch-bundled_gems.rb b/tool/fetch-bundled_gems.rb
index f0d3c3cb89..080f4b1d65 100755
--- a/tool/fetch-bundled_gems.rb
+++ b/tool/fetch-bundled_gems.rb
@@ -5,6 +5,11 @@ BEGIN {
 
   color = Colorize.new
 
+  if ARGV.first.start_with?("BUNDLED_GEMS=")
+    bundled_gems = ARGV.shift[13..-1].split(" ")
+    bundled_gems = nil if bundled_gems.empty?
+  end
+
   dir = ARGV.shift
   ARGF.eof?
   FileUtils.mkdir_p(dir)
@@ -15,6 +20,7 @@ n, v, u, r = $F
 
 next unless n
 next if n =~ /^#/
+next if bundled_gems&.all? {|pat| !File.fnmatch?(pat, n)}
 
 if File.directory?(n)
   puts "updating #{color.notice(n)} ..."