diff --git a/.travis.yml b/.travis.yml
index 509578e57ef04b3ecfb1916d9dd010e6afc4df39..cbbffd28f0f215a3edd93590d72fdb7bad6f84a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,9 @@ sudo: required
 
 language: php
 
-php:
-- '5.3'
-- '5.4'
-- '5.5'
-- '5.6'
-- '7.0'
-- '7.1'
-- nightly
+# Start on every boot
+services:
+- memcached
 
 addons:
   mariadb: '10.0'
@@ -33,10 +28,16 @@ addons:
     - libapache2-mod-fastcgi
     # We need pgloader for import mysql database into pgsql
     - pgloader
- 
-# Start on every boot
-services:
-- memcached
+
+php:
+- '5.3'
+- '5.4'
+- '5.5'
+- '5.6'
+- '7.0'
+- '7.1'
+- hhvm
+- nightly
 
 env:
   global:
@@ -57,11 +58,22 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-  - php: 7.1
+  - php: hhvm
   - php: nightly
-  #- env: DB=postgresql
-  # TODO
-  #- env: DB=sqlite
+  # We exclude some combinations not usefull to save Travis CPU
+  exclude:
+  - php: '5.4'
+    env: DB=postgresql
+  - php: '5.5'
+    env: DB=postgresql
+  - php: '5.6'
+    env: DB=postgresql
+  - php: '7.0'
+    env: DB=postgresql
+  - php: hhvm
+    env: DB=postgresql
+  - php: nightly
+    env: DB=postgresql
 
 notifications:
   email:
@@ -305,6 +317,9 @@ script:
   php upgrade.php 5.0.0 6.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade500600.log
   php upgrade2.php 5.0.0 6.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade500600-2.log
   php step5.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-3.log
+  php upgrade.php 6.0.0 7.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade600700.log
+  php upgrade2.php 6.0.0 7.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade600700-2.log
+  php step5.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-3.log
   cd -
   set +e
   echo