diff --git a/.travis.yml b/.travis.yml
index 5436c67e18d9aa893409d10929d9839b89976d43..4e71a918e1ecbbdcef64b6c9b0eb495a0f98f270 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,8 +42,8 @@ env:
     - TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
     - TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1
     # All tests after another
-    - TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL
-    - TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
+    - TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-first-half-only"
+    - TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-second-half-only"
     - TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL UITEST_EXTRA_OPTIONS="--run-first-half-only"
     - TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL UITEST_EXTRA_OPTIONS="--run-second-half-only"
   global:
@@ -55,55 +55,30 @@ env:
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - php: hhvm
-    - php: 7
   exclude:
     # Run test suites separately only on PHP 5.6 with PDO
     - php: 5.3
       env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL
     - php: 5.3
       env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 5.3
-      env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 7
-      env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL
     - php: 5.3
       env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: hhvm
-      env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: hhvm
-      env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: hhvm
-      env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
     # run UI tests on PHP 5.3 only
     - php: 5.6
       env: TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL UITEST_EXTRA_OPTIONS="--run-first-half-only"
     - php: 5.6
       env: TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL UITEST_EXTRA_OPTIONS="--run-second-half-only"
     # run all tests not on PHP 5.6 and run MySQLI tests only on 5.6
-    - php: 5.6
-      env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL
     - php: 5.3
-      env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
-    - php: 7
-      env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
-    - php: hhvm
-      env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-first-half-only"
+    - php: 5.3
+      env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-second-half-only"
     # Javascript tests need to run only on one PHP version
     - php: 5.3
       env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: hhvm
-      env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 7
-      env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
     # AngularJS tests need to run only on one PHP version
     - php: 5.3
       env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1
-    - php: hhvm
-      env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1
-    - php: 7
-      env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1
 
 sudo: required
 
diff --git a/tests/travis b/tests/travis
index 41e9efcb897239ed1fd899a4e29b5888a008213d..fae38dcff43420ee12459aa6f3a89d2a0fca750f 160000
--- a/tests/travis
+++ b/tests/travis
@@ -1 +1 @@
-Subproject commit 41e9efcb897239ed1fd899a4e29b5888a008213d
+Subproject commit fae38dcff43420ee12459aa6f3a89d2a0fca750f