diff --git a/gems/bundled_gems b/gems/bundled_gems
index ebe195f78f..4bf063abff 100644
--- a/gems/bundled_gems
+++ b/gems/bundled_gems
@@ -2,9 +2,9 @@
 minitest 5.16.2 https://github.com/seattlerb/minitest
 power_assert 2.0.1 https://github.com/ruby/power_assert
 rake 13.0.6 https://github.com/ruby/rake
-test-unit 3.5.3 https://github.com/test-unit/test-unit 3.5.3
+test-unit 3.5.3 https://github.com/test-unit/test-unit
 rexml 3.2.5 https://github.com/ruby/rexml
-rss 0.2.9 https://github.com/ruby/rss 0.2.9
+rss 0.2.9 https://github.com/ruby/rss
 net-ftp 0.1.3 https://github.com/ruby/net-ftp
 net-imap 0.2.3 https://github.com/ruby/net-imap
 net-pop 0.1.1 https://github.com/ruby/net-pop
diff --git a/tool/fetch-bundled_gems.rb b/tool/fetch-bundled_gems.rb
index 90c5fbff37..8d04892b70 100755
--- a/tool/fetch-bundled_gems.rb
+++ b/tool/fetch-bundled_gems.rb
@@ -27,5 +27,5 @@ c = r || "v#{v}"
 checkout = %w"git -c advice.detachedHead=false checkout"
 puts "checking out #{c} (v=#{v}, r=#{r}) ..."
 unless system(*checkout, c, "--", chdir: n)
-  abort
+  abort if r or !system(*checkout, v, "--", chdir: n)
 end