diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e6fc54315..c6bd89882 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -11,15 +11,11 @@
            tests/ folder: phpunit -c <filename> ...
            Example: phpunit -c mysqlconf.xml AllTests
 -->
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
+         verbose="true"
+         failOnRisky="true"
          bootstrap="./tests/Doctrine/Tests/TestInit.php"
 >
 
@@ -46,7 +42,7 @@
     <var name="db_name" value="doctrine_tests" />
     <var name="db_port" value="3306"/>-->
     <!--<var name="db_event_subscribers" value="Doctrine\DBAL\Event\Listeners\OracleSessionInit">-->
-    
+
     <!-- Database for temporary connections (i.e. to drop/create the main database) -->
     <var name="tmpdb_type" value="pdo_mysql"/>
     <var name="tmpdb_host" value="localhost" />
@@ -56,4 +52,4 @@
     <var name="tmpdb_port" value="3306"/>
   </php>
 
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/tests/travis/mariadb.travis.xml b/tests/travis/mariadb.travis.xml
index bac3fa480..16024c4c6 100644
--- a/tests/travis/mariadb.travis.xml
+++ b/tests/travis/mariadb.travis.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="../Doctrine/Tests/TestInit.php" colors="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         verbose="true"
+         failOnRisky="true"
+         bootstrap="../Doctrine/Tests/TestInit.php"
+>
     <php>
         <var name="db_type" value="pdo_mysql"/>
         <var name="db_host" value="localhost" />
diff --git a/tests/travis/mysql.travis.xml b/tests/travis/mysql.travis.xml
index bac3fa480..16024c4c6 100644
--- a/tests/travis/mysql.travis.xml
+++ b/tests/travis/mysql.travis.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="../Doctrine/Tests/TestInit.php" colors="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         verbose="true"
+         failOnRisky="true"
+         bootstrap="../Doctrine/Tests/TestInit.php"
+>
     <php>
         <var name="db_type" value="pdo_mysql"/>
         <var name="db_host" value="localhost" />
diff --git a/tests/travis/pgsql.travis.xml b/tests/travis/pgsql.travis.xml
index d1a0a49f2..6ad430af3 100644
--- a/tests/travis/pgsql.travis.xml
+++ b/tests/travis/pgsql.travis.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="../Doctrine/Tests/TestInit.php" colors="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         verbose="true"
+         failOnRisky="true"
+         bootstrap="../Doctrine/Tests/TestInit.php"
+>
     <php>
    <!-- "Real" test database -->
         <var name="db_type" value="pdo_pgsql"/>
diff --git a/tests/travis/sqlite.travis.xml b/tests/travis/sqlite.travis.xml
index f9b3ef1f3..7894dfd2e 100644
--- a/tests/travis/sqlite.travis.xml
+++ b/tests/travis/sqlite.travis.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="../Doctrine/Tests/TestInit.php" colors="true">
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         verbose="true"
+         failOnRisky="true"
+         bootstrap="../Doctrine/Tests/TestInit.php"
+>
    <testsuites>
      <testsuite name="Doctrine ORM Test Suite">
         <directory>./../Doctrine/Tests/ORM</directory>