diff --git a/phpunit.xml.all b/phpunit.xml.all
index 9e220ff559..d91a614c97 100644
--- a/phpunit.xml.all
+++ b/phpunit.xml.all
@@ -15,6 +15,10 @@
         <testsuite name="phpBB Test Suite">
             <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>
         </testsuite>
         <testsuite name="phpBB Functional Tests">
             <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f8bf063d9a..4c91f8e373 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,6 +15,10 @@
         <testsuite name="phpBB Test Suite">
             <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>
         </testsuite>
         <testsuite name="phpBB Functional Tests">
             <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
diff --git a/phpunit.xml.functional b/phpunit.xml.functional
index 376d52e6d8..919de74dec 100644
--- a/phpunit.xml.functional
+++ b/phpunit.xml.functional
@@ -15,6 +15,10 @@
         <testsuite name="phpBB Test Suite">
             <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>
         </testsuite>
         <testsuite name="phpBB Functional Tests">
             <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>