diff --git a/.travis.yml b/.travis.yml
index b5c2ba828..fd201354b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,11 @@
+addons:
+    apt:
+        packages:
+        - realpath
+        - mailutils
+cache:
+- apt
+dist: xenial
 env:
   global:
     - secure: unp8irwVXz37jxOFbuM4NciRaq326XktPJP0UuL5m1qdrGiLQVq18cIuXClkxbnCoXzpkL0gG1XdjaD0bRKWAnwRRZBEKDRBYXyF+IcGCfG1k8HUbZoV1OTP21qUXot70YrTiZJ3NkuS32RJdFV9qRAkaM1Srf+ZRHcsZSdXaSJTooMsDLtqk9Bjh9aHEltRCDS0AT2YPANZLW4Yn2QcwBmPhv+3xNxRt2etbl1EYvjYGbKw31JJnMHvS15DJEY52coJ+n4Yw/EI9My4O9TshrAEHeWwXT+dGACdNTD9lXkohuEyc10bgWTGeD5jytm5mbVbzlML3iro0sq6gNWr1iBzGL+FkWSR0ezkbADcnxoUwZa7OHwOPcrzmgkNp6jouGk6Xhl7NQgfwJJtQYPWfOuXIVNUk1Z2Ein/lw2WMzGmEHrqs1x2gIrD83sKqULT3kZBWr4RfhUPjol+V0MZJ+KCW2yo+2C8lZDQ5LWxftoqnG/ia70nFemWsyHSqe2OvN4WfwW9zdS0kRqMZVq/r3R+y0idacFkvO5yXk7cS45tAawIUK5Ipc3fib/ERv8zoDjcIt136hXhlYo44vPr2oprDnyvLcCbdG0A4uCnPpp3Bdbcn2NqIlsXhzBV+YJokaTv5zfWSH2YX6+wdv0C3+dkFjpZaASVg/R7oxg/oXY=
@@ -10,9 +18,6 @@ sudo: required
 
 language: php
 
-cache:
-  - apt
-
 matrix:
   include:
     - php: 7.0
@@ -21,12 +26,6 @@ matrix:
     - php: hhvm
   fast_finish: true
 
-addons:
-  apt:
-    packages:
-      - realpath
-      - mailutils
-
 before_install:
   - export TZ=Africa/Johannesburg
 
@@ -71,4 +70,5 @@ deploy:
        only:
          - "master"
 notifications:
-  email: false
+  on_success: change
+  on_failure: always