diff --git a/.travis.yml b/.travis.yml
index c855e6f352..e8b5d3fcfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,7 @@ script:
   - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
   - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./
   - travis/check-stylesheet.sh $NOTESTS
-  - sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/lint_test.php; fi"
+  - sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/phpbb_lint_test.php; fi"
   - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --verbose --stop-on-error; fi"
   - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
   - sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git remote set-branches --add origin $TRAVIS_BRANCH && git fetch && git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA; fi"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 6888fe0357..642537e50d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -14,13 +14,13 @@
         <testsuite name="phpBB Test Suite">
             <directory suffix="_test.php">./tests</directory>
             <exclude>./tests/functional</exclude>
-            <exclude>./tests/lint_test.php</exclude>
+            <exclude>./tests/phpbb_lint_test.php</exclude>
         </testsuite>
         <testsuite name="phpBB Functional Tests">
             <directory suffix="_test.php">./tests/functional</directory>
         </testsuite>
         <testsuite name="phpBB Lint Test">
-            <file>./tests/lint_test.php</file>
+            <file>./tests/phpbb_lint_test.php</file>
         </testsuite>
     </testsuites>
 
diff --git a/tests/lint_test.php b/tests/phpbb_lint_test.php
similarity index 100%
rename from tests/lint_test.php
rename to tests/phpbb_lint_test.php