diff --git a/.kitchen.yml b/.kitchen.yml
index a339105..2de4c62 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -29,9 +29,9 @@
   sudo: true
 
 platforms:
-  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
+  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial-2017.7'%>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
+      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial-2017.7'%>
       platform: ubuntu
 
 suites:
diff --git a/.travis.yml b/.travis.yml
index 59bf317..61d7fd6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,15 @@
   - bundle install
 
 env:
+  - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=rabbitmq-server
+  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=rabbitmq-server
+#  - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=rabbitmq-ssl-server
+#  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=rabbitmq-ssl-server
   - PLATFORM=trevorj/salty-whales:trusty SUITE=rabbitmq-server
   - PLATFORM=trevorj/salty-whales:xenial SUITE=rabbitmq-server
 #  - PLATFORM=trevorj/salty-whales:trusty SUITE=rabbitmq-ssl-server
 #  - PLATFORM=trevorj/salty-whales:xenial SUITE=rabbitmq-ssl-server
+## Test on both Salt version until there is new test policy accepted
 
 before_script:
   - set -o pipefail
diff --git a/rabbitmq/meta/sphinx.yml b/rabbitmq/meta/sphinx.yml
index 9320f36..4384a20 100644
--- a/rabbitmq/meta/sphinx.yml
+++ b/rabbitmq/meta/sphinx.yml
@@ -47,5 +47,5 @@
         status:
           name: Status
           value: |
-            {{ salt['cmd.run']('rabbitmqctl cluster_status')|indent(12) }}
+            {{ salt['cmd.shell']('rabbitmqctl cluster_status')|indent(12) }}
     {%- endif %}
diff --git a/rabbitmq/server/service.sls b/rabbitmq/server/service.sls
index 034dfd5..a871633 100644
--- a/rabbitmq/server/service.sls
+++ b/rabbitmq/server/service.sls
@@ -53,7 +53,7 @@
 
 {%- if server.secret_key is defined and not grains.get('noservices', False) %}
 
-{%- if salt['cmd.run']('cat '+server.cookie_file) != server.secret_key %}
+{%- if salt['cmd.shell']('cat '+server.cookie_file) != server.secret_key %}
 
 sleep_before_rabbitmq_stop:
   cmd.run: