diff --git a/.kitchen.yml b/.kitchen.yml
index 7ef9ad1..730b126 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -8,7 +8,7 @@
   name: salt_solo
   salt_install: bootstrap
   salt_bootstrap_url: https://bootstrap.saltstack.com
-  salt_version: latest
+  salt_version: <%=ENV['SALT_VERSION'] || 'latest'%>
   require_chef: false
   log_level: error
   formula: keystone
diff --git a/.travis.yml b/.travis.yml
index 7cf63e4..e872346 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,13 +17,17 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:trusty MYSQL_VERSION='5.5' SUITE=single
+#  - PLATFORM=trevorj/salty-whales:trusty-2017.7 MYSQL_VERSION='5.5' SUITE=single
+  - PLATFORM=trevorj/salty-whales:xenial-2017.7 MYSQL_VERSION='5.7' SUITE=single
+#  - PLATFORM=trevorj/salty-whales:trusty-2017.7 MYSQL_VERSION='5.5' SUITE=single_domain
+  - PLATFORM=trevorj/salty-whales:xenial-2017.7 MYSQL_VERSION='5.7' SUITE=single_domain
+#  - PLATFORM=trevorj/salty-whales:trusty-2017.7 MYSQL_VERSION='5.5' SUITE=single_fernet
+  - PLATFORM=trevorj/salty-whales:xenial-2017.7 MYSQL_VERSION='5.7' SUITE=single_fernet
+#  - PLATFORM=trevorj/salty-whales:trusty-2017.7 MYSQL_VERSION='5.5' SUITE=under-apache
+  - PLATFORM=trevorj/salty-whales:xenial-2017.7 MYSQL_VERSION='5.7' SUITE=under-apache
   - PLATFORM=trevorj/salty-whales:xenial MYSQL_VERSION='5.7' SUITE=single
-  - PLATFORM=trevorj/salty-whales:trusty MYSQL_VERSION='5.5' SUITE=single_domain
   - PLATFORM=trevorj/salty-whales:xenial MYSQL_VERSION='5.7' SUITE=single_domain
-  - PLATFORM=trevorj/salty-whales:trusty MYSQL_VERSION='5.5' SUITE=single_fernet
   - PLATFORM=trevorj/salty-whales:xenial MYSQL_VERSION='5.7' SUITE=single_fernet
-  - PLATFORM=trevorj/salty-whales:trusty MYSQL_VERSION='5.5' SUITE=under-apache
   - PLATFORM=trevorj/salty-whales:xenial MYSQL_VERSION='5.7' SUITE=under-apache
 
 before_script:
diff --git a/keystone/meta/sphinx.yml b/keystone/meta/sphinx.yml
index 9bf06cf..c867f7a 100644
--- a/keystone/meta/sphinx.yml
+++ b/keystone/meta/sphinx.yml
@@ -48,7 +48,7 @@
           value: |
             {%- for pkg in server.pkgs %}
             {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
-            * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+            * {{ pkg }}: {{ salt['cmd.shell'](pkg_version) }}
             {%- endfor %}
   {%- endif %}
   {%- if pillar.keystone.control is defined %}