4 files changed, 8 insertions, 2 deletions

diff --git a/bin/qmk b/bin/qmk
index 4d5b3d884..60555d3d7 100755
--- a/bin/qmk
+++ b/bin/qmk
@@ -25,6 +25,11 @@ with open(os.path.join(qmk_dir, 'requirements.txt'), 'r') as fd:
             line = line.split('#')[0]
 
         module = line.split('=')[0] if '=' in line else line
+
+        if module in ['pep8-naming']:
+            # Not every module is importable by its own name.
+            continue
+
         if not find_spec(module):
             print('Could not find module %s!' % module)
             print('Please run `pip3 install -r requirements.txt` to install the python dependencies.')
diff --git a/lib/python/qmk/cli/doctor.py b/lib/python/qmk/cli/doctor.py
index 1010eafb3..2421e520e 100755
--- a/lib/python/qmk/cli/doctor.py
+++ b/lib/python/qmk/cli/doctor.py
@@ -39,7 +39,7 @@ def doctor(cli):
                 ok = False
 
     # Determine our OS and run platform specific tests
-    OS = platform.system()
+    OS = platform.system()  # noqa (N806), uppercase name is ok in this instance
 
     if OS == "Darwin":
         cli.log.info("Detected {fg_cyan}macOS.")
diff --git a/lib/python/qmk/tests/test_qmk_errors.py b/lib/python/qmk/tests/test_qmk_errors.py
index 1d8690b7e..948e7ef74 100644
--- a/lib/python/qmk/tests/test_qmk_errors.py
+++ b/lib/python/qmk/tests/test_qmk_errors.py
@@ -1,7 +1,7 @@
 from qmk.errors import NoSuchKeyboardError
 
 
-def test_NoSuchKeyboardError():
+def test_nosuchkeyboarderror():
     try:
         raise NoSuchKeyboardError("test message")
     except NoSuchKeyboardError as e:
diff --git a/requirements.txt b/requirements.txt
index 033b688fc..074b11a8c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,3 +6,4 @@ colorama
 hjson
 nose2
 flake8
+pep8-naming