diff --git a/tools/lint b/tools/lint
index 9baa879..3deda28 100755
--- a/tools/lint
+++ b/tools/lint
@@ -15,7 +15,6 @@ EXCLUDED_FILES = [
 def run() -> None:
     parser = argparse.ArgumentParser()
     add_default_linter_arguments(parser)
-    parser.add_argument('--no-gitlint', action='store_true', help='Disable gitlint')
     args = parser.parse_args()
 
     linter_config = LinterConfig(args)
@@ -27,10 +26,8 @@ def run() -> None:
                                   description="Static type checker for Python (config: mypy.ini)")
     linter_config.external_linter('flake8', ['flake8'], ['py'],
                                   description="Standard Python linter (config: .flake8)")
-
-    if not args.no_gitlint:
-        linter_config.external_linter('gitlint', ['tools/lint-commits'],
-                                      description="Git Lint for commit messages")
+    linter_config.external_linter('gitlint', ['tools/lint-commits'],
+                                  description="Git Lint for commit messages")
 
     @linter_config.lint
     def custom_py() -> int:
diff --git a/tools/test-static-analysis b/tools/test-static-analysis
index 3e9f4e8..18a0c83 100755
--- a/tools/test-static-analysis
+++ b/tools/test-static-analysis
@@ -2,5 +2,5 @@
 
 set -ev
 
-tools/lint --no-gitlint
+tools/lint --skip=gitlint
 tools/run-mypy