diff --git a/spec/unit/type/filebucket_spec.rb b/spec/unit/type/filebucket_spec.rb
index 0603dd5cb..5bfb834c9 100755
--- a/spec/unit/type/filebucket_spec.rb
+++ b/spec/unit/type/filebucket_spec.rb
@@ -1,101 +1,103 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
 describe Puppet::Type.type(:filebucket) do
+  include PuppetSpec::Files
+
   describe "when validating attributes" do
     %w{name server port path}.each do |attr|
       it "should have a '#{attr}' parameter" do
         Puppet::Type.type(:filebucket).attrtype(attr.intern).should == :param
       end
     end
 
     it "should have its 'name' attribute set as its namevar" do
       Puppet::Type.type(:filebucket).key_attributes.should == [:name]
     end
   end
 
   it "should use the clientbucketdir as the path by default path" do
     Puppet.settings[:clientbucketdir] = "/my/bucket"
     Puppet::Type.type(:filebucket).new(:name => "main")[:path].should == Puppet[:clientbucketdir]
   end
 
   it "should use the masterport as the path by default port" do
     Puppet.settings[:masterport] = 50
     Puppet::Type.type(:filebucket).new(:name => "main")[:port].should == Puppet[:masterport]
   end
 
   it "should use the server as the path by default server" do
     Puppet.settings[:server] = "myserver"
     Puppet::Type.type(:filebucket).new(:name => "main")[:server].should == Puppet[:server]
   end
 
   it "be local by default" do
     bucket = Puppet::Type.type(:filebucket).new :name => "main"
 
     bucket.bucket.should be_local
   end
 
   describe "path" do
-    include PuppetSpec::Files
-
     def bucket(hash)
       Puppet::Type.type(:filebucket).new({:name => 'main'}.merge(hash))
     end
 
     it "should accept false as a value" do
       expect { bucket(:path => false) }.not_to raise_error
     end
 
     it "should accept true as a value" do
       expect { bucket(:path => true) }.not_to raise_error
     end
 
     it "should fail when given an array of values" do
       expect { bucket(:path => ['one', 'two']) }.
         to raise_error Puppet::Error, /only have one filebucket path/
     end
 
     %w{one ../one one/two}.each do |path|
       it "should fail if given a relative path of #{path.inspect}" do
         expect { bucket(:path => path) }.
           to raise_error Puppet::Error, /Filebucket paths must be absolute/
       end
     end
 
     it "should succeed if given an absolute path" do
       expect { bucket(:path => make_absolute('/tmp/bucket')) }.not_to raise_error
     end
 
     it "not be local if path is false" do
       bucket(:path => false).bucket.should_not be_local
     end
 
     it "be local if both a path and a server are specified" do
-      bucket(:server => "puppet", :path => "/my/path").bucket.should be_local
+      bucket(:server => "puppet", :path => make_absolute("/my/path")).bucket.should be_local
     end
   end
 
   describe "when creating the filebucket" do
     before do
       @bucket = stub 'bucket', :name= => nil
     end
 
     it "should use any provided path" do
-      bucket = Puppet::Type.type(:filebucket).new :name => "main", :path => "/foo/bar"
-      Puppet::FileBucket::Dipper.expects(:new).with(:Path => "/foo/bar").returns @bucket
+      path = make_absolute("/foo/bar")
+      bucket = Puppet::Type.type(:filebucket).new :name => "main", :path => path
+      Puppet::FileBucket::Dipper.expects(:new).with(:Path => path).returns @bucket
       bucket.bucket
     end
+
     it "should use any provided server and port" do
       bucket = Puppet::Type.type(:filebucket).new :name => "main", :server => "myserv", :port => "myport", :path => false
       Puppet::FileBucket::Dipper.expects(:new).with(:Server => "myserv", :Port => "myport").returns @bucket
       bucket.bucket
     end
 
     it "should use the default server if the path is unset and no server is provided" do
       Puppet.settings[:server] = "myserv"
       bucket = Puppet::Type.type(:filebucket).new :name => "main", :path => false
       Puppet::FileBucket::Dipper.expects(:new).with { |args| args[:Server] == "myserv" }.returns @bucket
       bucket.bucket
     end
   end
 end