Allow Travis CI to run parallel tests

Change-Id: I5a49e68b1b00b0ed3cf52401a93e3385dc90bc9e
diff --git a/.travis.yml b/.travis.yml
index ca01e68..b383b8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,16 +17,19 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
-
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=cluster
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=cluster
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=proxy
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=proxy
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=single
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=single
 
 before_script:
   - set -o pipefail
   - make test | tail
 
 script:
-  - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
+  - KITCHEN_LOCAL_YAML=.kitchen.travis.yml bundle exec kitchen test -t tests/integration
 
 notifications:
   webhooks: