diff --git a/.travis.yml b/.travis.yml
index db5b7136fbd..01a05157d4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,9 +32,11 @@ matrix:
       env: DB="postgresql" DB_USER="postgres"
     - php: 7.1
       env: DB="mysql" DB_USER="root"
-# Will need to update phpunit for this: https://travis-ci.org/ezsystems/ezpublish-legacy/jobs/279543965#L625
-#    - php: 7.2
-#      env: DB="postgresql" DB_USER="postgres"
+    - php: 7.2
+      env: DB="postgresql" DB_USER="postgres"
+    - php: 7.3
+      env: DB="mysql" DB_USER="root"
+
 
 before_script:
   - if [ $DB == "mysql" ]; then mysql -e "CREATE DATABASE IF NOT EXISTS $DB_NAME;" -u$DB_USER ; fi
diff --git a/composer.json b/composer.json
index 993f679d475..41805a7f0cd 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,7 @@
         "zetacomponents/webdav": "~1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*",
+        "phpunit/phpunit": "4.8.36",
         "zetacomponents/php-generator": "~1.1"
     },
     "autoload": {
diff --git a/kernel/private/rest/classes/cache/cluster.php b/kernel/private/rest/classes/cache/cluster.php
index 263ba2ebbb7..8c23c9064d6 100644
--- a/kernel/private/rest/classes/cache/cluster.php
+++ b/kernel/private/rest/classes/cache/cluster.php
@@ -118,7 +118,7 @@ public function restore( $id, $attributes = array(), $search = false )
             null, // We won't call any generate callback as we're using ezcCache mechanism, so it's up to the cache caller to generate
             $this->properties['options']['ttl'],
             null,
-            compact( 'id', 'attributes', 'fileName' )
+            compact( 'id', 'attributes' )
         );
 
         if ( !$result instanceof eZClusterFileFailure )
diff --git a/lib/ezdb/classes/ezmysqlidb.php b/lib/ezdb/classes/ezmysqlidb.php
index cf43e5c018c..b19fb4d9a3e 100644
--- a/lib/ezdb/classes/ezmysqlidb.php
+++ b/lib/ezdb/classes/ezmysqlidb.php
@@ -912,7 +912,7 @@ function availableDatabases()
         $databases = array();
 
         $numRows = mysqli_num_rows( $databaseArray );
-        if ( count( $numRows ) == 0 )
+        if ( $numRows == 0 )
         {
             return false;
         }
diff --git a/tests/runtests.php b/tests/runtests.php
index 04ad1b4b768..2479092bf1b 100755
--- a/tests/runtests.php
+++ b/tests/runtests.php
@@ -11,6 +11,8 @@
 
 set_time_limit( 0 );
 
+require_once 'vendor/autoload.php';
+
 require_once 'autoload.php';
 
 if ( !class_exists( 'ezpTestRunner', true ) )