1 files changed, 10 insertions, 2 deletions
diff --git a/test/syck/test_yamlstore.rb b/test/syck/test_yamlstore.rb
index 8a52c00828..e87162594c 100644
--- a/test/syck/test_yamlstore.rb
+++ b/test/syck/test_yamlstore.rb
@@ -1,18 +1,26 @@
 require 'test/unit'
 require 'yaml/store'
+require 'tmpdir'
+
 Syck::Store = YAML::Store unless defined?(Syck::Store)
 
 module Syck
   class YAMLStoreTest < Test::Unit::TestCase
     def setup
       @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'syck'
-      @yamlstore_file = "yamlstore.tmp.#{Process.pid}"
+      @dir = Dir.mktmpdir("rubytest-file")
+      File.chown(-1, Process.gid, @dir)
+      @yamlstore_file = make_tmp_filename("yamlstore")
       @yamlstore = YAML::Store.new(@yamlstore_file)
     end
 
     def teardown
       YAML::ENGINE.yamler = @engine
-      File.unlink(@yamlstore_file) rescue nil
+      FileUtils.remove_entry_secure @dir
+    end
+
+    def make_tmp_filename(prefix)
+      @dir + "/" + prefix + File.basename(__FILE__) + ".#{$$}.test"
     end
 
     def test_opening_new_file_in_readonly_mode_should_result_in_empty_values