diff --git a/test/yaml/test_set.rb b/test/yaml/test_set.rb
new file mode 100644
index 0000000000..a3368769d1
--- /dev/null
+++ b/test/yaml/test_set.rb
@@ -0,0 +1,31 @@
+require 'test/unit'
+require 'yaml'
+
+module YAML
+  class TestSet < Test::Unit::TestCase
+    def setup
+      @set = YAML::Set.new
+      @set['foo'] = 'bar'
+      @set['bar'] = 'baz'
+    end
+
+    def test_to_yaml
+      assert_match(/!set/, @set.to_yaml)
+    end
+
+    def test_roundtrip
+      assert_equal(@set, YAML.load(YAML.dump(@set)))
+    end
+
+    ###
+    # FIXME: Syck should also support !!set as shorthand
+    def test_load_from_yaml
+      loaded = YAML.load(<<-eoyml)
+--- !set
+foo: bar
+bar: baz
+      eoyml
+      assert_equal(@set, loaded)
+    end
+  end
+end