diff --git a/.kitchen.yml b/.kitchen.yml
index 6d7a1b2..dd865f7 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -29,8 +29,7 @@
       "*":
         - linux
         - mysql
-#TODO: use rabbitmq when https://mirantis.jira.com/browse/PROD-11712 is fixed
-#        - rabbitmq
+        - rabbitmq
         - designate
   pillars:
     top.sls:
@@ -46,9 +45,9 @@
   sudo: true
 
 platforms:
-  - name: <%= ENV['PLATFORM'] || 'ubuntu-xenial' %>
+  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%= ENV['PLATFORM'] || 'trevorj/salty-whales:xenial' %>
+      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
 
 suites:
diff --git a/.travis.yml b/.travis.yml
index 3241f95..bf50d8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,15 +17,17 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:xenial-2017.7
-  - PLATFORM=trevorj/salty-whales:xenial
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3
+#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7
 
 before_script:
   - set -o pipefail
   - make test | tail
 
 script:
-  - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
+  - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
+  - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
 
 notifications:
   webhooks: