diff --git a/.travis.yml b/.travis.yml
index 51194c21..83357818 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,33 +4,10 @@ sudo: false
 cache:
   - bundler
 rvm:
-  - 1.9.3
-  - 2.0
   - 2.1
-gemfile:
-  - Gemfile
-  - gemfiles/chef-11.4.4/Gemfile
-  - gemfiles/chef-11.6.2/Gemfile
-  - gemfiles/chef-11.8.2/Gemfile
-  - gemfiles/chef-11.10.4/Gemfile
 matrix:
   fast_finish: true
-  exclude:
-    - rvm: 2.0
-      gemfile: gemfiles/chef-11.4.4/Gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/chef-11.4.4/Gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/chef-11.6.2/Gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/chef-11.6.2/Gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/chef-11.8.2/Gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/chef-11.8.2/Gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/chef-11.10.4/Gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/chef-11.10.4/Gemfile
-  allow_failures:
-    - gemfile: gemfiles/chef-11.4.4/Gemfile
+  include:
+    - rvm: 1.9
+      gemfile: gemfiles/chef-11/Gemfile
+      script: bundle exec rspec spec
diff --git a/Gemfile b/Gemfile
index da4bc052..7c4dd034 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,7 @@ end
 
 group :test do
   gem 'berkshelf'
+  gem 'chef', '= 11.18.12'
   gem 'chefspec'
   gem 'test-kitchen'
   gem 'kitchen-vagrant'
diff --git a/Gemfile.lock b/Gemfile.lock
index 31be40cc..ca2bdc28 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,12 +37,12 @@ GEM
     celluloid-io (0.16.0.pre2)
       celluloid (>= 0.16.0.pre)
       nio4r (>= 1.0.0)
-    chef (11.12.8)
-      chef-zero (>= 2.0.2, < 2.1)
+    chef (11.18.12)
+      chef-zero (~> 2.2, >= 2.2.1)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
+      ffi-yajl (~> 1.2)
       highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.8.1)
       mime-types (~> 1.16)
       mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
@@ -51,23 +51,23 @@ GEM
       mixlib-shellout (~> 1.4)
       net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
-      ohai (~> 7.0.4)
+      ohai (~> 7.4)
+      plist (~> 3.1.0)
       pry (~> 0.9)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
+      rest-client (>= 1.0.4, <= 1.6.7)
     chef-api (0.5.0)
       logify (~> 0.1)
       mime-types
-    chef-zero (2.0.2)
+    chef-zero (2.2.1)
+      ffi-yajl (~> 1.1)
       hashie (~> 2.0)
-      json
       mixlib-log (~> 1.3)
       rack
-    chefspec (4.0.1)
-      chef (~> 11.12)
-      fauxhai (~> 2.0)
+    chefspec (4.7.0)
+      chef (>= 11.14)
+      fauxhai (~> 3.2)
       rspec (~> 3.0)
-    coderay (1.1.0)
+    coderay (1.1.1)
     dep-selector-libgecode (1.0.2)
     dep_selector (1.0.3)
       dep-selector-libgecode (~> 1.0)
@@ -76,10 +76,12 @@ GEM
     erubis (2.7.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    fauxhai (2.1.2)
+    fauxhai (3.8.0)
       net-ssh
-      ohai
     ffi (1.9.3)
+    ffi-yajl (1.4.0)
+      ffi (~> 1.5)
+      libyajl2 (~> 1.2)
     foodcritic (4.0.0)
       erubis
       gherkin (~> 2.11)
@@ -91,14 +93,15 @@ GEM
     gherkin (2.12.2)
       multi_json (~> 1.3)
     hashie (2.1.2)
-    highline (1.6.21)
+    highline (1.7.8)
     hitimes (1.2.1)
-    ipaddress (0.8.0)
+    ipaddress (0.8.3)
     json (1.8.1)
     kitchen-docker (2.4.0)
       test-kitchen (>= 1.0.0)
     kitchen-vagrant (0.20.0)
       test-kitchen (~> 1.4)
+    libyajl2 (1.2.0)
     logify (0.2.0)
     method_source (0.8.2)
     mime-types (1.25.1)
@@ -106,8 +109,8 @@ GEM
     minitar (0.5.4)
     mixlib-authentication (1.3.0)
       mixlib-log
-    mixlib-cli (1.5.0)
-    mixlib-config (2.1.0)
+    mixlib-cli (1.7.0)
+    mixlib-config (2.2.1)
     mixlib-install (1.1.0)
       artifactory
       mixlib-shellout
@@ -123,7 +126,7 @@ GEM
     net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.2.0)
