diff --git a/spec/integration/indirector/direct_file_server_spec.rb b/spec/integration/indirector/direct_file_server_spec.rb
index 79afe7569..0bb0c9806 100755
--- a/spec/integration/indirector/direct_file_server_spec.rb
+++ b/spec/integration/indirector/direct_file_server_spec.rb
@@ -1,71 +1,65 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
 require 'puppet/indirector/file_content/file'
 
 describe Puppet::Indirector::DirectFileServer, " when interacting with the filesystem and the model", :fails_on_windows => true do
   include PuppetSpec::Files
 
   before do
     # We just test a subclass, since it's close enough.
     @terminus = Puppet::Indirector::FileContent::File.new
 
     @filepath = make_absolute("/path/to/my/file")
   end
 
   it "should return an instance of the model" do
     FileTest.expects(:exists?).with(@filepath).returns(true)
 
     @terminus.find(@terminus.indirection.request(:find, "file://host#{@filepath}")).should be_instance_of(Puppet::FileServing::Content)
   end
 
   it "should return an instance capable of returning its content" do
     FileTest.expects(:exists?).with(@filepath).returns(true)
     File.stubs(:lstat).with(@filepath).returns(stub("stat", :ftype => "file"))
     File.expects(:read).with(@filepath).returns("my content")
 
     instance = @terminus.find(@terminus.indirection.request(:find, "file://host#{@filepath}"))
 
     instance.content.should == "my content"
   end
 end
 
-describe Puppet::Indirector::DirectFileServer, " when interacting with FileServing::Fileset and the model", :fails_on_windows => true do
-  before do
-    @terminus = Puppet::Indirector::FileContent::File.new
+describe Puppet::Indirector::DirectFileServer, " when interacting with FileServing::Fileset and the model" do
+  include PuppetSpec::Files
 
-    @path = Tempfile.new("direct_file_server_testing")
-    path = @path.path
-    @path.close!
-    @path = path
+  let(:path) { tmpdir('direct_file_server_testing') }
 
-    Dir.mkdir(@path)
-    File.open(File.join(@path, "one"), "w") { |f| f.print "one content" }
-    File.open(File.join(@path, "two"), "w") { |f| f.print "two content" }
+  before do
+    @terminus = Puppet::Indirector::FileContent::File.new
 
-    @request = @terminus.indirection.request(:search, "file:///#{@path}", :recurse => true)
-  end
+    File.open(File.join(path, "one"), "w") { |f| f.print "one content" }
+    File.open(File.join(path, "two"), "w") { |f| f.print "two content" }
 
-  after do
-    system("rm -rf #{@path}")
+    @request = @terminus.indirection.request(:search, "file:///#{path}", :recurse => true)
   end
 
   it "should return an instance for every file in the fileset" do
     result = @terminus.search(@request)
     result.should be_instance_of(Array)
     result.length.should == 3
     result.each { |r| r.should be_instance_of(Puppet::FileServing::Content) }
   end
 
   it "should return instances capable of returning their content" do
     @terminus.search(@request).each do |instance|
       case instance.full_path
       when /one/; instance.content.should == "one content"
       when /two/; instance.content.should == "two content"
-      when @path
+      when path
       else
         raise "No valid key for #{instance.path.inspect}"
       end
     end
   end
 end