diff --git a/selfdrive/car/hyundai/tests/test_hyundai.py b/selfdrive/car/hyundai/tests/test_hyundai.py
index 7b4cd1639b..4dbcac77b4 100755
--- a/selfdrive/car/hyundai/tests/test_hyundai.py
+++ b/selfdrive/car/hyundai/tests/test_hyundai.py
@@ -27,10 +27,10 @@ class TestHyundaiFingerprint(unittest.TestCase):
 
   def test_fuzzy_ecus_available(self):
     # Asserts ECU keys essential for fuzzy fingerprinting are available on all platforms
-    for car, ecus in FW_VERSIONS.items():
-      with self.subTest(car=car):
+    for car_model, ecus in FW_VERSIONS.items():
+      with self.subTest(car_model=car_model):
         for fuzzy_ecu in FW_QUERY_CONFIG.fuzzy_ecus:
-          if car == CAR.HYUNDAI_GENESIS:
+          if car_model == CAR.HYUNDAI_GENESIS:
             raise unittest.SkipTest
           self.assertIn(fuzzy_ecu, [e[0] for e in ecus])
 
diff --git a/selfdrive/car/tests/test_fw_fingerprint.py b/selfdrive/car/tests/test_fw_fingerprint.py
index b8258fc378..deee990615 100755
--- a/selfdrive/car/tests/test_fw_fingerprint.py
+++ b/selfdrive/car/tests/test_fw_fingerprint.py
@@ -108,7 +108,7 @@ class TestFwFingerprint(unittest.TestCase):
         else:
           self.assertGreater(len(config.fuzzy_ecus), 0, "Need to specify fuzzy ECUs")
           # Assert every supported ECU FW version returns one platform code
-          for platform, fw_by_addr in VERSIONS[brand].items():
+          for fw_by_addr in VERSIONS[brand].values():
             for addr, fws in fw_by_addr.items():
               if addr[0] in config.fuzzy_ecus:
                 for f in fws: