diff --git a/.kitchen.yml b/.kitchen.yml
index e66639c..c055621 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,6 +18,7 @@
     - name: salt
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/salt
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
   state_top:
     base:
       "*":
@@ -33,8 +34,7 @@
   sudo: true
 
 docker_images:
-  - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
-  - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+  - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2017.7:latest'%>
 
 platforms:
   - name: xenial-2017.7
@@ -42,11 +42,6 @@
       image: *xenial-20177
       platform: ubuntu
 
-  - name: xenial-stable
-    driver_config:
-      image: *xenial-stable
-      platform: ubuntu
-
 suites:
   - name: admin
     provisioner:
diff --git a/tests/pillar/single_global_parameters.sls b/tests/pillar/single_global_parameters.sls
index 56d3f08..3bb7a71 100644
--- a/tests/pillar/single_global_parameters.sls
+++ b/tests/pillar/single_global_parameters.sls
@@ -1,9 +1,6 @@
 haproxy:
   proxy:
     enabled: true
-    mode: tcp
-    logging: syslog
-    max_connections: 1024
     nbproc: 4
     global:
       chroot: /var/lib/haproxy