diff --git a/.kitchen.yml b/.kitchen.yml
index 6e38245..c3b24a2 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: heat
diff --git a/.travis.yml b/.travis.yml
index e13a3ff..31d2f50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,12 @@
   - bundle install
 
 env:
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=server-cluster
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=server-cluster
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=server-plugin-dirs
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=server-plugin-dirs
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=server-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=server-single
     - PLATFORM=trevorj/salty-whales:trusty SUITE=server-cluster
     - PLATFORM=trevorj/salty-whales:xenial SUITE=server-cluster
     - PLATFORM=trevorj/salty-whales:trusty SUITE=server-plugin-dirs
diff --git a/heat/meta/sphinx.yml b/heat/meta/sphinx.yml
index d3dbbe2..3732e63 100644
--- a/heat/meta/sphinx.yml
+++ b/heat/meta/sphinx.yml
@@ -41,7 +41,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.heat.client is defined %}