+    net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     nio4r (1.1.1)
@@ -131,17 +134,20 @@ GEM
       mini_portile (~> 0.6.0)
     octokit (3.2.0)
       sawyer (~> 0.5.3)
-    ohai (7.0.4)
+    ohai (7.4.1)
+      ffi (~> 1.9)
+      ffi-yajl (~> 1.1)
       ipaddress
       mime-types (~> 1.16)
       mixlib-cli
       mixlib-config (~> 2.0)
       mixlib-log
       mixlib-shellout (~> 1.2)
-      systemu (~> 2.5.2)
-      yajl-ruby
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    plist (3.1.0)
     polyglot (0.3.5)
-    pry (0.10.0)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -167,32 +173,33 @@ GEM
       retryable
       semverse (~> 1.1)
       varia_model (~> 0.4)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     rufus-lru (1.0.5)
     safe_yaml (1.0.4)
     sawyer (0.5.4)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     semverse (1.1.0)
-    slop (3.5.0)
+    slop (3.6.0)
     solve (1.2.0)
       dep_selector (~> 1.0)
       semverse (~> 1.1)
     stove (3.2.8)
       chef-api (~> 0.5)
       logify (~> 0.2)
-    systemu (2.5.2)
+    systemu (2.6.5)
     test-kitchen (1.8.0)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
@@ -208,6 +215,7 @@ GEM
     varia_model (0.4.0)
       buff-extensions (~> 1.0)
       hashie (>= 2.0.2, < 3.0.0)
+    wmi-lite (1.0.0)
     yajl-ruby (1.2.1)
 
 PLATFORMS
@@ -216,6 +224,7 @@ PLATFORMS
 DEPENDENCIES
   berkshelf
   busser-serverspec
+  chef (= 11.18.12)
   chefspec
   foodcritic
   kitchen-docker
