diff --git a/spec/unit/provider/package/appdmg_spec.rb b/spec/unit/provider/package/appdmg_spec.rb
index ec118792c..380c27662 100755
--- a/spec/unit/provider/package/appdmg_spec.rb
+++ b/spec/unit/provider/package/appdmg_spec.rb
@@ -1,42 +1,42 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Type.type(:package).provider(:appdmg) do
   let(:resource) { Puppet::Type.type(:package).new(:name => 'foo', :provider => :appdmg) }
   let(:provider) { described_class.new(resource) }
 
   describe "when installing an appdmg" do
     let(:fake_mountpoint) { "/tmp/dmg.foo" }
     let(:empty_hdiutil_plist) { Plist::Emit.dump({}) }
     let(:fake_hdiutil_plist) { Plist::Emit.dump({"system-entities" => [{"mount-point" => fake_mountpoint}]}) }
 
     before do
       fh = mock 'filehandle'
       fh.stubs(:path).yields "/tmp/foo"
       resource[:source] = "foo.dmg"
       described_class.stubs(:open).yields fh
       Dir.stubs(:mktmpdir).returns "/tmp/testtmp123"
       FileUtils.stubs(:remove_entry_secure)
     end
 
     describe "from a remote source" do
       let(:tmpdir) { "/tmp/good123" }
 
       before :each do
         resource[:source] = "http://fake.puppetlabs.com/foo.dmg"
       end
 
       it "should call tmpdir and use the returned directory" do
         Dir.expects(:mktmpdir).returns tmpdir
         Dir.stubs(:entries).returns ["foo.app"]
         described_class.expects(:curl).with do |*args|
-          args[0] == "-o" and args[1].include? tmpdir
+          args[0] == "-o" && args[1].include?(tmpdir) && ! args.include?("-k")
         end
         described_class.stubs(:hdiutil).returns fake_hdiutil_plist
         described_class.expects(:installapp)
 
         provider.install
       end
     end
   end
 end
diff --git a/spec/unit/provider/package/pkgdmg_spec.rb b/spec/unit/provider/package/pkgdmg_spec.rb
index 8dfa235b6..deafc5e20 100644
--- a/spec/unit/provider/package/pkgdmg_spec.rb
+++ b/spec/unit/provider/package/pkgdmg_spec.rb
@@ -1,144 +1,144 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Type.type(:package).provider(:pkgdmg) do
   let(:resource) { Puppet::Type.type(:package).new(:name => 'foo', :provider => :pkgdmg) }
   let(:provider) { described_class.new(resource) }
 
   it { should_not be_versionable }
   it { should_not be_uninstallable }
 
   describe "when installing it should fail when" do
     before :each do
       Puppet::Util.expects(:execute).never
     end
 
     it "no source is specified" do
       expect { provider.install }.to raise_error(Puppet::Error, /must specify a package source/)
     end
 
     it "the source does not end in .dmg or .pkg" do
       resource[:source] = "bar"
       expect { provider.install }.to raise_error(Puppet::Error, /must specify a source string ending in .*dmg.*pkg/)
     end
   end
 
   # These tests shouldn't be this messy. The pkgdmg provider needs work...
   describe "when installing a pkgdmg" do
     let(:fake_mountpoint) { "/tmp/dmg.foo" }
     let(:empty_hdiutil_plist) { Plist::Emit.dump({}) }
     let(:fake_hdiutil_plist) { Plist::Emit.dump({"system-entities" => [{"mount-point" => fake_mountpoint}]}) }
 
     before do
       fh = mock 'filehandle'
       fh.stubs(:path).yields "/tmp/foo"
       resource[:source] = "foo.dmg"
       File.stubs(:open).yields fh
       Dir.stubs(:mktmpdir).returns "/tmp/testtmp123"
       FileUtils.stubs(:remove_entry_secure)
     end
 
     it "should fail when a disk image with no system entities is mounted" do
       described_class.stubs(:hdiutil).returns(empty_hdiutil_plist)
       expect { provider.install }.to raise_error(Puppet::Error, /No disk entities/)
     end
 
     it "should call hdiutil to mount and eject the disk image" do
       Dir.stubs(:entries).returns []
       provider.class.expects(:hdiutil).with("eject", fake_mountpoint).returns 0
       provider.class.expects(:hdiutil).with("mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", nil).returns fake_hdiutil_plist
       provider.install
     end
 
     it "should call installpkg if a pkg/mpkg is found on the dmg" do
       Dir.stubs(:entries).returns ["foo.pkg"]
       provider.class.stubs(:hdiutil).returns fake_hdiutil_plist
       provider.class.expects(:installpkg).with("#{fake_mountpoint}/foo.pkg", resource[:name], "foo.dmg").returns ""
       provider.install
     end
 
     describe "from a remote source" do
       let(:tmpdir) { "/tmp/good123" }
 
       before :each do
         resource[:source] = "http://fake.puppetlabs.com/foo.dmg"
       end
 
       it "should call tmpdir and then call curl with that directory" do
         Dir.expects(:mktmpdir).returns tmpdir
         Dir.stubs(:entries).returns ["foo.pkg"]
         described_class.expects(:curl).with do |*args|
-          args[0] == "-o" and args[1].include? tmpdir and args.include? "--fail"
+          args[0] == "-o" && args[1].include?(tmpdir) && args.include?("--fail") && ! args.include?("-k")
         end
         described_class.stubs(:hdiutil).returns fake_hdiutil_plist
         described_class.expects(:installpkg)
 
         provider.install
       end
 
       it "should use an http proxy host and port if specified" do
         Puppet::Util::HttpProxy.expects(:http_proxy_host).returns 'some_host'
         Puppet::Util::HttpProxy.expects(:http_proxy_port).returns 'some_port'
         Dir.expects(:mktmpdir).returns tmpdir
         Dir.stubs(:entries).returns ["foo.pkg"]
         described_class.expects(:curl).with do |*args|
           args.should be_include 'some_host:some_port'
           args.should be_include '--proxy'
         end
         described_class.stubs(:hdiutil).returns fake_hdiutil_plist
         described_class.expects(:installpkg)
 
         provider.install
       end
 
       it "should use an http proxy host only if specified" do
         Puppet::Util::HttpProxy.expects(:http_proxy_host).returns 'some_host'
         Puppet::Util::HttpProxy.expects(:http_proxy_port).returns nil
         Dir.expects(:mktmpdir).returns tmpdir
         Dir.stubs(:entries).returns ["foo.pkg"]
         described_class.expects(:curl).with do |*args|
           args.should be_include 'some_host'
           args.should be_include '--proxy'
         end
         described_class.stubs(:hdiutil).returns fake_hdiutil_plist
         described_class.expects(:installpkg)
 
         provider.install
       end
 
     end
   end
 
   describe "when installing flat pkg file" do
     describe "with a local source" do
       it "should call installpkg if a flat pkg file is found instead of a .dmg image" do
         resource[:source] = "/tmp/test.pkg"
         resource[:name] = "testpkg"
         provider.class.expects(:installpkgdmg).with("/tmp/test.pkg", "testpkg").returns ""
         provider.install
       end
     end
 
     describe "with a remote source" do
       let(:remote_source) { 'http://fake.puppetlabs.com/test.pkg' }
       let(:tmpdir) { '/path/to/tmpdir' }
       let(:tmpfile) { File.join(tmpdir, 'testpkg.pkg') }
 
       before do
         resource[:name]   = 'testpkg'
         resource[:source] = remote_source
 
         Dir.stubs(:mktmpdir).returns tmpdir
       end
 
       it "should call installpkg if a flat pkg file is found instead of a .dmg image" do
         described_class.expects(:curl).with do |*args|
           args.should be_include tmpfile
           args.should be_include remote_source
         end
         provider.class.expects(:installpkg).with(tmpfile, 'testpkg', remote_source)
         provider.install
       end
     end
   end
 end