diff --git a/spec/unit/module_tool/applications/uninstaller_spec.rb b/spec/unit/module_tool/applications/uninstaller_spec.rb
index 2a8562ab9..66e71b638 100644
--- a/spec/unit/module_tool/applications/uninstaller_spec.rb
+++ b/spec/unit/module_tool/applications/uninstaller_spec.rb
@@ -1,143 +1,165 @@
 require 'spec_helper'
 require 'puppet/module_tool'
 require 'tmpdir'
 require 'puppet_spec/module_tool/shared_functions'
 require 'puppet_spec/module_tool/stub_source'
 
 describe Puppet::ModuleTool::Applications::Uninstaller do
   include PuppetSpec::ModuleTool::SharedFunctions
   include PuppetSpec::Files
 
   before do
     FileUtils.mkdir_p(primary_dir)
     FileUtils.mkdir_p(secondary_dir)
   end
 
   let(:environment) do
     Puppet.lookup(:current_environment).override_with(
       :vardir     => vardir,
       :modulepath => [ primary_dir, secondary_dir ]
     )
   end
 
   let(:vardir)   { tmpdir('uninstaller') }
   let(:primary_dir) { File.join(vardir, "primary") }
   let(:secondary_dir) { File.join(vardir, "secondary") }
   let(:remote_source) { PuppetSpec::ModuleTool::StubSource.new }
 
   let(:module) { 'module-not_installed' }
   let(:application) do
     opts = options
     Puppet::ModuleTool.set_option_defaults(opts)
     Puppet::ModuleTool::Applications::Uninstaller.new(self.module, opts)
   end
 
   def options
     { :environment => environment }
   end
 
   subject { application.run }
 
   context "when the module is not installed" do
     it "should fail" do
       subject.should include :result => :failure
     end
   end
 
   context "when the module is installed" do
     let(:module) { 'pmtacceptance-stdlib' }
 
     before { preinstall('pmtacceptance-stdlib', '1.0.0') }
     before { preinstall('pmtacceptance-apache', '0.0.4') }
 
     it "should uninstall the module" do
       subject[:affected_modules].first.forge_name.should == "pmtacceptance/stdlib"
     end
 
     it "should only uninstall the requested module" do
       subject[:affected_modules].length == 1
     end
 
     context 'in two modulepaths' do
       before { preinstall('pmtacceptance-stdlib', '2.0.0', :into => secondary_dir) }
 
       it "should fail if a module exists twice in the modpath" do
         subject.should include :result => :failure
       end
     end
 
     context "when options[:version] is specified" do
       def options
         super.merge(:version => '1.0.0')
       end
 
       it "should uninstall the module if the version matches" do
         subject[:affected_modules].length.should == 1
         subject[:affected_modules].first.version.should == "1.0.0"
       end
 
       context 'but not matched' do
         def options
           super.merge(:version => '2.0.0')
         end
 
         it "should not uninstall the module if the version does not match" do
           subject.should include :result => :failure
         end
       end
     end
 
     context "when the module metadata is missing" do
       before { File.unlink(File.join(primary_dir, 'stdlib', 'metadata.json')) }
 
       it "should not uninstall the module" do
         application.run[:result].should == :failure
       end
     end
 
     context "when the module has local changes" do
       before do
         mark_changed(File.join(primary_dir, 'stdlib'))
       end
 
       it "should not uninstall the module" do
         subject.should include :result => :failure
       end
     end
 
     context "when uninstalling the module will cause broken dependencies" do
       before { preinstall('pmtacceptance-apache', '0.10.0') }
 
       it "should not uninstall the module" do
         subject.should include :result => :failure
       end
     end
 
