diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index 113097771..738e4ef73 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -12,7 +12,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version) do
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version) do
           end.converge(described_recipe)
         end
         property = load_platform_properties(:platform => platform, :platform_version => version)
diff --git a/spec/iptables_spec.rb b/spec/iptables_spec.rb
index 3d42a0fc8..e1b46bbdf 100644
--- a/spec/iptables_spec.rb
+++ b/spec/iptables_spec.rb
@@ -7,7 +7,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version).converge(described_recipe)
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version).converge(described_recipe)
         end
 
         it 'includes the `iptables::default` recipe' do
diff --git a/spec/logrotate_spec.rb b/spec/logrotate_spec.rb
index 0d4c31cbe..4254190b1 100644
--- a/spec/logrotate_spec.rb
+++ b/spec/logrotate_spec.rb
@@ -7,7 +7,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version).converge(described_recipe)
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version).converge(described_recipe)
         end
 
         # apache_service = service 'apache2' do
diff --git a/spec/modules/mod_apreq2_spec.rb b/spec/modules/mod_apreq2_spec.rb
index 28f9a4e3a..144bd0276 100644
--- a/spec/modules/mod_apreq2_spec.rb
+++ b/spec/modules/mod_apreq2_spec.rb
@@ -5,7 +5,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version).converge(described_recipe)
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version).converge(described_recipe)
         end
 
         property = load_platform_properties(:platform => platform, :platform_version => version)
diff --git a/spec/modules/mod_auth_openid_spec.rb b/spec/modules/mod_auth_openid_spec.rb
index 579baf7f9..b5edce1df 100644
--- a/spec/modules/mod_auth_openid_spec.rb
+++ b/spec/modules/mod_auth_openid_spec.rb
@@ -11,7 +11,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version).converge(described_recipe)
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version).converge(described_recipe)
         end
 
         property = load_platform_properties(:platform => platform, :platform_version => version)
diff --git a/spec/modules/mod_authn_core.rb b/spec/modules/mod_authn_core.rb
index 941b267ad..ac9e106c3 100644
--- a/spec/modules/mod_authn_core.rb
+++ b/spec/modules/mod_authn_core.rb
@@ -5,7 +5,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version) do
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version) do
           end.converge(described_recipe)
         end
         property = load_platform_properties(:platform => platform, :platform_version => version)
diff --git a/spec/modules/mod_fastcgi_spec.rb b/spec/modules/mod_fastcgi_spec.rb
index efe551165..e8af3c61b 100644
--- a/spec/modules/mod_fastcgi_spec.rb
+++ b/spec/modules/mod_fastcgi_spec.rb
@@ -5,7 +5,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version).converge(described_recipe)
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version).converge(described_recipe)
         end
 
         property = load_platform_properties(:platform => platform, :platform_version => version)
diff --git a/spec/modules/mod_pagespeed_spec.rb b/spec/modules/mod_pagespeed_spec.rb
index aa39c0920..7deb0a80b 100644
--- a/spec/modules/mod_pagespeed_spec.rb
+++ b/spec/modules/mod_pagespeed_spec.rb
@@ -7,7 +7,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version).converge(described_recipe)
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version).converge(described_recipe)
         end
 
         property = load_platform_properties(:platform => platform, :platform_version => version)
diff --git a/spec/modules/mod_perl_spec.rb b/spec/modules/mod_perl_spec.rb
index 79c3ab242..fde5181b5 100644
--- a/spec/modules/mod_perl_spec.rb
+++ b/spec/modules/mod_perl_spec.rb
@@ -5,7 +5,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version).converge(described_recipe)
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version).converge(described_recipe)
         end
 
         property = load_platform_properties(:platform => platform, :platform_version => version)
diff --git a/spec/modules/mod_php5_spec.rb b/spec/modules/mod_php5_spec.rb
index 5793f5891..d2c84a72b 100644
--- a/spec/modules/mod_php5_spec.rb
+++ b/spec/modules/mod_php5_spec.rb
@@ -9,7 +9,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version).converge(described_recipe)
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version).converge(described_recipe)
         end
 
         property = load_platform_properties(:platform => platform, :platform_version => version)
diff --git a/spec/modules/mod_python_spec.rb b/spec/modules/mod_python_spec.rb
index e4b3dd264..c53dc1b62 100644
--- a/spec/modules/mod_python_spec.rb
+++ b/spec/modules/mod_python_spec.rb
@@ -5,7 +5,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version).converge(described_recipe)
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version).converge(described_recipe)
         end
 
         property = load_platform_properties(:platform => platform, :platform_version => version)
diff --git a/spec/modules/mod_xsendfile_spec.rb b/spec/modules/mod_xsendfile_spec.rb
index c0c5d9255..8b5fb4265 100644
--- a/spec/modules/mod_xsendfile_spec.rb
+++ b/spec/modules/mod_xsendfile_spec.rb
@@ -5,7 +5,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version).converge(described_recipe)
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version).converge(described_recipe)
         end
 
         property = load_platform_properties(:platform => platform, :platform_version => version)
diff --git a/spec/modules/standard_modules_spec.rb b/spec/modules/standard_modules_spec.rb
index 7f7abffb8..cfac1c01b 100644
--- a/spec/modules/standard_modules_spec.rb
+++ b/spec/modules/standard_modules_spec.rb
@@ -138,7 +138,7 @@
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
         let(:chef_run) do
-          ChefSpec::Runner.new(:platform => platform, :version => version).converge(described_recipe)
+          ChefSpec::SoloRunner.new(:platform => platform, :version => version).converge(described_recipe)
         end
 
         property = load_platform_properties(:platform => platform, :platform_version => version)
diff --git a/spec/support/shared_examples_for_apache_module.rb b/spec/support/shared_examples_for_apache_module.rb
index a8cf0575f..b6cffe546 100644
--- a/spec/support/shared_examples_for_apache_module.rb
+++ b/spec/support/shared_examples_for_apache_module.rb
@@ -3,7 +3,7 @@
   platforms.each do |platform, versions|
     versions.each do |version|
       context "on #{platform.capitalize} #{version}" do
-        let(:chef_run) { ChefSpec::Runner.new(:platform => platform, :version => version).converge(described_recipe) }
+        let(:chef_run) { ChefSpec::SoloRunner.new(:platform => platform, :version => version).converge(described_recipe) }
 
         property = load_platform_properties(:platform => platform, :platform_version => version)