diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5676f36512b..04937810115 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,12 +1,13 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
-exclude: /test/.*$(?<!\.ql)(?<!\.qll)(?<!\.qlref)
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v3.2.0
     hooks:
       - id: trailing-whitespace
+        exclude: /test/.*$(?<!\.ql)(?<!\.qll)(?<!\.qlref)
       - id: end-of-file-fixer
+        exclude: /test/.*$(?<!\.ql)(?<!\.qll)(?<!\.qlref)
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v13.0.1
@@ -24,6 +25,7 @@ repos:
 
       - id: sync-files
         name: Fix files required to be identical
+        files: \.(qll?|qhelp)$
         language: system
         entry: python3 config/sync-files.py --latest
         pass_filenames: false
@@ -43,7 +45,7 @@ repos:
 
       - id: swift-codegen-unit-tests
         name: Run Swift code generation unit tests
-        files: ^swift/codegen
+        files: ^swift/codegen/.*\.py$
         language: system
         entry: bazel test //swift/codegen:tests
         pass_filenames: false
diff --git a/swift/codegen/test/test_qlgen.py b/swift/codegen/test/test_qlgen.py
index 9379ce31786..3ff3f5416ef 100644
--- a/swift/codegen/test/test_qlgen.py
+++ b/swift/codegen/test/test_qlgen.py
@@ -1,8 +1,6 @@
 import subprocess
 import sys
 
-import mock
-
 from swift.codegen import qlgen
 from swift.codegen.lib import ql, paths
 from swift.codegen.test.utils import *
diff --git a/swift/codegen/test/test_schema.py b/swift/codegen/test/test_schema.py
index 9703eafe1b8..9b52bcbbaa1 100644
--- a/swift/codegen/test/test_schema.py
+++ b/swift/codegen/test/test_schema.py
@@ -1,24 +1,21 @@
-import io
-import pathlib
 import sys
 
-import mock
-import pytest
-
-import swift.codegen.lib.schema as schema
 from swift.codegen.test.utils import *
 
 root_name = schema.root_class_name
 
+
 @pytest.fixture
 def load(tmp_path):
     file = tmp_path / "schema.yml"
+
     def ret(yml):
         write(file, yml)
         return schema.load(file)
 
     return ret
 
+
 def test_empty_schema(load):
     ret = load("{}")
     assert ret.classes == [schema.Class(root_name)]