diff --git a/tool/lib/bundled_gem.rb b/tool/lib/bundled_gem.rb
index d24720b8c2183e..bfc0be1c810539 100644
--- a/tool/lib/bundled_gem.rb
+++ b/tool/lib/bundled_gem.rb
@@ -12,6 +12,12 @@ def unpack(file, *rest)
     pkg = Gem::Package.new(file)
     prepare_test(pkg.spec, *rest) {|dir| pkg.extract_files(dir)}
     puts "Unpacked #{file}"
+  rescue Gem::Package::FormatError, Errno::ENOENT
+    puts "Try with hash version of bundled gems instead of #{file}. We don't use this gem with release version of Ruby."
+    if file =~ /^gems\/(\w+)-/
+      file = Dir.glob("gems/#{$1}-*.gem").first
+    end
+    retry
   end
 
   def build(gemspec, version, outdir = ".", validation: true)