diff --git a/.travis.yml b/.travis.yml
index 48c32b4ed3..75cee6660c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ script:
   - travis/check-doctum-parse-errors.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
   - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
   - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./
-  - sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/phpbb_lint_test.php; fi"
+  - sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/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 642537e50d..6888fe0357 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/phpbb_lint_test.php</exclude>
+            <exclude>./tests/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/phpbb_lint_test.php</file>
+            <file>./tests/lint_test.php</file>
         </testsuite>
     </testsuites>
 
diff --git a/tests/functions_user/whois_test.php b/tests/functions_user/whois_test.php
index b99854ba60..0ab5bc0ef6 100644
--- a/tests/functions_user/whois_test.php
+++ b/tests/functions_user/whois_test.php
@@ -11,7 +11,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
 
 class phpbb_functions_user_whois_test extends phpbb_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		global $config, $phpbb_dispatcher, $user, $request, $symfony_request, $phpbb_root_path, $phpEx;
 
diff --git a/tests/phpbb_lint_test.php b/tests/lint_test.php
similarity index 98%
rename from tests/phpbb_lint_test.php
rename to tests/lint_test.php
index 172a399c7e..6486441f18 100644
--- a/tests/phpbb_lint_test.php
+++ b/tests/lint_test.php
@@ -11,7 +11,7 @@
 *
 */
 
-class phpbb_lint_test extends phpbb_test_case
+class lint_test extends phpbb_test_case
 {
 	static protected $php_binary;
 	static protected $exclude;