Update .travis.yml and .kitchen.yml files for parallel testing

Change-Id: I0ea6acdac918df3a828f73be31d5bbc482e3be09
diff --git a/.travis.yml b/.travis.yml
index 4f34af2..f87d058 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,8 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=client
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=client
 
 
 before_script:
@@ -26,7 +26,7 @@
   - 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: