diff --git a/.kitchen.yml b/.kitchen.yml
index a39cb06..69f0242 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,49 +1,55 @@
 ---
 driver_plugin: vagrant
+driver_config:
+  require_chef_omnibus: true
+
 platforms:
 - name: ubuntu-12.04
   driver_config:
     box: opscode-ubuntu-12.04
-    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
-    require_chef_omnibus: true
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
   run_list:
   - recipe[apt]
+
 - name: ubuntu-10.04
   driver_config:
     box: opscode-ubuntu-10.04
-    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box
-    require_chef_omnibus: true
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box
   run_list:
   - recipe[apt]
+
 - name: centos-6.4
   driver_config:
     box: opscode-centos-6.4
-    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box
-    require_chef_omnibus: true
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box
+
 - name: centos-5.9
   driver_config:
     box: opscode-centos-5.9
-    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box
-    require_chef_omnibus: true
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box
 
 suites:
 - name: default
   run_list:
   - recipe[postfix]
   attributes: {}
+
 - name: aliases
   run_list:
-  - recipe[postfix]
+  - recipe[postfix::aliases]
   attributes: {}
+
 - name: client
   run_list:
-  - recipe[postfix]
+  - recipe[postfix::client]
   attributes: {}
+
 - name: server
   run_list:
-  - recipe[postfix]
+  - recipe[postfix::server]
   attributes: {}
+
 - name: sasl_auth
   run_list:
-  - recipe[postfix]
+  - recipe[postfix::sasl_auth]
   attributes: {}