+    context 'with --ignore-changes' do
+      def options
+        super.merge(:ignore_changes => true)
+      end
+
+      context 'with local changes' do
+        before do
+          mark_changed(File.join(primary_dir, 'stdlib'))
+        end
+
+        it 'overwrites the installed module with the greatest version matching that range' do
+          subject.should include :result => :success
+        end
+      end
+
+      context 'without local changes' do
+        it 'overwrites the installed module with the greatest version matching that range' do
+          subject.should include :result => :success
+        end
+      end
+    end
+
     context "when using the --force flag" do
 
       def options
         super.merge(:force => true)
       end
 
       context "with local changes" do
         before do
           mark_changed(File.join(primary_dir, 'stdlib'))
         end
 
         it "should ignore local changes" do
           subject[:affected_modules].length.should == 1
           subject[:affected_modules].first.forge_name.should == "pmtacceptance/stdlib"
         end
       end
 
       context "while depended upon" do
         before { preinstall('pmtacceptance-apache', '0.10.0') }
 
         it "should ignore broken dependencies" do
           subject[:affected_modules].length.should == 1
           subject[:affected_modules].first.forge_name.should == "pmtacceptance/stdlib"
         end
       end
     end
   end
 end
diff --git a/spec/unit/module_tool/applications/upgrader_spec.rb b/spec/unit/module_tool/applications/upgrader_spec.rb
index 44627f94f..2c5652fe0 100644
--- a/spec/unit/module_tool/applications/upgrader_spec.rb
+++ b/spec/unit/module_tool/applications/upgrader_spec.rb
@@ -1,302 +1,313 @@
 require 'spec_helper'
 require 'puppet/module_tool/applications'
 require 'puppet_spec/module_tool/shared_functions'
 require 'puppet_spec/module_tool/stub_source'
 require 'semver'
 
 describe Puppet::ModuleTool::Applications::Upgrader do
   include PuppetSpec::ModuleTool::SharedFunctions
   include PuppetSpec::Files
 
   before do
     FileUtils.mkdir_p(primary_dir)
     FileUtils.mkdir_p(secondary_dir)
   end
 
   let(:vardir)   { tmpdir('upgrader') }
   let(:primary_dir) { File.join(vardir, "primary") }
   let(:secondary_dir) { File.join(vardir, "secondary") }
   let(:remote_source) { PuppetSpec::ModuleTool::StubSource.new }
 
   let(:environment) do
     Puppet.lookup(:current_environment).override_with(
       :vardir     => vardir,
       :modulepath => [ primary_dir, secondary_dir ]
     )
   end
 
   before do
     Semantic::Dependency.clear_sources
     installer = Puppet::ModuleTool::Applications::Upgrader.any_instance
     installer.stubs(:module_repository).returns(remote_source)
   end
 
   def upgrader(name, options = {})
     Puppet::ModuleTool.set_option_defaults(options)
     Puppet::ModuleTool::Applications::Upgrader.new(name, options)
   end
 
   describe '#run' do
     let(:module) { 'pmtacceptance-stdlib' }
 
     def options
       { :environment => environment }
     end
 
     let(:application) { upgrader(self.module, options) }
     subject { application.run }
 
     it 'fails if the module is not already installed' do
       subject.should include :result => :failure
       subject[:error].should include :oneline => "Could not upgrade '#{self.module}'; module is not installed"
     end
 
     context 'for an installed module' do
       context 'without dependencies' do
         before { preinstall('pmtacceptance-stdlib', '1.0.0') }
 
         context 'without options' do
           it 'properly upgrades the module to the greatest version' do
             subject.should include :result => :success
             graph_should_include 'pmtacceptance-stdlib', v('1.0.0') => v('4.1.0')
           end
         end
 
         context 'with version range' do
           def options
             super.merge(:version => '3.x')
           end
 
           context 'not matching the installed version' do
             it 'properly upgrades the module to the greatest version within that range' do
               subject.should include :result => :success
               graph_should_include 'pmtacceptance-stdlib', v('1.0.0') => v('3.2.0')
             end
           end
 
           context 'matching the installed version' do
             context 'with more recent version' do
               before { preinstall('pmtacceptance-stdlib', '3.0.0')}
 
               it 'properly upgrades the module to the greatest version within that range' do
                 subject.should include :result => :success
                 graph_should_include 'pmtacceptance-stdlib', v('3.0.0') => v('3.2.0')
               end
             end
 
             context 'without more recent version' do
               before { preinstall('pmtacceptance-stdlib', '3.2.0')}
 
               context 'without options' do
                 it 'declines to upgrade' do
                   subject.should include :result => :noop
                 end
               end
 
               context 'with --force' do
                 def options
                   super.merge(:force => true)
                 end
 
                 it 'overwrites the installed module with the greatest version matching that range' do
                   subject.should include :result => :success
                   graph_should_include 'pmtacceptance-stdlib', v('3.2.0') => v('3.2.0')
                 end
               end
             end
           end
         end
       end
 
       context 'that is depended upon' do
         # pmtacceptance-keystone depends on pmtacceptance-mysql  >=0.6.1 <1.0.0
         before { preinstall('pmtacceptance-keystone', '2.1.0') }
         before { preinstall('pmtacceptance-mysql', '0.9.0') }
 
         let(:module) { 'pmtacceptance-mysql' }
 
         context 'and out of date' do
           before { preinstall('pmtacceptance-mysql', '0.8.0') }
 
           it 'properly upgrades to the greatest version matching the dependency' do
             subject.should include :result => :success
             graph_should_include 'pmtacceptance-mysql', v('0.8.0') => v('0.9.0')
           end
         end
 
         context 'and up to date' do
           it 'declines to upgrade' do
             subject.should include :result => :failure
           end
         end
 
         context 'when specifying a violating version range' do
           def options
             super.merge(:version => '2.1.0')
           end
 
           it 'fails to upgrade the module' do
             # TODO: More helpful error message?
             subject.should include :result => :failure
             subject[:error].should include :oneline => "Could not upgrade '#{self.module}' (v0.9.0 -> v2.1.0); no version satisfies all dependencies"
           end
 
           context 'using --force' do
             def options
               super.merge(:force => true)
             end
 
             it 'overwrites the installed module with the specified version' do
               subject.should include :result => :success
               graph_should_include 'pmtacceptance-mysql', v('0.9.0') => v('2.1.0')
             end
           end
         end
       end
 
       context 'with local changes' do
         before { preinstall('pmtacceptance-stdlib', '1.0.0') }
         before do
           release = application.send(:installed_modules)['pmtacceptance-stdlib']
           mark_changed(release.mod.path)
         end
 
         it 'fails to upgrade' do
           subject.should include :result => :failure
           subject[:error].should include :oneline => "Could not upgrade '#{self.module}'; module has had changes made locally"
         end
