diff --git a/acceptance/tests/modules/uninstall/with_multiple_modules_installed.rb b/acceptance/tests/modules/uninstall/with_multiple_modules_installed.rb
index b0022fed5..60e0884d0 100644
--- a/acceptance/tests/modules/uninstall/with_multiple_modules_installed.rb
+++ b/acceptance/tests/modules/uninstall/with_multiple_modules_installed.rb
@@ -1,60 +1,68 @@
 test_name "puppet module uninstall (with multiple modules installed)"
 
 step 'Setup'
 testdir = master.tmpdir('unistallmultiple')
 
 stub_forge_on(master)
 
 teardown do
   on master, "rm -rf #{master['distmoduledir']}/java"
   on master, "rm -rf #{master['distmoduledir']}/stdlib"
 end
 
 on master, "mkdir -p #{testdir}/modules"
 on master, "chown -R #{master['user']}:#{master['group']} #{testdir}"
 
 master_opts = {
   'main' => {
     'modulepath' => "#{testdir}/modules:#{master['sitemoduledir']}:#{master['distmoduledir']}"
   }
 }
 
 with_puppet_running_on master, master_opts, testdir do
   on master, puppet("module install pmtacceptance-java --version 1.6.0 --modulepath #{master['distmoduledir']}")
   on master, puppet("module install pmtacceptance-java --version 1.7.0 --modulepath #{testdir}/modules")
   on master, puppet("module list --modulepath #{master['distmoduledir']}") do
     assert_output <<-OUTPUT
