diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index 53d18c2..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-driver:
-  name: docker
-  binary: "./docker"
-  socket: tcp://docker.poise.io:443
-  tls_verify: true
-  tls_cacert: test/docker/docker.ca
-  tls_cert: test/docker/docker.pem
-  tls_key: test/docker/docker.key
diff --git a/.kitchen.yml b/.kitchen.yml
index 3586031..919aef4 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,8 +1,3 @@
 ---
 #<% require 'poise_boiler' %>
-<%= PoiseBoiler.kitchen(platforms: 'linux') %>
-
-suites:
-- name: default
-  run_list:
-  - recipe[poise-service-runit_test]
+<%= PoiseBoiler.kitchen %>
diff --git a/.travis.yml b/.travis.yml
index bba841b..d61fbcc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ rvm:
 env:
   global:
   - USE_SYSTEM_GECODE=true
-  - KITCHEN_LOCAL_YAML=.kitchen.travis.yml
   - secure: kNNXqspdcPM4GuCo7VNCzbIh/fN/aGqTx6WgIIS8F9irYPH2IIFtDbKHqlk0S4rfmzbOk5MmnzYrmm3h5YXAkzGs7314ktczkdl+S2wkRY2GqGJuXmMYwXwCwVTrLJjcJypW7x1s0o4/aY5QDqV2IBpBSrIPT/oBMG+VjjWI8PA=
   - secure: y2w1rh3NEyAqV9ceIft2KDozYiPYM51G4i3tishT0Yupm0NPqg7ygX5C2O6Q8L2AR8I7WzXz2hp3vcvskmVTRyC+IIvMFxDUcsS4KVuFwR4wNBUVqETtKjg7b/SbAI5gpvnqVr8j0zrCQyVljUFzI1adPpe8NnKP6cxYZeSBX2g=
   - secure: 7SgF1m1gD+l4KoYQVLdZeOfAwT+Q5d9vxv6191eFfn89AsYS6xs8F702PzmRGZis8ELX7O4akVucpDMXS3iUdZFIj0h5gCwRTaAPAdwYJmd4iRdDa2wr3ckT2WNS1E/kY7Nj0F6kgNagik+WS/tAXa7k4r04nKpJPCPDuLCr92s=
diff --git a/Berksfile b/Berksfile
index 6341b03..1458f4a 100644
--- a/Berksfile
+++ b/Berksfile
@@ -22,11 +22,6 @@ cookbook 'poise', gem: 'poise'
 cookbook 'poise-service', gem: 'poise-service'
 cookbook 'poise-service-runit', gem: 'poise-service-runit'
 
-group :test do
-  cookbook 'poise-service-runit_test', path: 'test/cookbooks/poise-service-runit_test'
-  cookbook 'apt'
-end
-
 # For the master build, pull in the runit cookbook from git.
 if ENV['POISE_MASTER_BUILD']
   cookbook 'runit', github: 'hw-cookbooks/runit', branch: 'develop'
diff --git a/Gemfile b/Gemfile
index 32a94c6..42b8226 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,4 +30,5 @@ end
 dev_gem 'halite'
 dev_gem 'poise'
 dev_gem 'poise-boiler'
+dev_gem 'poise-profiler'
 dev_gem 'poise-service'
diff --git a/poise-service-runit.gemspec b/poise-service-runit.gemspec
index 18196f3..86f69c8 100644
--- a/poise-service-runit.gemspec
+++ b/poise-service-runit.gemspec
@@ -37,7 +37,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'poise', '~> 2.0'
   spec.add_dependency 'poise-service', '~> 1.0'
 
-  spec.add_development_dependency 'poise-boiler', '~> 1.0'
+  spec.add_development_dependency 'berkshelf', '~> 4.0'
+  spec.add_development_dependency 'poise-boiler', '~> 1.6'
 
   spec.metadata['halite_dependencies'] = 'runit ~> 1.7'
 end
diff --git a/test/cookbooks/poise-service-runit_test/metadata.rb b/test/cookbook/metadata.rb
similarity index 100%
rename from test/cookbooks/poise-service-runit_test/metadata.rb
rename to test/cookbook/metadata.rb
diff --git a/test/cookbooks/poise-service-runit_test/recipes/default.rb b/test/cookbook/recipes/default.rb
similarity index 100%
rename from test/cookbooks/poise-service-runit_test/recipes/default.rb
rename to test/cookbook/recipes/default.rb
diff --git a/test/gemfiles/master.gemfile b/test/gemfiles/master.gemfile
index bc96129..2726ccf 100644
--- a/test/gemfiles/master.gemfile
+++ b/test/gemfiles/master.gemfile
@@ -20,4 +20,5 @@ gem 'chef', github: 'chef/chef'
 gem 'halite', github: 'poise/halite'
 gem 'poise', github: 'poise/poise'
 gem 'poise-boiler', github: 'poise/poise-boiler'
+gem 'poise-profiler', github: 'poise/poise-profiler'
 gem 'poise-service', github: 'poise/poise-service'