diff --git a/Gemfile b/Gemfile
index 86dcd42..2b8e634 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gem 'chef', '~> 11.8'
 gem 'json', '<= 1.7.7' # chef 11 dependency
 gem 'berkshelf', '~> 2.0.10'
-gem 'chefspec', '~> 3.1.4'
+gem 'chefspec', '~> 3.4.0'
 gem 'foodcritic', '~> 3.0.3'
 gem 'strainer'
 gem 'rubocop', '~> 0.18.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index e01d9cb..2954927 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,19 +1,20 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.16)
+    activesupport (3.2.17)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.5)
-    akami (1.2.0)
+    addressable (2.3.6)
+    akami (1.2.1)
       gyoku (>= 0.4.0)
-      nokogiri (>= 1.4.0)
+      nokogiri
     ast (1.1.0)
-    berkshelf (2.0.12)
+    berkshelf (2.0.14)
       activesupport (~> 3.2.0)
       addressable (~> 2.3.4)
       buff-shell_out (~> 0.1)
       chozo (>= 0.6.1)
+      faraday (~> 0.8.0)
       faraday (~> 0.8.5)
       hashie (>= 2.0.2)
       minitar (~> 0.5.4)
@@ -37,35 +38,34 @@ GEM
     celluloid-io (0.14.1)
       celluloid (>= 0.14.1)
       nio4r (>= 0.4.5)
-    chef (11.8.2)
-      chef-zero (~> 1.6, >= 1.6.2)
+    chef (11.10.4)
+      chef-zero (~> 1.7, >= 1.7.2)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.7.7)
+      json (>= 1.4.4, <= 1.8.1)
       mime-types (~> 1.16)
       mixlib-authentication (~> 1.3)
-      mixlib-cli (~> 1.3)
+      mixlib-cli (~> 1.4)
       mixlib-config (~> 2.0)
       mixlib-log (~> 1.3)
-      mixlib-shellout (~> 1.2)
+      mixlib-shellout (~> 1.3)
       net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1.0)
+      net-ssh-multi (~> 1.1)
       ohai (~> 6.0)
       pry (~> 0.9)
       puma (~> 1.6)
       rest-client (>= 1.0.4, < 1.7.0)
       yajl-ruby (~> 1.1)
-    chef-zero (1.7.2)
+    chef-zero (1.7.3)
       hashie (~> 2.0)
       json
       mixlib-log (~> 1.3)
       moneta (< 0.7.0)
       rack
-    chefspec (3.1.4)
+    chefspec (3.4.0)
       chef (~> 11.0)
       fauxhai (~> 2.0)
-      i18n (>= 0.6.9, < 1.0.0)
       rspec (~> 2.14)
     chozo (0.6.1)
       activesupport (>= 3.2.0)
@@ -76,7 +76,7 @@ GEM
     erubis (2.7.0)
     faraday (0.8.9)
       multipart-post (~> 1.2.0)
-    fauxhai (2.0.1)
+    fauxhai (2.1.0)
       net-ssh
       ohai
     ffi (1.9.3)
@@ -94,7 +94,7 @@ GEM
     gyoku (1.1.1)
       builder (>= 2.1.2)
     hashie (2.0.5)
-    highline (1.6.20)
+    highline (1.6.21)
     hitimes (1.2.1)
     httpclient (2.3.4.1)
     httpi (0.9.7)
@@ -103,9 +103,9 @@ GEM
     ipaddress (0.8.0)
     json (1.7.7)
     little-plugger (1.1.3)
-    logging (1.8.1)
+    logging (1.8.2)
       little-plugger (>= 1.1.3)
-      multi_json (>= 1.3.6)
+      multi_json (>= 1.8.4)
     method_source (0.8.2)
     mime-types (1.25.1)
     minitar (0.5.4)
@@ -116,15 +116,15 @@ GEM
     mixlib-log (1.6.0)
     mixlib-shellout (1.3.0)
     moneta (0.6.0)
-    multi_json (1.8.4)
+    multi_json (1.9.2)
     multipart-post (1.2.0)
-    net-http-persistent (2.9)
-    net-ssh (2.7.0)
+    net-http-persistent (2.9.4)
+    net-ssh (2.8.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.1)
-      net-ssh (>= 2.1.4)
-      net-ssh-gateway (>= 0.99.0)
+    net-ssh-multi (1.2.0)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
     nio4r (1.0.0)
     nokogiri (1.5.11)
     nori (1.1.5)
@@ -136,12 +136,12 @@ GEM
       mixlib-shellout
       systemu (~> 2.5.2)
       yajl-ruby
-    parser (2.1.4)
+    parser (2.1.7)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
-    polyglot (0.3.3)
+    polyglot (0.3.4)
     powerpack (0.0.9)
-    pry (0.9.12.4)
+    pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
@@ -149,11 +149,11 @@ GEM
       rack (~> 1.2)
     rack (1.5.2)
     rainbow (2.0.0)
-    rake (10.1.1)
+    rake (10.2.2)
     rbzip2 (0.2.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    retryable (1.3.4)
+    retryable (1.3.5)
     ridley (1.5.3)
       addressable
       buff-config (~> 0.2)
@@ -178,10 +178,10 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.14.6)
     rubocop (0.18.1)
       json (>= 1.7.7, < 2)
       parser (~> 2.1.3)
@@ -196,7 +196,7 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.0)
       wasabi (~> 1.0)
-    slop (3.4.7)
+    slop (3.5.0)
     solve (0.8.2)
     strainer (3.3.0)
       berkshelf (~> 2.0)
@@ -230,7 +230,7 @@ PLATFORMS
 DEPENDENCIES
   berkshelf (~> 2.0.10)
   chef (~> 11.8)
-  chefspec (~> 3.1.4)
+  chefspec (~> 3.4.0)
   foodcritic (~> 3.0.3)
   json (<= 1.7.7)
   rubocop (~> 0.18.1)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c2cab25..ac5a384 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,9 @@
 # encoding: UTF-8
 require 'chefspec'
 require 'chefspec/berkshelf'
+
+ChefSpec::Coverage.start! { add_filter 'openstack-ops-messaging' }
+
 require_relative 'support/matcher'
 
 LOG_LEVEL = :fatal
@@ -37,9 +40,3 @@ shared_context 'ops_messaging_stubs' do
       .and_return 'erlang-cookie'
   end
 end
-
-# README(galstrom21): This will remove any coverage warnings from
-#   dependent cookbooks
-ChefSpec::Coverage.filters << '*/openstack-ops-messaging'
-
-at_exit { ChefSpec::Coverage.report! }