-      #{master['distmoduledir']}
-      ├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
-      └── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
+      STDERR> \e[1;31mWarning: Setting modulepath is deprecated in puppet.conf. See http://links.puppetlabs.com/env-settings-deprecations
+      STDERR>    (at /usr/lib/ruby/site_ruby/1.8/puppet/settings.rb:1065:in `each')\e[0m
+      STDOUT> #{master['distmoduledir']}
+      STDOUT> ├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
+      STDOUT> └── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
     OUTPUT
   end
 
   on master, puppet("module list --modulepath #{testdir}/modules") do
     assert_output <<-OUTPUT
-      #{testdir}/modules
-      ├── pmtacceptance-java (\e[0;36mv1.7.0\e[0m)
-      └── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
+      STDERR> \e[1;31mWarning: Setting modulepath is deprecated in puppet.conf. See http://links.puppetlabs.com/env-settings-deprecations
+      STDERR>    (at /usr/lib/ruby/site_ruby/1.8/puppet/settings.rb:1065:in `each')\e[0m
+      STDOUT> #{testdir}/modules
+      STDOUT> ├── pmtacceptance-java (\e[0;36mv1.7.0\e[0m)
+      STDOUT> └── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
     OUTPUT
   end
 
   step "Try to uninstall a module that exists multiple locations in the module path"
   on master, puppet("module uninstall pmtacceptance-java"), :acceptable_exit_codes => [1] do
     assert_output <<-OUTPUT
+      STDERR> \e[1;31mWarning: Setting modulepath is deprecated in puppet.conf. See http://links.puppetlabs.com/env-settings-deprecations
+      STDERR>    (at /usr/lib/ruby/site_ruby/1.8/puppet/settings.rb:1065:in `each')\e[0m
       STDOUT> \e[mNotice: Preparing to uninstall 'pmtacceptance-java' ...\e[0m
       STDERR> \e[1;31mError: Could not uninstall module 'pmtacceptance-java'
       STDERR>   Module 'pmtacceptance-java' appears multiple places in the module path
       STDERR>     'pmtacceptance-java' (v1.7.0) was found in #{testdir}/modules
       STDERR>     'pmtacceptance-java' (v1.6.0) was found in #{master['distmoduledir']}
       STDERR>     Use the `--modulepath` option to limit the search to specific directories\e[0m
     OUTPUT
   end
 
   step "Uninstall a module that exists multiple locations by restricting the --modulepath"
   on master, puppet("module uninstall pmtacceptance-java --modulepath #{master['distmoduledir']}") do
     assert_output <<-OUTPUT
-      \e[mNotice: Preparing to uninstall 'pmtacceptance-java' ...\e[0m
-      Removed 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) from #{master['distmoduledir']}
+      STDERR> \e[1;31mWarning: Setting modulepath is deprecated in puppet.conf. See http://links.puppetlabs.com/env-settings-deprecations
+      STDERR>    (at /usr/lib/ruby/site_ruby/1.8/puppet/settings.rb:1065:in `each')\e[0m
+      STDOUT> \e[mNotice: Preparing to uninstall 'pmtacceptance-java' ...\e[0m
+      STDOUT> Removed 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) from #{master['distmoduledir']}
     OUTPUT
   end
 end
diff --git a/acceptance/tests/modules/upgrade/that_was_installed_twice.rb b/acceptance/tests/modules/upgrade/that_was_installed_twice.rb
index b8a7253a9..9c9f8f99b 100644
--- a/acceptance/tests/modules/upgrade/that_was_installed_twice.rb
+++ b/acceptance/tests/modules/upgrade/that_was_installed_twice.rb
@@ -1,58 +1,64 @@
 test_name "puppet module upgrade (that was installed twice)"
 
 step 'Setup'
 
 stub_forge_on(master)
 testdir = master.tmpdir('upgrademultimods')
 
 teardown do
   on master, "rm -rf #{master['distmoduledir']}/java"
   on master, "rm -rf #{master['distmoduledir']}/stdlib"
   on master, "rm -rf #{testdir}/modules/java"
   on master, "rm -rf #{testdir}/modules/stdlib"
 end
 
 master_opts = {
   'main' => {
     'modulepath' => "#{master['distmoduledir']}:#{testdir}/modules"
   }
 }
 
 with_puppet_running_on master, master_opts, testdir do
   on master, puppet("module install pmtacceptance-java --version 1.6.0 --modulepath #{master['distmoduledir']}")
   on master, puppet("module install pmtacceptance-java --version 1.7.0 --modulepath #{testdir}/modules")
   on master, puppet("module list") do
     assert_output <<-OUTPUT
-      #{master['distmoduledir']}
-      ├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
-      └── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
-      #{testdir}/modules
-      ├── pmtacceptance-java (\e[0;36mv1.7.0\e[0m)
-      └── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
+      STDERR> \e[1;31mWarning: Setting modulepath is deprecated in puppet.conf. See http://links.puppetlabs.com/env-settings-deprecations
+      STDERR>    (at /usr/lib/ruby/site_ruby/1.8/puppet/settings.rb:1065:in `each')\e[0m
+      STDOUT> #{master['distmoduledir']}
+      STDOUT> ├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
+      STDOUT> └── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
+      STDOUT> #{testdir}/modules
+      STDOUT> ├── pmtacceptance-java (\e[0;36mv1.7.0\e[0m)
+      STDOUT> └── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
     OUTPUT
   end
 
   step "Try to upgrade a module that exists multiple locations in the module path"
   on master, puppet("module upgrade pmtacceptance-java"), :acceptable_exit_codes => [1] do
     assert_output <<-OUTPUT
+      STDERR> \e[1;31mWarning: Setting modulepath is deprecated in puppet.conf. See http://links.puppetlabs.com/env-settings-deprecations
+      STDERR>    (at /usr/lib/ruby/site_ruby/1.8/puppet/settings.rb:1065:in `each')\e[0m
       STDOUT> \e[mNotice: Preparing to upgrade 'pmtacceptance-java' ...\e[0m
       STDERR> \e[1;31mError: Could not upgrade module 'pmtacceptance-java'
       STDERR>   Module 'pmtacceptance-java' appears multiple places in the module path
       STDERR>     'pmtacceptance-java' (v1.6.0) was found in #{master['distmoduledir']}
       STDERR>     'pmtacceptance-java' (v1.7.0) was found in #{testdir}/modules
       STDERR>     Use the `--modulepath` option to limit the search to specific directories\e[0m
     OUTPUT
   end
 
   step "Upgrade a module that exists multiple locations by restricting the --modulepath"
   on master, puppet("module upgrade pmtacceptance-java --modulepath #{master['distmoduledir']}") do
     assert_output <<-OUTPUT
-      \e[mNotice: Preparing to upgrade 'pmtacceptance-java' ...\e[0m
-      \e[mNotice: Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[m) in #{master['distmoduledir']} ...\e[0m
-      \e[mNotice: Downloading from https://forge.puppetlabs.com ...\e[0m
-      \e[mNotice: Upgrading -- do not interrupt ...\e[0m
-      #{master['distmoduledir']}
-      └── pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.1\e[0m)
+      STDERR> \e[1;31mWarning: Setting modulepath is deprecated in puppet.conf. See http://links.puppetlabs.com/env-settings-deprecations
+      STDERR>    (at /usr/lib/ruby/site_ruby/1.8/puppet/settings.rb:1065:in `each')\e[0m
+      STDOUT> \e[mNotice: Preparing to upgrade 'pmtacceptance-java' ...\e[0m
+      STDOUT> \e[mNotice: Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[m) in #{master['distmoduledir']} ...\e[0m
+      STDOUT> \e[mNotice: Downloading from https://forge.puppetlabs.com ...\e[0m
+      STDOUT> \e[mNotice: Upgrading -- do not interrupt ...\e[0m
+      STDOUT> #{master['distmoduledir']}
+      STDOUT> └── pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.1\e[0m)
     OUTPUT
   end
 end
diff --git a/acceptance/tests/modules/upgrade/with_scattered_dependencies.rb b/acceptance/tests/modules/upgrade/with_scattered_dependencies.rb
index c3a238aa5..2fbbb9004 100644
--- a/acceptance/tests/modules/upgrade/with_scattered_dependencies.rb
+++ b/acceptance/tests/modules/upgrade/with_scattered_dependencies.rb
@@ -1,46 +1,48 @@
 test_name "puppet module upgrade (with scattered dependencies)"
 
 step 'Setup'
 
 stub_forge_on(master)
 testdir = master.tmpdir('scattereddeps')
 on master, "mkdir -p #{master['distmoduledir']}"
 on master, "mkdir -p #{master['sitemoduledir']}"
 on master, "mkdir -p #{testdir}/modules"
 
 teardown do
   on master, "rm -rf #{master['distmoduledir']}/java"
   on master, "rm -rf #{master['distmoduledir']}/postgresql"
 end
 
 master_opts = {
   'main' => {
     'modulepath' => "#{testdir}/modules:#{master['distmoduledir']}:#{master['sitemoduledir']}"
   }
 }
 
 with_puppet_running_on master, master_opts, testdir do
   on master, puppet("module install pmtacceptance-stdlib --version 0.0.2 --target-dir #{testdir}/modules")
   on master, puppet("module install pmtacceptance-java --version 1.6.0 --target-dir #{master['distmoduledir']} --ignore-dependencies")
   on master, puppet("module install pmtacceptance-postgresql --version 0.0.1 --target-dir #{master['distmoduledir']} --ignore-dependencies")
   on master, puppet("module list") do
     assert_match /pmtacceptance-java.*1\.6\.0/, stdout, 'Could not find pmtacceptance/java'
     assert_match /pmtacceptance-postgresql.*0\.0\.1/, stdout, 'Could not find pmtacceptance/postgresql'
     assert_match /pmtacceptance-stdlib.*0\.0\.2/, stdout, 'Could not find pmtacceptance/stdlib'
   end
 
   step "Upgrade a module that has a more recent version published"
   on master, puppet("module upgrade pmtacceptance-postgresql --version 0.0.2") do
     assert_output <<-OUTPUT
-      \e[mNotice: Preparing to upgrade 'pmtacceptance-postgresql' ...\e[0m
-      \e[mNotice: Found 'pmtacceptance-postgresql' (\e[0;36mv0.0.1\e[m) in #{master['distmoduledir']} ...\e[0m
-      \e[mNotice: Downloading from https://forge.puppetlabs.com ...\e[0m
-      \e[mNotice: Upgrading -- do not interrupt ...\e[0m
-      #{master['distmoduledir']}
-      └─┬ pmtacceptance-postgresql (\e[0;36mv0.0.1 -> v0.0.2\e[0m)
-        ├─┬ pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.0\e[0m)
-        │ └── pmtacceptance-stdlib (\e[0;36mv0.0.2 -> v1.0.0\e[0m) [#{testdir}/modules]
-        └── pmtacceptance-stdlib (\e[0;36mv0.0.2 -> v1.0.0\e[0m) [#{testdir}/modules]
+      STDERR> \e[1;31mWarning: Setting modulepath is deprecated in puppet.conf. See http://links.puppetlabs.com/env-settings-deprecations
+      STDERR>    (at /usr/lib/ruby/site_ruby/1.8/puppet/settings.rb:1065:in `each')\e[0m
+      STDOUT> \e[mNotice: Preparing to upgrade 'pmtacceptance-postgresql' ...\e[0m
+      STDOUT> \e[mNotice: Found 'pmtacceptance-postgresql' (\e[0;36mv0.0.1\e[m) in #{master['distmoduledir']} ...\e[0m
+      STDOUT> \e[mNotice: Downloading from https://forge.puppetlabs.com ...\e[0m
+      STDOUT> \e[mNotice: Upgrading -- do not interrupt ...\e[0m
+      STDOUT> #{master['distmoduledir']}
+      STDOUT> └─┬ pmtacceptance-postgresql (\e[0;36mv0.0.1 -> v0.0.2\e[0m)
+      STDOUT>   ├─┬ pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.0\e[0m)
+      STDOUT>   │ └── pmtacceptance-stdlib (\e[0;36mv0.0.2 -> v1.0.0\e[0m) [#{testdir}/modules]
+      STDOUT>   └── pmtacceptance-stdlib (\e[0;36mv0.0.2 -> v1.0.0\e[0m) [#{testdir}/modules]
     OUTPUT
   end
 end