diff --git a/.kitchen.yml b/.kitchen.yml
index c061a66..cc263dd 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -15,36 +15,47 @@
   grains:
     noservices: True
   dependencies:
-    - name: neutron
+    - name: linux
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-neutron
-    - name: nova
-      repo: git
-      source: https://github.com/salt-formulas/salt-formula-nova
+      source: https://github.com/salt-formulas/salt-formula-linux
   state_top:
     base:
       "*":
+        - linux.system
         - octavia
   pillars:
     top.sls:
       base:
         "*":
+          - linux_repo_openstack
           - octavia
+  pillars-from-files:
+    linux_repo_openstack.sls: tests/pillar/repo_openstack.sls
 
 verifier:
   name: inspec
   sudo: true
 
-
 platforms:
-  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
+  - name: 'ubuntu-xenial'
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
+      image: 'trevorj/salty-whales:xenial'
       platform: ubuntu
 
 suites:
-  - name: single
+  - name: api_single
     provisioner:
       pillars-from-files:
-        octavia.sls: tests/pillar/single.sls
+        octavia.sls: tests/pillar/api_single.sls
+
+  - name: api_cluster
+    provisioner:
+      pillars-from-files:
+        octavia.sls: tests/pillar/api_cluster.sls
+
+  - name: manager_single
+    provisioner:
+      pillars-from-files:
+        octavia.sls: tests/pillar/manager_single.sls
+
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125