diff --git a/.kitchen.yml b/.kitchen.yml
index 91fcb68..5cecb3b 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,9 +1,9 @@
 ---
 driver:
   name: vagrant
-  vm_hostname: 'owncloud.local'
+  vm_hostname: owncloud.local
   network:
-  - ["forwarded_port", {guest: 80, host: 8080, auto_correct: true}]
+  - ["forwarded_port", {guest:  80, host: 8080, auto_correct: true}]
   - ["forwarded_port", {guest: 443, host: 8443, auto_correct: true}]
   customize:
     memory: 512
@@ -14,49 +14,52 @@ provisioner:
   attributes:
     owncloud:
       server_aliases:
-        - "localhost"
+      - localhost
       config:
         trusted_domains:
-          - "localhost:8080"
-          - "localhost:8443"
+        - localhost:8080
+        - localhost:8443
 
 platforms:
-- name: ubuntu-14.04
-- name: ubuntu-12.04
-- name: ubuntu-10.04
-- name: centos-7.0
-  run_list: ["recipe[selinux::disabled]"]
-- name: centos-6.6
-  run_list: ["recipe[selinux::disabled]"]
 - name: centos-5.11
-  run_list: ["recipe[selinux::disabled]"]
+  run_list: recipe[selinux::disabled]
+- name: centos-6.7
+  run_list: recipe[selinux::disabled]
+- name: centos-7.1
+  run_list: recipe[selinux::disabled]
+- name: debian-6.0.10
 - name: debian-7.8
+- name: debian-8.1
+- name: ubuntu-10.04
+- name: ubuntu-12.04
+- name: ubuntu-14.04
+- name: ubuntu-15.04
 
 suites:
 - name: mysql
-  run_list: ["recipe[owncloud_test::mysql]"]
+  run_list: recipe[owncloud_test::mysql]
 - name: mysqlport
-  run_list: ["recipe[owncloud_test::mysql]"]
+  run_list: recipe[owncloud_test::mysql]
   attributes:
     owncloud:
       config:
         dbport: 4321
 - name: postgresql
-  run_list: ["recipe[owncloud_test::postgresql]"]
+  run_list: recipe[owncloud_test::postgresql]
 - name: postgresqlport
-  run_list: ["recipe[owncloud_test::postgresql]"]
+  run_list: recipe[owncloud_test::postgresql]
   attributes:
     owncloud:
       config:
         dbport: 4321
 - name: sqlite
-  run_list: ["recipe[owncloud_test::sqlite]"]
+  run_list: recipe[owncloud_test::sqlite]
 - name: nginx
-  run_list: ["recipe[owncloud_test::nginx]"]
+  run_list: recipe[owncloud_test::nginx]
 - name: ssl_data_bag
-  run_list: ["recipe[owncloud_test::mysql]"]
-  data_bags_path: "test/integration/mysql/data_bags"
-  encrypted_data_bag_secret_key_path: "test/integration/mysql/encrypted_data_bag_secret"
+  run_list: recipe[owncloud_test::mysql]
+  data_bags_path: test/integration/mysql/data_bags
+  encrypted_data_bag_secret_key_path: test/integration/mysql/encrypted_data_bag_secret
   attributes:
     owncloud:
       ssl_key:
@@ -71,7 +74,7 @@ suites:
         item: cert
         item_key: content
 - name: ssl_attribute
-  run_list: ["recipe[owncloud_test::mysql]"]
+  run_list: recipe[owncloud_test::mysql]
   attributes:
     owncloud:
       ssl_key: