diff --git a/spec/unit/type/mount_spec.rb b/spec/unit/type/mount_spec.rb
index fd9c6cb52..c9622fdfa 100755
--- a/spec/unit/type/mount_spec.rb
+++ b/spec/unit/type/mount_spec.rb
@@ -1,211 +1,214 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Puppet::Type.type(:mount) do
     it "should have a :refreshable feature that requires the :remount method" do
         Puppet::Type.type(:mount).provider_feature(:refreshable).methods.should == [:remount]
     end
 
     it "should have no default value for :ensure" do
         mount = Puppet::Type.type(:mount).new(:name => "yay")
         mount.should(:ensure).should be_nil
     end
 end
 
 describe Puppet::Type.type(:mount), "when validating attributes" do
     [:name, :remounts].each do |param|
         it "should have a #{param} parameter" do
             Puppet::Type.type(:mount).attrtype(param).should == :param
         end
     end
 
     [:ensure, :device, :blockdevice, :fstype, :options, :pass, :dump, :atboot, :target].each do |param|
         it "should have a #{param} property" do
             Puppet::Type.type(:mount).attrtype(param).should == :property
         end
     end
 end
 
 describe Puppet::Type.type(:mount)::Ensure, "when validating values" do
     before do
         @provider = stub 'provider', :class => Puppet::Type.type(:mount).defaultprovider, :clear => nil
         Puppet::Type.type(:mount).defaultprovider.expects(:new).returns(@provider)
     end
 
     it "should support :present as a value to :ensure" do
         Puppet::Type.type(:mount).new(:name => "yay", :ensure => :present)
     end
 
     it "should alias :unmounted to :present as a value to :ensure" do
         mount = Puppet::Type.type(:mount).new(:name => "yay", :ensure => :unmounted)
         mount.should(:ensure).should == :present
     end
 
     it "should support :absent as a value to :ensure" do
         Puppet::Type.type(:mount).new(:name => "yay", :ensure => :absent)
     end
 
     it "should support :mounted as a value to :ensure" do
         Puppet::Type.type(:mount).new(:name => "yay", :ensure => :mounted)
     end
 end
 
 describe Puppet::Type.type(:mount)::Ensure do
     before :each do
         @provider = stub 'provider', :class => Puppet::Type.type(:mount).defaultprovider, :clear => nil, :satisfies? => true, :name => :mock
         Puppet::Type.type(:mount).defaultprovider.stubs(:new).returns(@provider)
         @mount = Puppet::Type.type(:mount).new(:name => "yay", :check => :ensure)
 
         @ensure = @mount.property(:ensure)
     end
 
     def mount_stub(params)
         Puppet::Type.type(:mount).validproperties.each do |prop|
             unless params[prop]
                 params[prop] = :absent
                 @mount[prop] = :absent
             end
         end
 
         params.each do |param, value|
             @provider.stubs(param).returns(value)
         end
     end
 
     describe Puppet::Type.type(:mount)::Ensure, "when retrieving its current state" do
 
         it "should return the provider's value if it is :absent" do
             @provider.expects(:ensure).returns(:absent)
             @ensure.retrieve.should == :absent
         end
 
         it "should return :mounted if the provider indicates it is mounted and the value is not :absent" do
             @provider.expects(:ensure).returns(:present)
             @provider.expects(:mounted?).returns(true)
             @ensure.retrieve.should == :mounted
         end
 
         it "should return :present if the provider indicates it is not mounted and the value is not :absent" do
             @provider.expects(:ensure).returns(:present)
             @provider.expects(:mounted?).returns(false)
             @ensure.retrieve.should == :present
         end
     end
 
     describe Puppet::Type.type(:mount)::Ensure, "when changing the host" do
 
         it "should destroy itself if it should be absent" do
             @provider.stubs(:mounted?).returns(false)
             @provider.expects(:destroy)
             @ensure.should = :absent
             @ensure.sync
         end
 
         it "should unmount itself before destroying if it is mounted and should be absent" do
             @provider.expects(:mounted?).returns(true)
             @provider.expects(:unmount)
             @provider.expects(:destroy)
             @ensure.should = :absent
             @ensure.sync
         end
 
         it "should create itself if it is absent and should be present" do
             @provider.stubs(:mounted?).returns(false)
             @provider.expects(:create)
             @ensure.should = :present
             @ensure.sync
         end
 
         it "should unmount itself if it is mounted and should be present" do
             @provider.stubs(:mounted?).returns(true)
 
             # The interface here is just too much work to test right now.
             @ensure.stubs(:syncothers)
             @provider.expects(:unmount)
             @ensure.should = :present
             @ensure.sync
         end
 
         it "should create and mount itself if it does not exist and should be mounted" do
             @provider.stubs(:ensure).returns(:absent)
             @provider.stubs(:mounted?).returns(false)
             @provider.expects(:create)
             @ensure.stubs(:syncothers)
             @provider.expects(:mount)
             @ensure.should = :mounted
             @ensure.sync
         end
 
         it "should mount itself if it is present and should be mounted" do
             @provider.stubs(:ensure).returns(:present)
             @provider.stubs(:mounted?).returns(false)
             @ensure.stubs(:syncothers)
             @provider.expects(:mount)
             @ensure.should = :mounted
             @ensure.sync
         end
 
         it "should create but not mount itself if it is absent and mounted and should be mounted" do
             @provider.stubs(:ensure).returns(:absent)
             @provider.stubs(:mounted?).returns(true)
             @ensure.stubs(:syncothers)
             @provider.expects(:create)
             @ensure.should = :mounted
             @ensure.sync
         end
     end
 
     describe Puppet::Type.type(:mount), "when responding to events" do
 
         it "should remount if it is currently mounted" do
             @provider.expects(:mounted?).returns(true)
             @provider.expects(:remount)
 
             @mount.refresh
         end
 
         it "should not remount if it is not currently mounted" do
             @provider.expects(:mounted?).returns(false)
             @provider.expects(:remount).never
 
             @mount.refresh
         end
 
         it "should not remount swap filesystems" do
             @mount[:fstype] = "swap"
             @provider.expects(:remount).never
 
             @mount.refresh
         end
     end
 end
 
 describe Puppet::Type.type(:mount), "when modifying an existing mount entry" do
     before do
         @provider = stub 'provider', :class => Puppet::Type.type(:mount).defaultprovider, :clear => nil, :satisfies? => true, :name => :mock, :remount => nil
         Puppet::Type.type(:mount).defaultprovider.stubs(:new).returns(@provider)
         @mount = Puppet::Type.type(:mount).new(:name => "yay", :ensure => :mounted)
 
         {:device => "/foo/bar", :blockdevice => "/other/bar", :target => "/what/ever", :fstype => 'eh', :options => "", :pass => 0, :dump => 0, :atboot => 0,
             :ensure => :mounted}.each do
             |param, value|
             @mount.provider.stubs(param).returns value
             @mount[param] = value
         end
 
         @mount.provider.stubs(:mounted?).returns true
 
+        # stub this to not try to create state.yaml
+        Puppet::Util::Storage.stubs(:store)
+
         @catalog = Puppet::Resource::Catalog.new
         @catalog.add_resource @mount
     end
 
     it "should use the provider to change the dump value" do
         @mount.provider.expects(:dump).returns 0
         @mount.provider.expects(:dump=).with(1)
 
         @mount[:dump] = 1
 
         @catalog.apply
     end
 end