+
+        context 'with --ignore-changes' do
+          def options
+            super.merge(:ignore_changes => true)
+          end
+
+          it 'overwrites the installed module with the greatest version matching that range' do
+            subject.should include :result => :success
+            graph_should_include 'pmtacceptance-stdlib', v('1.0.0') => v('4.1.0')
+          end
+        end
       end
 
       context 'with dependencies' do
         context 'that are unsatisfied' do
           def options
             super.merge(:version => '0.1.1')
           end
 
           before { preinstall('pmtacceptance-apache', '0.0.3') }
           let(:module) { 'pmtacceptance-apache' }
 
           it 'upgrades the module and installs the missing dependencies' do
             subject.should include :result => :success
             graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.1.1')
             graph_should_include 'pmtacceptance-stdlib', nil => v('4.1.0'), :action => :install
           end
         end
 
         context 'with older major versions' do
           # pmtacceptance-apache 0.0.4 has no dependency on pmtacceptance-stdlib
           # the next available version (0.1.1) and all subsequent versions depend on pmtacceptance-stdlib >= 2.2.1
           before { preinstall('pmtacceptance-apache', '0.0.3') }
           before { preinstall('pmtacceptance-stdlib', '1.0.0') }
           let(:module) { 'pmtacceptance-apache' }
 
           it 'refuses to upgrade the installed dependency to a new major version, but upgrades the module to the greatest compatible version' do
             subject.should include :result => :success
             graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.0.4')
           end
 
           context 'using --ignore_dependencies' do
             def options
               super.merge(:ignore_dependencies => true)
             end
 
             it 'upgrades the module to the greatest available version' do
               subject.should include :result => :success
               graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.10.0')
             end
           end
         end
 
         context 'with satisfying major versions' do
           before { preinstall('pmtacceptance-apache', '0.0.3') }
           before { preinstall('pmtacceptance-stdlib', '2.0.0') }
           let(:module) { 'pmtacceptance-apache' }
 
           it 'upgrades the module and its dependencies to their greatest compatible versions' do
             subject.should include :result => :success
             graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.10.0')
             graph_should_include 'pmtacceptance-stdlib', v('2.0.0') => v('2.6.0')
           end
         end
 
         context 'with satisfying versions' do
           before { preinstall('pmtacceptance-apache', '0.0.3') }
           before { preinstall('pmtacceptance-stdlib', '2.4.0') }
           let(:module) { 'pmtacceptance-apache' }
 
           it 'upgrades the module to the greatest available version' do
             subject.should include :result => :success
             graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.10.0')
             graph_should_include 'pmtacceptance-stdlib', nil
           end
         end
 
         context 'with current versions' do
           before { preinstall('pmtacceptance-apache', '0.0.3') }
           before { preinstall('pmtacceptance-stdlib', '2.6.0') }
           let(:module) { 'pmtacceptance-apache' }
 
           it 'upgrades the module to the greatest available version' do
             subject.should include :result => :success
             graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.10.0')
             graph_should_include 'pmtacceptance-stdlib', nil
           end
         end
 
         context 'with shared dependencies' do
           # bacula 0.0.3 depends on stdlib >= 2.2.0 and pmtacceptance/mysql >= 1.0.0
           # bacula 0.0.2 depends on stdlib >= 2.2.0 and pmtacceptance/mysql >= 0.0.1
           # bacula 0.0.1 depends on stdlib >= 2.2.0
 
           # keystone 2.1.0 depends on pmtacceptance/stdlib >= 2.5.0 and pmtacceptance/mysql >=0.6.1 <1.0.0
 
           before { preinstall('pmtacceptance-bacula', '0.0.1') }
           before { preinstall('pmtacceptance-mysql', '0.9.0') }
           before { preinstall('pmtacceptance-keystone', '2.1.0') }
 
           let(:module) { 'pmtacceptance-bacula' }
 
           it 'upgrades the module to the greatest version compatible with all other installed modules' do
             subject.should include :result => :success
             graph_should_include 'pmtacceptance-bacula', v('0.0.1') => v('0.0.2')
           end
 
           context 'using --force' do
             def options
               super.merge(:force => true)
             end
 
             it 'upgrades the module to the greatest version available' do
               subject.should include :result => :success
               graph_should_include 'pmtacceptance-bacula', v('0.0.1') => v('0.0.3')
             end
           end
         end
 
         context 'in other modulepath directories' do
           before { preinstall('pmtacceptance-apache', '0.0.3') }
           before { preinstall('pmtacceptance-stdlib', '1.0.0', :into => secondary_dir) }
           let(:module) { 'pmtacceptance-apache' }
 
           context 'with older major versions' do
             it 'upgrades the module to the greatest version compatible with the installed modules' do
               subject.should include :result => :success
               graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.0.4')
               graph_should_include 'pmtacceptance-stdlib', nil
             end
           end
 
           context 'with satisfying major versions' do
             before { preinstall('pmtacceptance-stdlib', '2.0.0', :into => secondary_dir) }
 
             it 'upgrades the module and its dependencies to their greatest compatible versions, in-place' do
               subject.should include :result => :success
               graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.10.0')
               graph_should_include 'pmtacceptance-stdlib', v('2.0.0') => v('2.6.0'), :path => secondary_dir
             end
           end
         end
       end
     end
   end
 end