diff --git a/.kitchen.yml b/.kitchen.yml
index 5ca774f..e35b775 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -24,47 +24,64 @@
         "*":
           - mysql
           - mysqlver
-    mysqlver.sls:
-      mysql:
-        server:
-          enabled: true
-          version: "<%=ENV['MYSQL_VER'] || '5.7'%>"
 
 verifier:
   name: inspec
   sudo: true
 
+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'%>
 
 platforms:
-  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+  - name: xenial-2017.7
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+      image: *xenial-20177
       platform: ubuntu
 
 suites:
-
-  - name: replication_both
-    provisioner:
-      pillars-from-files:
-        mysql.sls: tests/pillar/replication_both.sls
-
-  - name: replication_master
+<% for mysql_version in ['5.7'] %>
+  - name: replication_master_<%=mysql_version%>
     provisioner:
       pillars-from-files:
         mysql.sls: tests/pillar/replication_master.sls
+      pillars:
+        mysqlver.sls:
+          mysql:
+            server:
+              enabled: true
+              version: "<%=mysql_version%>"
 
-  - name: replication_slave
+  - name: replication_slave_<%=mysql_version%>
     provisioner:
       pillars-from-files:
         mysql.sls: tests/pillar/replication_slave.sls
+      pillars:
+        mysqlver.sls:
+          mysql:
+            server:
+              enabled: true
+              version: "<%=mysql_version%>"
 
-  - name: server_client_database
+  - name: server_client_database_<%=mysql_version%>
     provisioner:
       pillars-from-files:
         mysql.sls: tests/pillar/server_client_database.sls
+      pillars:
+        mysqlver.sls:
+          mysql:
+            server:
+              enabled: true
+              version: "<%=mysql_version%>"
 
-  - name: server_client_user
+  - name: server_client_user_<%=mysql_version%>
     provisioner:
       pillars-from-files:
         mysql.sls: tests/pillar/server_client_user.sls
+      pillars:
+        mysqlver.sls:
+          mysql:
+            server:
+              enabled: true
+              version: "<%=mysql_version%>"
+<% end %>
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 116e08d..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-language: python
-python:
-- "2.7.13"
-sudo: required
-services:
-  - docker
-
-install:
-  - pip install PyYAML
-  - pip install virtualenv
-  - |
-    if [ ! -e Gemfile ]; then
-       curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'
-    fi
-  - bundle install
-
-env:
-  # - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=replication-both MYSQL_VER=5.7
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=replication-master MYSQL_VER=5.7
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=replication-slave MYSQL_VER=5.7
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=server-client-database MYSQL_VER=5.7
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=server-client-user MYSQL_VER=5.7
-  # - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=replication-both MYSQL_VER=5.7
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=replication-master MYSQL_VER=5.7
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=replication-slave MYSQL_VER=5.7
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=server-client-database MYSQL_VER=5.7
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=server-client-user MYSQL_VER=5.7
-  # - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=replication-both MYSQL_VER=5.7
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=replication-master MYSQL_VER=5.7
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=replication-slave MYSQL_VER=5.7
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=server-client-database MYSQL_VER=5.7
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=server-client-user MYSQL_VER=5.7
-
-before_script:
-  - set -o pipefail
-  - make test | tail
-
-script:
-  - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
-  - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6123573504759330786b
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: never  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always
-    on_cancel: never    # options: [always|never|change] default: always
-    on_error: never    # options: [always|never|change] default: always
-  email: false
\ No newline at end of file