diff --git a/acceptance/tests/resource/service/should_not_change_the_system.rb b/acceptance/tests/resource/service/should_not_change_the_system.rb
index f628097b1..1ecf09dff 100644
--- a/acceptance/tests/resource/service/should_not_change_the_system.rb
+++ b/acceptance/tests/resource/service/should_not_change_the_system.rb
@@ -1,24 +1,22 @@
-test_name "`puppet resource service` should list running services without changing the system"
+test_name "`puppet resource service` should list running services without calling dangerous init scripts"
 
 confine :except, :platform => 'windows'
 confine :except, :platform => 'solaris'
 
+# For each script in /etc/init.d, the init service provider will call
+# the script with the `status` argument, except for blacklisted
+# scripts that are known to be dangerous, e.g. /etc/init.d/reboot.sh
+# The first execution of `puppet resource service` will enumerate
+# all services, and we want to check that puppet enumerates at
+# least one service. We use ssh because our tests run over ssh, so it
+# must be present.
 
 agents.each do |agent|
   step "list running services and make sure ssh reports running"
-
-  on agent, 'puppet resource service'
+  on(agent, puppet('resource service'))
   assert_match /service { 'ssh[^']*':\n\s*ensure\s*=>\s*'(?:true|running)'/, stdout, "ssh is not running"
-  expected_output = stdout
-
-  step "make sure nothing on the system was changed and ssh is still running"
-
-  on agent, 'puppet resource service'
 
-  # It's possible that `puppet resource service` changed the system before
-  # printing output the *first* time, so in addition to comparing the output,
-  # we also want to check that a known service is in a good state. We use ssh
-  # because our tests run over ssh, so it must be present.
+  step "list running services again and make sure ssh is still running"
+  on(agent, puppet('resource service'))
   assert_match /service { 'ssh[^']*':\n\s*ensure\s*=>\s*'(?:true|running)'/, stdout, "ssh is no longer running"
-  assert_equal expected_output, stdout, "`puppet resource service` changed the state of the system"
 end
diff --git a/ext/build_defaults.yaml b/ext/build_defaults.yaml
index 1c5b6a599..63e920d3f 100644
--- a/ext/build_defaults.yaml
+++ b/ext/build_defaults.yaml
@@ -1,38 +1,38 @@
 ---
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
 cows: 'base-lucid-i386.cow base-precise-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-trusty-i386.cow base-wheezy-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'
 gpg_key: '4BD6EC30'
 sign_tar: FALSE
 # a space separated list of mock configs
 final_mocks: 'pl-el-5-i386 pl-el-6-i386 pl-el-7-x86_64 pl-fedora-19-i386 pl-fedora-20-i386'
 yum_host: 'yum.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE
 build_dmg: TRUE
 build_msi:
   puppet_for_the_win:
     ref: '2476cd007b1b52fb1b9f22202b56218629626b5c'
     repo: 'git://github.com/puppetlabs/puppet_for_the_win.git'
   facter:
     ref: 'refs/tags/2.3.0'
     repo: 'git://github.com/puppetlabs/facter.git'
   hiera:
     ref: 'refs/tags/1.3.4'
     repo: 'git://github.com/puppetlabs/hiera.git'
   sys:
     ref:
-      x86: 'cbe94f4cafb0f78d587e8addcf723bc671af7cca'
-      x64: '417378f607340d211fbfef89a96e6639bef1bfb1'
+      x86: '0813124a1e06f0c98987b8e543d8c13b305a5ca0'
+      x64: '531319f5c121e98990772e018eb9781bf7dc6316'
     repo: 'git://github.com/puppetlabs/puppet-win32-ruby.git'
 apt_host: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'
 ips_repo: '/var/pkgrepo'
 ips_store: '/opt/repository'
 ips_host: 'solaris-11-ips-repo.acctest.dc1.puppetlabs.net'
 tar_host: 'downloads.puppetlabs.com'