diff --git a/tools/checkstyle/checkstyle.py b/tools/checkstyle/checkstyle.py
index 63f183fd4..2f4270cd3 100755
--- a/tools/checkstyle/checkstyle.py
+++ b/tools/checkstyle/checkstyle.py
@@ -36,7 +36,7 @@ FORCED_RULES = ['com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck
                 'com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck']
 SKIPPED_RULES_FOR_TEST_FILES = ['com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck',
                                 'com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck']
-SUBPATH_FOR_TEST_FILES = ['/tests/java/', '/tests/src/', '/src/test/']
+SUBPATH_FOR_TEST_FILES = ['/tests/', '/test/']
 SUBPATH_FOR_TEST_DATA_FILES = ['src/tests/test-data/']
 ERROR_UNCOMMITTED = 'You need to commit all modified files before running Checkstyle\n'
 ERROR_UNTRACKED = 'You have untracked java files that are not being checked:\n'