diff --git a/gemfiles/chef-11.10.4/Gemfile b/gemfiles/chef-11.10.4/Gemfile
deleted file mode 100644
index eda8b8b5..00000000
--- a/gemfiles/chef-11.10.4/Gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-group :test do
-  gem 'rake'
-  gem 'stove'
-  gem 'foodcritic', '< 5'
-  gem 'berkshelf', '< 4'
-  gem 'chef', '= 11.10.4'
-  gem 'rspec', '= 2.14.1'
-  gem 'chefspec', '= 3.4.0'
-end
diff --git a/gemfiles/chef-11.4.4/Gemfile b/gemfiles/chef-11.4.4/Gemfile
deleted file mode 100644
index c61d5d16..00000000
--- a/gemfiles/chef-11.4.4/Gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-group :test do
-  gem 'rake'
-  gem 'stove'
-  gem 'foodcritic', '< 5'
-  gem 'berkshelf', '< 4'
-  gem 'chef', '= 11.4.4'
-  gem 'rspec', '= 2.14.1'
-  gem 'chefspec', '= 3.4.0'
-end
diff --git a/gemfiles/chef-11.4.4/Gemfile.lock b/gemfiles/chef-11.4.4/Gemfile.lock
deleted file mode 100644
index 490142e9..00000000
--- a/gemfiles/chef-11.4.4/Gemfile.lock
+++ /dev/null
@@ -1,181 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    berkshelf (3.1.3)
-      addressable (~> 2.3.4)
-      berkshelf-api-client (~> 1.2)
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-shell_out (~> 0.1)
-      celluloid (~> 0.16.0.pre)
-      celluloid-io (~> 0.16.0.pre)
-      faraday (~> 0.9.0)
-      minitar (~> 0.5.4)
-      octokit (~> 3.0)
-      retryable (~> 1.3.3)
-      ridley (~> 4.0)
-      solve (~> 1.1)
-      thor (~> 0.18)
-    berkshelf-api-client (1.2.0)
-      faraday (~> 0.9.0)
-    buff-config (1.0.0)
-      buff-extensions (~> 1.0)
-      varia_model (~> 0.4)
-    buff-extensions (1.0.0)
-    buff-ignore (1.1.1)
-    buff-ruby_engine (0.1.0)
-    buff-shell_out (0.1.1)
-      buff-ruby_engine (~> 0.1.0)
-    celluloid (0.16.0.pre2)
-      timers (~> 3.0.0)
-    celluloid-io (0.16.0.pre2)
-      celluloid (>= 0.16.0.pre)
-      nio4r (>= 1.0.0)
-    chef (11.4.4)
-      erubis
-      highline (>= 1.6.9)
-      json (>= 1.4.4, <= 1.7.7)
-      mixlib-authentication (>= 1.3.0)
-      mixlib-cli (~> 1.3.0)
-      mixlib-config (>= 1.1.2)
-      mixlib-log (>= 1.3.0)
-      mixlib-shellout
-      net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1.0)
-      ohai (>= 0.6.0)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
-    chef-api (0.5.0)
-      logify (~> 0.1)
-      mime-types
-    chefspec (3.4.0)
-      chef (~> 11.0)
-      fauxhai (~> 2.0)
-      rspec (~> 2.14)
-    dep-selector-libgecode (1.0.2)
-    dep_selector (1.0.3)
-      dep-selector-libgecode (~> 1.0)
-      ffi (~> 1.9)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    fauxhai (2.3.0)
-      net-ssh
-      ohai
-    ffi (1.9.3)
-    foodcritic (4.0.0)
-      erubis
-      gherkin (~> 2.11)
-      nokogiri (~> 1.5)
-      rake
-      rufus-lru (~> 1.0)
-      treetop (~> 1.4)
-      yajl-ruby (~> 1.1)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    hashie (2.1.2)
-    highline (1.7.8)
-    hitimes (1.2.1)
-    ipaddress (0.8.0)
-    json (1.7.7)
-    logify (0.2.0)
-    mime-types (1.25.1)
-    mini_portile (0.6.1)
-    minitar (0.5.4)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-cli (1.3.0)
-    mixlib-config (2.1.0)
-    mixlib-log (1.6.0)
-    mixlib-shellout (1.6.1)
-    multi_json (1.10.1)
-    multipart-post (2.0.0)
-    net-http-persistent (2.9.4)
-    net-ssh (2.9.2)
-    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)
-    nio4r (1.1.1)
-    nokogiri (1.6.4.1)
-      mini_portile (~> 0.6.0)
-    octokit (3.2.0)
-      sawyer (~> 0.5.3)
-    ohai (7.0.4)
-      ipaddress
-      mime-types (~> 1.16)
-      mixlib-cli
-      mixlib-config (~> 2.0)
-      mixlib-log
-      mixlib-shellout (~> 1.2)
-      systemu (~> 2.5.2)
-      yajl-ruby
-    polyglot (0.3.5)
-    rake (10.3.2)
-    rest-client (1.6.9)
-      mime-types (~> 1.16)
-    retryable (1.3.5)
-    ridley (4.0.0)
-      addressable
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-ignore (~> 1.1)
-      buff-shell_out (~> 0.1)
-      celluloid (~> 0.16.0.pre)
-      celluloid-io (~> 0.16.0.pre)
-      erubis
-      faraday (~> 0.9.0)
-      hashie (>= 2.0.2, < 3.0.0)
-      json (>= 1.7.7)
-      mixlib-authentication (>= 1.3.0)
-      net-http-persistent (>= 2.8)
-      retryable
-      semverse (~> 1.1)
-      varia_model (~> 0.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rufus-lru (1.0.5)
-    sawyer (0.5.4)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    semverse (1.1.0)
-    solve (1.2.0)
-      dep_selector (~> 1.0)
-      semverse (~> 1.1)
-    stove (3.2.8)
-      chef-api (~> 0.5)
-      logify (~> 0.2)
-    systemu (2.5.2)
-    thor (0.19.1)
-    timers (3.0.1)
-      hitimes
-    treetop (1.5.3)
-      polyglot (~> 0.3)
-    varia_model (0.4.0)
-      buff-extensions (~> 1.0)
-      hashie (>= 2.0.2, < 3.0.0)
-    yajl-ruby (1.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  berkshelf (< 4)
-  chef (= 11.4.4)
-  chefspec (= 3.4.0)
-  foodcritic (< 5)
-  rake
-  rspec (= 2.14.1)
-  stove
-
-BUNDLED WITH
-   1.10.6
diff --git a/gemfiles/chef-11.6.2/Gemfile b/gemfiles/chef-11.6.2/Gemfile
deleted file mode 100644
index ff44581b..00000000
--- a/gemfiles/chef-11.6.2/Gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-group :test do
-  gem 'rake'
-  gem 'stove'
-  gem 'foodcritic', '< 5'
-  gem 'berkshelf', '< 4'
-  gem 'chef', '= 11.6.2'
-  gem 'rspec', '= 2.14.1'
-  gem 'chefspec', '= 3.4.0'
-end
diff --git a/gemfiles/chef-11.6.2/Gemfile.lock b/gemfiles/chef-11.6.2/Gemfile.lock
deleted file mode 100644
index 7917313e..00000000
--- a/gemfiles/chef-11.6.2/Gemfile.lock
+++ /dev/null
@@ -1,180 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    berkshelf (3.1.3)
-      addressable (~> 2.3.4)
-      berkshelf-api-client (~> 1.2)
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-shell_out (~> 0.1)
-      celluloid (~> 0.16.0.pre)
-      celluloid-io (~> 0.16.0.pre)
-      faraday (~> 0.9.0)
-      minitar (~> 0.5.4)
-      octokit (~> 3.0)
-      retryable (~> 1.3.3)
-      ridley (~> 4.0)
-      solve (~> 1.1)
-      thor (~> 0.18)
-    berkshelf-api-client (1.2.0)
-      faraday (~> 0.9.0)
-    buff-config (1.0.0)
-      buff-extensions (~> 1.0)
-      varia_model (~> 0.4)
-    buff-extensions (1.0.0)
-    buff-ignore (1.1.1)
-    buff-ruby_engine (0.1.0)
-    buff-shell_out (0.1.1)
-      buff-ruby_engine (~> 0.1.0)
-    celluloid (0.16.0.pre2)
-      timers (~> 3.0.0)
-    celluloid-io (0.16.0.pre2)
-      celluloid (>= 0.16.0.pre)
-      nio4r (>= 1.0.0)
-    chef (11.6.2)
-      erubis (~> 2.7)
-      highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.7.7)
-      mixlib-authentication (~> 1.3)
-      mixlib-cli (~> 1.3)
-      mixlib-config (~> 1.1, >= 1.1.2)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (~> 1.1)
-      net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1.0)
-      ohai (>= 0.6.0, < 7.0.0)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
-    chef-api (0.5.0)
-      logify (~> 0.1)
-      mime-types
-    chefspec (3.4.0)
-      chef (~> 11.0)
-      fauxhai (~> 2.0)
-      rspec (~> 2.14)
-    dep-selector-libgecode (1.0.2)
-    dep_selector (1.0.3)
-      dep-selector-libgecode (~> 1.0)
-      ffi (~> 1.9)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    fauxhai (2.3.0)
-      net-ssh
-      ohai
-    ffi (1.9.3)
-    foodcritic (4.0.0)
-      erubis
-      gherkin (~> 2.11)
-      nokogiri (~> 1.5)
-      rake
-      rufus-lru (~> 1.0)
-      treetop (~> 1.4)
-      yajl-ruby (~> 1.1)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    hashie (2.1.2)
-    highline (1.7.8)
-    hitimes (1.2.1)
-    ipaddress (0.8.0)
-    json (1.7.7)
-    logify (0.2.0)
-    mime-types (1.25.1)
-    mini_portile (0.6.1)
-    minitar (0.5.4)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-cli (1.5.0)
-    mixlib-config (1.1.2)
-    mixlib-log (1.6.0)
-    mixlib-shellout (1.6.1)
-    multi_json (1.10.1)
-    multipart-post (2.0.0)
-    net-http-persistent (2.9.4)
-    net-ssh (2.9.2)
-    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)
-    nio4r (1.1.1)
-    nokogiri (1.6.4.1)
-      mini_portile (~> 0.6.0)
-    octokit (3.2.0)
-      sawyer (~> 0.5.3)
-    ohai (6.24.2)
-      ipaddress
-      mixlib-cli
-      mixlib-config
-      mixlib-log
-      mixlib-shellout
-      systemu (~> 2.5.2)
-      yajl-ruby
-    polyglot (0.3.5)
-    rake (10.3.2)
-    rest-client (1.6.9)
-      mime-types (~> 1.16)
-    retryable (1.3.5)
-    ridley (4.0.0)
-      addressable
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-ignore (~> 1.1)
-      buff-shell_out (~> 0.1)
-      celluloid (~> 0.16.0.pre)
-      celluloid-io (~> 0.16.0.pre)
-      erubis
-      faraday (~> 0.9.0)
-      hashie (>= 2.0.2, < 3.0.0)
-      json (>= 1.7.7)
-      mixlib-authentication (>= 1.3.0)
-      net-http-persistent (>= 2.8)
-      retryable
-      semverse (~> 1.1)
-      varia_model (~> 0.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rufus-lru (1.0.5)
-    sawyer (0.5.4)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    semverse (1.1.0)
-    solve (1.2.0)
-      dep_selector (~> 1.0)
-      semverse (~> 1.1)
-    stove (3.2.8)
-      chef-api (~> 0.5)
-      logify (~> 0.2)
-    systemu (2.5.2)
-    thor (0.19.1)
-    timers (3.0.1)
-      hitimes
-    treetop (1.5.3)
-      polyglot (~> 0.3)
-    varia_model (0.4.0)
-      buff-extensions (~> 1.0)
-      hashie (>= 2.0.2, < 3.0.0)
-    yajl-ruby (1.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  berkshelf (< 4)
-  chef (= 11.6.2)
-  chefspec (= 3.4.0)
-  foodcritic (< 5)
-  rake
-  rspec (= 2.14.1)
-  stove
-
-BUNDLED WITH
-   1.10.6
diff --git a/gemfiles/chef-11.8.2/Gemfile b/gemfiles/chef-11.8.2/Gemfile
deleted file mode 100644
index d38982bc..00000000
--- a/gemfiles/chef-11.8.2/Gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-group :test do
-  gem 'rake'
-  gem 'stove'
-  gem 'foodcritic', '< 5'
-  gem 'berkshelf', '< 4'
-  gem 'chef', '= 11.8.2'
-  gem 'rspec', '= 2.14.1'
-  gem 'chefspec', '= 3.4.0'
-end
diff --git a/gemfiles/chef-11.8.2/Gemfile.lock b/gemfiles/chef-11.8.2/Gemfile.lock
deleted file mode 100644
index c10123d1..00000000
--- a/gemfiles/chef-11.8.2/Gemfile.lock
+++ /dev/null
@@ -1,202 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    berkshelf (3.1.3)
-      addressable (~> 2.3.4)
-      berkshelf-api-client (~> 1.2)
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-shell_out (~> 0.1)
-      celluloid (~> 0.16.0.pre)
-      celluloid-io (~> 0.16.0.pre)
-      faraday (~> 0.9.0)
-      minitar (~> 0.5.4)
-      octokit (~> 3.0)
-      retryable (~> 1.3.3)
-      ridley (~> 4.0)
-      solve (~> 1.1)
-      thor (~> 0.18)
-    berkshelf-api-client (1.2.0)
-      faraday (~> 0.9.0)
-    buff-config (1.0.0)
-      buff-extensions (~> 1.0)
-      varia_model (~> 0.4)
-    buff-extensions (1.0.0)
-    buff-ignore (1.1.1)
-    buff-ruby_engine (0.1.0)
-    buff-shell_out (0.1.1)
-      buff-ruby_engine (~> 0.1.0)
-    celluloid (0.16.0.pre2)
-      timers (~> 3.0.0)
-    celluloid-io (0.16.0.pre2)
-      celluloid (>= 0.16.0.pre)
-      nio4r (>= 1.0.0)
-    chef (11.8.2)
-      chef-zero (~> 1.6, >= 1.6.2)
-      diff-lcs (~> 1.2, >= 1.2.4)
-      erubis (~> 2.7)
-      highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.7.7)
-      mime-types (~> 1.16)
-      mixlib-authentication (~> 1.3)
-      mixlib-cli (~> 1.3)
-      mixlib-config (~> 2.0)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (~> 1.2)
-      net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1.0)
-      ohai (~> 6.0)
-      pry (~> 0.9)
-      puma (~> 1.6)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
-    chef-api (0.5.0)
-      logify (~> 0.1)
-      mime-types
-    chef-zero (1.7.3)
-      hashie (~> 2.0)
-      json
-      mixlib-log (~> 1.3)
-      moneta (< 0.7.0)
-      rack
-    chefspec (3.4.0)
-      chef (~> 11.0)
-      fauxhai (~> 2.0)
-      rspec (~> 2.14)
-    coderay (1.1.0)
-    dep-selector-libgecode (1.0.2)
-    dep_selector (1.0.3)
-      dep-selector-libgecode (~> 1.0)
-      ffi (~> 1.9)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    fauxhai (2.3.0)
-      net-ssh
-      ohai
-    ffi (1.9.3)
-    foodcritic (4.0.0)
-      erubis
-      gherkin (~> 2.11)
-      nokogiri (~> 1.5)
-      rake
-      rufus-lru (~> 1.0)
-      treetop (~> 1.4)
-      yajl-ruby (~> 1.1)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    hashie (2.1.2)
-    highline (1.7.8)
-    hitimes (1.2.1)
-    ipaddress (0.8.0)
-    json (1.7.7)
-    logify (0.2.0)
-    method_source (0.8.2)
-    mime-types (1.25.1)
-    mini_portile (0.6.1)
-    minitar (0.5.4)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-cli (1.5.0)
-    mixlib-config (2.2.1)
-    mixlib-log (1.6.0)
-    mixlib-shellout (1.6.1)
-    moneta (0.6.0)
-    multi_json (1.10.1)
-    multipart-post (2.0.0)
-    net-http-persistent (2.9.4)
-    net-ssh (2.9.2)
-    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)
-    nio4r (1.1.1)
-    nokogiri (1.6.4.1)
-      mini_portile (~> 0.6.0)
-    octokit (3.2.0)
-      sawyer (~> 0.5.3)
-    ohai (6.24.2)
-      ipaddress
-      mixlib-cli
-      mixlib-config
-      mixlib-log
-      mixlib-shellout
-      systemu (~> 2.5.2)
-      yajl-ruby
-    polyglot (0.3.5)
-    pry (0.10.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    puma (1.6.3)
-      rack (~> 1.2)
-    rack (1.6.4)
-    rake (10.3.2)
-    rest-client (1.6.9)
-      mime-types (~> 1.16)
-    retryable (1.3.5)
-    ridley (4.0.0)
-      addressable
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-ignore (~> 1.1)
-      buff-shell_out (~> 0.1)
-      celluloid (~> 0.16.0.pre)
-      celluloid-io (~> 0.16.0.pre)
-      erubis
-      faraday (~> 0.9.0)
-      hashie (>= 2.0.2, < 3.0.0)
-      json (>= 1.7.7)
-      mixlib-authentication (>= 1.3.0)
-      net-http-persistent (>= 2.8)
-      retryable
-      semverse (~> 1.1)
-      varia_model (~> 0.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rufus-lru (1.0.5)
-    sawyer (0.5.4)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    semverse (1.1.0)
-    slop (3.6.0)
-    solve (1.2.0)
-      dep_selector (~> 1.0)
-      semverse (~> 1.1)
-    stove (3.2.8)
-      chef-api (~> 0.5)
-      logify (~> 0.2)
-    systemu (2.5.2)
-    thor (0.19.1)
-    timers (3.0.1)
-      hitimes
-    treetop (1.5.3)
-      polyglot (~> 0.3)
-    varia_model (0.4.0)
-      buff-extensions (~> 1.0)
-      hashie (>= 2.0.2, < 3.0.0)
-    yajl-ruby (1.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  berkshelf (< 4)
-  chef (= 11.8.2)
-  chefspec (= 3.4.0)
-  foodcritic (< 5)
-  rake
-  rspec (= 2.14.1)
-  stove
-
-BUNDLED WITH
-   1.10.6
diff --git a/gemfiles/chef-11/Gemfile b/gemfiles/chef-11/Gemfile
new file mode 100644
index 00000000..4bc20b67
--- /dev/null
+++ b/gemfiles/chef-11/Gemfile
@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'berkshelf', '= 3.1.3'
+  gem 'chef', '= 11.18.12'
+  gem 'fauxhai', '= 3.4.0'
+  gem 'chefspec', '= 4.7.0'
+end
diff --git a/gemfiles/chef-11.10.4/Gemfile.lock b/gemfiles/chef-11/Gemfile.lock
similarity index 52%
rename from gemfiles/chef-11.10.4/Gemfile.lock
rename to gemfiles/chef-11/Gemfile.lock
index e9644c2d..97441dc7 100644
--- a/gemfiles/chef-11.10.4/Gemfile.lock
+++ b/gemfiles/chef-11/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.3.8)
     berkshelf (3.1.3)
       addressable (~> 2.3.4)
       berkshelf-api-client (~> 1.2)
@@ -17,126 +17,110 @@ GEM
       ridley (~> 4.0)
       solve (~> 1.1)
       thor (~> 0.18)
-    berkshelf-api-client (1.2.0)
-      faraday (~> 0.9.0)
-    buff-config (1.0.0)
+    berkshelf-api-client (1.3.1)
+      faraday (~> 0.9.1)
+      httpclient (~> 2.6.0)
+    buff-config (1.0.1)
       buff-extensions (~> 1.0)
       varia_model (~> 0.4)
     buff-extensions (1.0.0)
     buff-ignore (1.1.1)
     buff-ruby_engine (0.1.0)
-    buff-shell_out (0.1.1)
+    buff-shell_out (0.2.0)
       buff-ruby_engine (~> 0.1.0)
-    celluloid (0.16.0.pre2)
-      timers (~> 3.0.0)
-    celluloid-io (0.16.0.pre2)
-      celluloid (>= 0.16.0.pre)
-      nio4r (>= 1.0.0)
-    chef (11.10.4)
-      chef-zero (~> 1.7, >= 1.7.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    celluloid-io (0.16.2)
+      celluloid (>= 0.16.0)
+      nio4r (>= 1.1.0)
+    chef (11.18.12)
+      chef-zero (~> 2.2, >= 2.2.1)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
+      ffi-yajl (~> 1.2)
       highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.8.1)
       mime-types (~> 1.16)
       mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
       mixlib-config (~> 2.0)
       mixlib-log (~> 1.3)
-      mixlib-shellout (~> 1.3)
+      mixlib-shellout (~> 1.4)
       net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
-      ohai (~> 6.0)
+      ohai (~> 7.4)
+      plist (~> 3.1.0)
       pry (~> 0.9)
-      puma (~> 1.6)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
-    chef-api (0.5.0)
-      logify (~> 0.1)
-      mime-types
-    chef-zero (1.7.3)
+      rest-client (>= 1.0.4, <= 1.6.7)
+    chef-zero (2.2.1)
+      ffi-yajl (~> 1.1)
       hashie (~> 2.0)
-      json
       mixlib-log (~> 1.3)
-      moneta (< 0.7.0)
       rack
-    chefspec (3.4.0)
-      chef (~> 11.0)
-      fauxhai (~> 2.0)
-      rspec (~> 2.14)
-    coderay (1.1.0)
-    dep-selector-libgecode (1.0.2)
+    chefspec (4.7.0)
+      chef (>= 11.14)
+      fauxhai (~> 3.2)
+      rspec (~> 3.0)
+    coderay (1.1.1)
+    dep-selector-libgecode (1.3.1)
     dep_selector (1.0.3)
       dep-selector-libgecode (~> 1.0)
       ffi (~> 1.9)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fauxhai (2.3.0)
+    fauxhai (3.4.0)
       net-ssh
-      ohai
     ffi (1.9.3)
-    foodcritic (4.0.0)
-      erubis
-      gherkin (~> 2.11)
-      nokogiri (~> 1.5)
-      rake
-      rufus-lru (~> 1.0)
-      treetop (~> 1.4)
-      yajl-ruby (~> 1.1)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
+    ffi-yajl (1.4.0)
+      ffi (~> 1.5)
+      libyajl2 (~> 1.2)
     hashie (2.1.2)
     highline (1.7.8)
-    hitimes (1.2.1)
-    ipaddress (0.8.0)
-    json (1.8.1)
-    logify (0.2.0)
+    hitimes (1.2.4)
+    httpclient (2.6.0.1)
+    ipaddress (0.8.3)
+    json (1.8.3)
+    libyajl2 (1.2.0)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.6.1)
     minitar (0.5.4)
-    mixlib-authentication (1.3.0)
+    mixlib-authentication (1.4.1)
       mixlib-log
-    mixlib-cli (1.5.0)
+    mixlib-cli (1.7.0)
     mixlib-config (2.2.1)
-    mixlib-log (1.6.0)
+    mixlib-log (1.7.0)
     mixlib-shellout (1.6.1)
-    moneta (0.6.0)
-    multi_json (1.10.1)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
-    net-ssh (2.9.2)
+    net-ssh (2.9.4)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    nio4r (1.1.1)
-    nokogiri (1.6.4.1)
-      mini_portile (~> 0.6.0)
-    octokit (3.2.0)
-      sawyer (~> 0.5.3)
-    ohai (6.24.2)
+    nio4r (1.2.1)
+    octokit (3.8.0)
+      sawyer (~> 0.6.0, >= 0.5.3)
+    ohai (7.4.1)
+      ffi (~> 1.9)
+      ffi-yajl (~> 1.1)
       ipaddress
+      mime-types (~> 1.16)
       mixlib-cli
-      mixlib-config
+      mixlib-config (~> 2.0)
       mixlib-log
-      mixlib-shellout
-      systemu (~> 2.5.2)
-      yajl-ruby
-    polyglot (0.3.5)
-    pry (0.10.2)
+      mixlib-shellout (~> 1.2)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    plist (3.1.0)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puma (1.6.3)
-      rack (~> 1.2)
     rack (1.6.4)
-    rake (10.3.2)
-    rest-client (1.6.9)
-      mime-types (~> 1.16)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     retryable (1.3.5)
     ridley (4.0.0)
       addressable
@@ -155,48 +139,44 @@ GEM
       retryable
       semverse (~> 1.1)
       varia_model (~> 0.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rufus-lru (1.0.5)
-    sawyer (0.5.4)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sawyer (0.6.0)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
-    semverse (1.1.0)
+    semverse (1.2.1)
     slop (3.6.0)
-    solve (1.2.0)
+    solve (1.2.1)
       dep_selector (~> 1.0)
       semverse (~> 1.1)
-    stove (3.2.8)
-      chef-api (~> 0.5)
-      logify (~> 0.2)
-    systemu (2.5.2)
+    systemu (2.6.5)
     thor (0.19.1)
-    timers (3.0.1)
+    timers (4.0.4)
       hitimes
-    treetop (1.5.3)
-      polyglot (~> 0.3)
-    varia_model (0.4.0)
+    varia_model (0.4.1)
       buff-extensions (~> 1.0)
-      hashie (>= 2.0.2, < 3.0.0)
-    yajl-ruby (1.2.1)
+      hashie (>= 2.0.2, < 4.0.0)
+    wmi-lite (1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  berkshelf (< 4)
-  chef (= 11.10.4)
-  chefspec (= 3.4.0)
-  foodcritic (< 5)
-  rake
-  rspec (= 2.14.1)
-  stove
+  berkshelf (= 3.1.3)
+  chef (= 11.18.12)
+  chefspec (= 4.7.0)
+  fauxhai (= 3.4.0)
 
 BUNDLED WITH
    1.10.6
diff --git a/spec/recipes/configure_spec.rb b/spec/recipes/configure_spec.rb
index 767cf5cb..ebe59e24 100644
--- a/spec/recipes/configure_spec.rb
+++ b/spec/recipes/configure_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'kafka::_configure' do
   let :chef_run do
-    ChefSpec::Runner.new do |node|
+    ChefSpec::SoloRunner.new do |node|
       node.set['kafka'] = kafka_attributes
       node.set['kafka']['broker'] = broker_attributes
     end.converge(*described_recipes)
@@ -58,7 +58,7 @@
 
       context 'when broker id is larger than 2**31' do
         let :chef_run do
-          ChefSpec::Runner.new do |node|
+          ChefSpec::SoloRunner.new do |node|
             node.automatic['ipaddress'] = '255.255.255.255'
           end.converge(*described_recipes)
         end
@@ -187,7 +187,7 @@
 
   shared_examples_for 'an init style' do
     let :chef_run do
-      ChefSpec::Runner.new(platform_and_version) do |node|
+      ChefSpec::SoloRunner.new(platform_and_version) do |node|
         node.set['kafka']['scala_version'] = '2.8.0'
         node.set['kafka']['init_style'] = init_style
         node.set['kafka']['broker'] = broker_attributes
diff --git a/spec/recipes/default_spec.rb b/spec/recipes/default_spec.rb
index 8f3ba5b3..e7b77b77 100644
--- a/spec/recipes/default_spec.rb
+++ b/spec/recipes/default_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'kafka::default' do
   let :chef_run do
-    ChefSpec::Runner.new.converge(described_recipe)
+    ChefSpec::SoloRunner.new.converge(described_recipe)
   end
 
   it 'includes kafka::_defaults' do
diff --git a/spec/recipes/defaults_spec.rb b/spec/recipes/defaults_spec.rb
index 33d797fa..bb8819c2 100644
--- a/spec/recipes/defaults_spec.rb
+++ b/spec/recipes/defaults_spec.rb
@@ -5,7 +5,7 @@
 
 describe 'kafka::_defaults' do
   let :chef_run do
-    r = ChefSpec::Runner.new do |node|
+    r = ChefSpec::SoloRunner.new do |node|
       node.set['kafka']['broker'] = broker_attributes
     end
     r.converge(described_recipe)
diff --git a/spec/recipes/install_spec.rb b/spec/recipes/install_spec.rb
index 98a3da2d..57e4451f 100644
--- a/spec/recipes/install_spec.rb
+++ b/spec/recipes/install_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'kafka::_install' do
   let :chef_run do
-    r = ChefSpec::Runner.new(step_into: %w(kafka_download kafka_install))
+    r = ChefSpec::SoloRunner.new(step_into: %w(kafka_download kafka_install))
     r.converge(*described_recipes)
   end
 
diff --git a/spec/recipes/setup_spec.rb b/spec/recipes/setup_spec.rb
index 7b7f315b..bc1bb611 100644
--- a/spec/recipes/setup_spec.rb
+++ b/spec/recipes/setup_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'kafka::_setup' do
   let :chef_run do
-    ChefSpec::Runner.new do |node|
+    ChefSpec::SoloRunner.new do |node|
       node.set['kafka'] = kafka_attrs
     end.converge('kafka::_defaults', described_recipe)
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 88c451ca..810dfa67 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -8,6 +8,7 @@
 ChefSpec::Coverage.start!
 
 RSpec.configure do |config|
+  config.file_cache_path = File.join(Dir.tmpdir, 'chefspec') if config.respond_to?(:file_cache_path)
   config.platform = 'centos'
   config.version = '6.4'
   config.alias_it_should_behave_like_to :it_behaves_correctly, 'behaves correctly'