diff --git a/.travis.yml b/.travis.yml
index 129f9c8..b69c2ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,15 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=api-single
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=api-cluster
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=manager-single
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=api-single
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=api-cluster
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=manager-single
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=api-single
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=api-cluster
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=manager-single
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=api-single
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=api-cluster
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=manager-single
 
 before_script:
   - set -o pipefail