1 files changed, 9 insertions, 2 deletions
diff --git a/spec/mspec/lib/mspec/helpers/fs.rb b/spec/mspec/lib/mspec/helpers/fs.rb
index ee33f5fec0..e842896126 100644
--- a/spec/mspec/lib/mspec/helpers/fs.rb
+++ b/spec/mspec/lib/mspec/helpers/fs.rb
@@ -17,11 +17,18 @@ class Object
     parts.each do |part|
       name = File.join name, part
 
-      if File.file? name
+      stat = File.stat name
+      if stat.file?
         raise ArgumentError, "path component of #{path} is a file"
       end
 
-      Dir.mkdir name unless File.directory? name
+      unless stat.directory?
+        begin
+          Dir.mkdir name
+        rescue Errno::EEXIST
+          raise unless File.directory? name
+        end
+      end
     end
   end