diff --git a/.kitchen.yml b/.kitchen.yml
index ece2c75..33c4fe4 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -32,7 +32,7 @@
             source:
               engine: pip
   pillars-from-files:
-    docker_debian_repo.sls: tests/pillar/repo_docker.sls
+    docker_debian_repo.sls: tests/repo_docker.sls
   dependencies:
     - name: linux
       repo: git
@@ -45,7 +45,6 @@
 
 docker_images:
   - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2017.7:latest'%>
-  - &xenial-20183 <%=ENV['IMAGE_XENIAL_20183'] || 'docker-dev-local.docker.mirantis.net/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2018.3:latest'%>
 
 platforms:
   - name: xenial-2017.7
@@ -53,11 +52,6 @@
       image: *xenial-20177
       platform: ubuntu
 
-  - name: xenial-2018.3
-    driver_config:
-      image: *xenial-20183
-      platform: ubuntu
-
 suites:
 
   - name: client_images
@@ -65,18 +59,23 @@
       pillars-from-files:
         docker.sls: tests/pillar/client_images.sls
 
-  - name: client_compose
+  - name: client_compose_pip
     provisioner:
       pillars-from-files:
-        docker.sls: tests/pillar/client_compose.sls
+        docker.sls: tests/pillar/client_compose_pip.sls
+
+  - name: client_compose_pkg
+    provisioner:
+      pillars-from-files:
+        docker.sls: tests/pillar/client_compose_pkg.sls
 
   - name: client_container
     provisioner:
       pillars-from-files:
         docker.sls: tests/pillar/client_container.sls
 
-  - name: host_single
+  - name: host
     provisioner:
       pillars-from-files:
-        docker.sls: tests/pillar/host_single.sls
+        docker.sls: tests/pillar/host.sls
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125