diff --git a/.travis.yml b/.travis.yml
index bc2d556..4dd9d20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,7 @@
     gem 'kitchen-vagrant'
     gem 'kitchen-inspec'
     gem 'inspec'
-    gem 'kitchen-salt', :git => 'https://github.com/epcim/kitchen-salt.git', :branch => 'dependencis-pkg-repo2'
-    #Waiting for PR#78
-    #gem 'kitchen-salt', '>=0.2.25'
+    gem 'kitchen-salt', :git => 'https://github.com/salt-formulas/kitchen-salt.git'
   - bundle install
 
 env:
@@ -25,18 +23,30 @@
    - SUITE=control
    - SUITE=cluster
    - SUITE=single
-   #- SUITE=vendor-juniper
-   #- SUITE=tor
-   #- SUITE=vrouter_kubernetes
-   #- SUITE=vrouter
-   #- PLATFORM=trevorj/salty-whales:xenial SUITE=analytics
-   #- PLATFORM=trevorj/salty-whales:xenial SUITE=control
-   #- PLATFORM=trevorj/salty-whales:xenial SUITE=cluster
-   #...
+   - SUITE=tor
+   - SUITE=vrouter
+   - PLATFORM=trevorj/salty-whales:trusty SUITE=analytics
+   - PLATFORM=trevorj/salty-whales:trusty SUITE=control
+   - PLATFORM=trevorj/salty-whales:trusty SUITE=cluster
+   - PLATFORM=trevorj/salty-whales:trusty SUITE=single
+   - PLATFORM=trevorj/salty-whales:trusty SUITE=tor
+   - PLATFORM=trevorj/salty-whales:trusty SUITE=vrouter
 
 before_script:
+  - set -o pipefail
   - make test | tail
 
 script:
-  - test ! -e .kitchen.yml || bundle exec kitchen verify $SUITE
+  - test ! -e .kitchen.yml || bundle exec kitchen converge $SUITE || true
+  - test ! -e .kitchen.yml || bundle exec kitchen verify $SUITE -t tests/integration
 
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6123573504759330786b
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: never  # options: [always|never|change] default: always
+    on_start: never     # options: [always|never|change] default: always
+    on_cancel: never    # options: [always|never|change] default: always
+    on_error: never    # options: [always|never|change] default: always
+  email: false