diff --git a/phpunit.xml.all b/phpunit.xml.all
index d5ee606ce2..73d0536b9d 100644
--- a/phpunit.xml.all
+++ b/phpunit.xml.all
@@ -13,17 +13,17 @@
 >
     <testsuites>
         <testsuite name="phpBB Test Suite">
-            <directory suffix="_test.php">./tests/</directory>
-            <exclude>tests/lint_test.php</exclude>
+            <directory suffix="_test.php">./tests</directory>
+            <exclude>./tests/lint_test.php</exclude>
         </testsuite>
         <testsuite name="phpBB Lint Test">
-            <file>tests/lint_test.php</file>
+            <file>./tests/lint_test.php</file>
         </testsuite>
     </testsuites>
 
     <filter>
         <blacklist>
-            <directory>./tests/</directory>
+            <directory>./tests</directory>
         </blacklist>
         <whitelist>
             <directory suffix=".php">./phpBB/includes/</directory>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 700af8b2b2..dd039fb567 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -13,11 +13,12 @@
 >
     <testsuites>
         <testsuite name="phpBB Test Suite">
-            <directory suffix="_test.php">./tests/</directory>
-            <exclude>tests/lint_test.php</exclude>
+            <directory suffix="_test.php">./tests</directory>
+            <exclude>./tests/functional</exclude>
+            <exclude>./tests/lint_test.php</exclude>
         </testsuite>
         <testsuite name="phpBB Lint Test">
-            <file>tests/lint_test.php</file>
+            <file>./tests/lint_test.php</file>
         </testsuite>
     </testsuites>
 
@@ -30,7 +31,7 @@
 
     <filter>
         <blacklist>
-            <directory>./tests/</directory>
+            <directory>./tests</directory>
         </blacklist>
         <whitelist>
             <directory suffix=".php">./phpBB/includes/</directory>
diff --git a/phpunit.xml.functional b/phpunit.xml.functional
index 44d060e615..ead8f4af68 100644
--- a/phpunit.xml.functional
+++ b/phpunit.xml.functional
@@ -13,11 +13,12 @@
 >
     <testsuites>
         <testsuite name="phpBB Test Suite">
-            <directory suffix="_test.php">./tests/</directory>
-            <exclude>tests/lint_test.php</exclude>
+            <directory suffix="_test.php">./tests</directory>
+            <exclude>./tests/functional</exclude>
+            <exclude>./tests/lint_test.php</exclude>
         </testsuite>
         <testsuite name="phpBB Lint Test">
-            <file>tests/lint_test.php</file>
+            <file>./tests/lint_test.php</file>
         </testsuite>
     </testsuites>
 
@@ -29,7 +30,7 @@
 
     <filter>
         <blacklist>
-            <directory>./tests/</directory>
+            <directory>./tests</directory>
         </blacklist>
         <whitelist>
             <directory suffix=".php">./phpBB/includes/</directory>
diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml
index 1eaee5b7d8..aa245a8224 100644
--- a/travis/phpunit-mariadb-travis.xml
+++ b/travis/phpunit-mariadb-travis.xml
@@ -13,9 +13,9 @@
          bootstrap="../tests/bootstrap.php">
 	<testsuites>
 		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests/</directory>
-			<exclude>tests/functional</exclude>
-			<exclude>tests/lint_test.php</exclude>
+			<directory suffix="_test.php">../tests</directory>
+			<exclude>../tests/functional</exclude>
+			<exclude>../tests/lint_test.php</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
 			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
index 5fa6c06e46..60c279d774 100644
--- a/travis/phpunit-mysql-travis.xml
+++ b/travis/phpunit-mysql-travis.xml
@@ -13,12 +13,12 @@
          bootstrap="../tests/bootstrap.php">
 	<testsuites>
 		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests/</directory>
-			<exclude>tests/functional</exclude>
-			<exclude>tests/lint_test.php</exclude>
+			<directory suffix="_test.php">../tests</directory>
+			<exclude>../tests/functional</exclude>
+			<exclude>../tests/lint_test.php</exclude>
 		</testsuite>
 		<testsuite name="phpBB Lint Test">
-			<file>tests/lint_test.php</file>
+			<file>../tests/lint_test.php</file>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
 			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 42dde1e1ee..956278e90c 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -13,9 +13,9 @@
          bootstrap="../tests/bootstrap.php">
 	<testsuites>
 		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests/</directory>
-			<exclude>tests/functional</exclude>
-			<exclude>tests/lint_test.php</exclude>
+			<directory suffix="_test.php">../tests</directory>
+			<exclude>../tests/functional</exclude>
+			<exclude>../tests/lint_test.php</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
 			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
diff --git a/travis/phpunit-sqlite3-travis.xml b/travis/phpunit-sqlite3-travis.xml
index e7dd5f300e..72b8b8c8ca 100644
--- a/travis/phpunit-sqlite3-travis.xml
+++ b/travis/phpunit-sqlite3-travis.xml
@@ -13,9 +13,9 @@
          bootstrap="../tests/bootstrap.php">
 	<testsuites>
 		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests/</directory>
-			<exclude>tests/functional</exclude>
-			<exclude>tests/lint_test.php</exclude>
+			<directory suffix="_test.php">../tests</directory>
+			<exclude>../tests/functional</exclude>
+			<exclude>../tests/lint_test.php</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
 			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>