diff --git a/phpunit-integration-legacy.xml b/phpunit-integration-legacy.xml
index 2e521be4..564d61f3 100644
--- a/phpunit-integration-legacy.xml
+++ b/phpunit-integration-legacy.xml
@@ -1,23 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="bootstrap.php"
-         processIsolation="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         colors="true"
-         >
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
+    backupGlobals="false"
+    bootstrap="bootstrap.php"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    forceCoversAnnotation="true"
+    beStrictAboutOutputDuringTests="true"
+    beStrictAboutTestSize="true"
+    beStrictAboutChangesToGlobalState="true"
+>
+
     <php>
         <env name="setupFactory" value="Netgen\TagsBundle\Tests\API\Repository\SetupFactory\Legacy" />
         <env name="backendVersion" value="5" />
         <env name="fixtureDir" value="Legacy" />
     </php>
+
     <testsuites>
         <testsuite name="Netgen\TagsBundle\Tests\API">
             <directory>Tests/API</directory>
         </testsuite>
     </testsuites>
+
     <filter>
         <whitelist>
             <directory>.</directory>
@@ -40,7 +49,4 @@
             </exclude>
         </whitelist>
     </filter>
-    <php>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
-    </php>
 </phpunit>
diff --git a/phpunit.xml b/phpunit.xml
index 73287622..6ea80fcf 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,11 +1,20 @@
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="bootstrap.php"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         colors="true"
-         >
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
+    backupGlobals="false"
+    bootstrap="vendor/autoload.php"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    forceCoversAnnotation="true"
+    beStrictAboutOutputDuringTests="true"
+    beStrictAboutTestSize="true"
+    beStrictAboutChangesToGlobalState="true"
+>
+
     <testsuites>
         <testsuite name="Netgen\TagsBundle\Tests\Core">
             <directory>Tests/Core</directory>
@@ -20,6 +29,7 @@
             <directory>Tests/Templating</directory>
         </testsuite>
     </testsuites>
+
     <filter>
         <whitelist>
             <directory>.</directory>
@@ -39,7 +49,4 @@
             </exclude>
         </whitelist>
     </filter>
-    <php>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
-    </php>
 </phpunit>