diff --git a/test/fixtures/fake_sorted_set_gem/sorted_set.rb b/test/set/fixtures/fake_sorted_set_gem/sorted_set.rb
similarity index 100%
rename from test/fixtures/fake_sorted_set_gem/sorted_set.rb
rename to test/set/fixtures/fake_sorted_set_gem/sorted_set.rb
diff --git a/test/test_set.rb b/test/set/test_set.rb
similarity index 100%
rename from test/test_set.rb
rename to test/set/test_set.rb
diff --git a/test/test_sorted_set.rb b/test/set/test_sorted_set.rb
similarity index 100%
rename from test/test_sorted_set.rb
rename to test/set/test_sorted_set.rb
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 2b73af87a2..a7785a989c 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -371,7 +371,7 @@ module SyncDefaultGems
       `git checkout ext/digest/depend ext/digest/*/depend`
     when "set"
       sync_lib gem, upstream
-      cp_r("#{upstream}/test", ".")
+      cp_r(Dir.glob("#{upstream}/test/*"), "test/set")
     when "optparse"
       sync_lib gem, upstream
       rm_rf(%w[doc/optparse])