diff --git a/spec/unit/provider/service/launchd_spec.rb b/spec/unit/provider/service/launchd_spec.rb
index 05d76972d..43e4cba8e 100755
--- a/spec/unit/provider/service/launchd_spec.rb
+++ b/spec/unit/provider/service/launchd_spec.rb
@@ -1,201 +1,203 @@
 #!/usr/bin/env ruby
 #
 # Unit testing for the launchd service provider
 #
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 require 'puppet'
 
 provider_class = Puppet::Type.type(:service).provider(:launchd)
 
 describe provider_class do
 
   before :each do
     # Create a mock resource
     @resource = stub 'resource'
 
     @provider = provider_class.new
     @joblabel = "com.foo.food"
     @jobplist = {}
 
     # A catch all; no parameters set
     @resource.stubs(:[]).returns(nil)
 
     # But set name, ensure and enable
     @resource.stubs(:[]).with(:name).returns @joblabel
     @resource.stubs(:[]).with(:ensure).returns :enabled
     @resource.stubs(:[]).with(:enable).returns :true
     @resource.stubs(:ref).returns "Service[#{@joblabel}]"
 
     # stub out the provider methods that actually touch the filesystem
     # or execute commands
     @provider.stubs(:plist_from_label).returns([@joblabel, @jobplist])
     @provider.stubs(:execute).returns("")
     @provider.stubs(:resource).returns @resource
 
     # We stub this out for the normal case as 10.6 is "special".
     provider_class.stubs(:get_macosx_version_major).returns("10.5")
 
   end
 
   it "should have a start method for #{@provider.object_id}" do
     @provider.should respond_to(:start)
   end
 
   it "should have a stop method" do
     @provider.should respond_to(:stop)
   end
 
   it "should have an enabled? method" do
     @provider.should respond_to(:enabled?)
   end
 
   it "should have an enable method" do
     @provider.should respond_to(:enable)
   end
 
   it "should have a disable method" do
     @provider.should respond_to(:disable)
   end
 
   it "should have a status method" do
     @provider.should respond_to(:status)
   end
 
 
   describe "when checking status" do
     it "should call the external command 'launchctl list' once" do
       @provider.expects(:launchctl).with(:list).returns("rotating-strawberry-madonnas")
       @provider.status
     end
     it "should return stopped if not listed in launchctl list output" do
       @provider.stubs(:launchctl).with(:list).returns("rotating-strawberry-madonnas")
       @provider.status.should == :stopped
     end
     it "should return running if listed in launchctl list output" do
       @provider.stubs(:launchctl).with(:list).returns(@joblabel)
       @provider.status.should == :running
     end
   end
 
   describe "when checking whether the service is enabled" do
     it "should return true if the job plist says disabled is false" do
       @provider.stubs(:plist_from_label).returns(["foo", {"Disabled" => false}])
       @provider.enabled?.should == :true
     end
     it "should return true if the job plist has no disabled key" do
       @provider.stubs(:plist_from_label).returns(["foo", {}])
       @provider.enabled?.should == :true
     end
     it "should return false if the job plist says disabled is true" do
       @provider.stubs(:plist_from_label).returns(["foo", {"Disabled" => true}])
       @provider.enabled?.should == :false
     end
   end
 
   describe "when checking whether the service is enabled on OS X 10.6" do
-    confine "Not running on OSX" => (Facter.value(:operatingsystem) == "Darwin")
     it "should return true if the job plist says disabled is true and the global overrides says disabled is false" do
       provider_class.stubs(:get_macosx_version_major).returns("10.6")
       @provider.stubs(:plist_from_label).returns(["foo", {"Disabled" => true}])
       @provider.class.stubs(:read_plist).returns({@resource[:name] => {"Disabled" => false}})
+      FileTest.expects(:file?).with(Launchd_Overrides).returns(true)
       @provider.enabled?.should == :true
     end
     it "should return false if the job plist says disabled is false and the global overrides says disabled is true" do
       provider_class.stubs(:get_macosx_version_major).returns("10.6")
       @provider.stubs(:plist_from_label).returns(["foo", {"Disabled" => false}])
       @provider.class.stubs(:read_plist).returns({@resource[:name] => {"Disabled" => true}})
+      FileTest.expects(:file?).with(Launchd_Overrides).returns(true)
       @provider.enabled?.should == :false
     end
     it "should return true if the job plist and the global overrides have no disabled keys" do
       provider_class.stubs(:get_macosx_version_major).returns("10.6")
       @provider.stubs(:plist_from_label).returns(["foo", {}])
       @provider.class.stubs(:read_plist).returns({})
+      FileTest.expects(:file?).with(Launchd_Overrides).returns(true)
       @provider.enabled?.should == :true
     end
   end
 
   describe "when starting the service" do
     it "should look for the relevant plist once" do
       @provider.expects(:plist_from_label).once
       @provider.start
     end
     it "should execute 'launchctl load' once without writing to the plist if the job is enabled" do
       @provider.stubs(:enabled?).returns :true
       @provider.expects(:execute).with([:launchctl, :load, @resource[:name]]).once
       @provider.start
     end
     it "should execute 'launchctl load' with writing to the plist once if the job is disabled" do
       @provider.stubs(:enabled?).returns :false
       @provider.expects(:execute).with([:launchctl, :load, "-w", @resource[:name]]).once
       @provider.start
     end
     it "should disable the job once if the job is disabled and should be disabled at boot" do
       @provider.stubs(:enabled?).returns :false
       @resource.stubs(:[]).with(:enable).returns :false
       @provider.expects(:disable).once
       @provider.start
     end
   end
 
   describe "when stopping the service" do
     it "should look for the relevant plist once" do
       @provider.expects(:plist_from_label).once
       @provider.stop
     end
     it "should execute 'launchctl unload' once without writing to the plist if the job is disabled" do
       @provider.stubs(:enabled?).returns :false
       @provider.expects(:execute).with([:launchctl, :unload, @resource[:name]]).once
       @provider.stop
     end
     it "should execute 'launchctl unload' with writing to the plist once if the job is enabled" do
       @provider.stubs(:enabled?).returns :true
       @provider.expects(:execute).with([:launchctl, :unload, "-w", @resource[:name]]).once
       @provider.stop
     end
     it "should enable the job once if the job is enabled and should be enabled at boot" do
       @provider.stubs(:enabled?).returns :true
       @resource.stubs(:[]).with(:enable).returns :true
       @provider.expects(:enable).once
       @provider.stop
     end
   end
 
   describe "when enabling the service" do
     it "should look for the relevant plist once" do
       @provider.expects(:plist_from_label).once
       @provider.stop
     end
     it "should check if the job is enabled once" do
       @provider.expects(:enabled?).once
       @provider.stop
     end
   end
 
   describe "when disabling the service" do
     it "should look for the relevant plist once" do
       @provider.expects(:plist_from_label).once
       @provider.stop
     end
   end
 
   describe "when enabling the service on OS X 10.6" do
     it "should write to the global launchd overrides file once" do
       provider_class.stubs(:get_macosx_version_major).returns("10.6")
       @provider.class.stubs(:read_plist).returns({})
       Plist::Emit.expects(:save_plist).once
       @provider.enable
     end
   end
 
   describe "when disabling the service on OS X 10.6" do
     it "should write to the global launchd overrides file once" do
       provider_class.stubs(:get_macosx_version_major).returns("10.6")
       @provider.class.stubs(:read_plist).returns({})
       Plist::Emit.expects(:save_plist).once
       @provider.enable
     end
   end
 
 end