diff --git a/selfdrive/car/toyota/tests/test_toyota.py b/selfdrive/car/toyota/tests/test_toyota.py
index 33c4891b17..5377b7d96c 100755
--- a/selfdrive/car/toyota/tests/test_toyota.py
+++ b/selfdrive/car/toyota/tests/test_toyota.py
@@ -3,7 +3,7 @@ from hypothesis import given, settings, strategies as st
 import unittest
 
 from cereal import car
-from selfdrive.car.fw_versions import build_fw_dict
+from openpilot.selfdrive.car.fw_versions import build_fw_dict
 from openpilot.selfdrive.car.toyota.values import CAR, DBC, TSS2_CAR, ANGLE_CONTROL_CAR, RADAR_ACC_CAR, FW_VERSIONS, \
                                                   FW_QUERY_CONFIG, PLATFORM_CODE_ECUS, get_platform_codes
 
@@ -90,7 +90,7 @@ class TestToyotaFingerprint(unittest.TestCase):
           # Toyota places the ECU part number in their FW versions, assert all parsable
           # Note that there is only one unique part number per ECU across the fleet, so this
           # is not important for identification, just a sanity check.
-          self.assertTrue(all({code.count(b"-") > 1 for code in codes}),
+          self.assertTrue(all(code.count(b"-") > 1 for code in codes),
                           f"FW does not have part number: {fw} {codes}")
 
   def test_platform_codes_spot_check(self):
diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py
index e3dd4b387d..f08c85fb4f 100644
--- a/selfdrive/car/toyota/values.py
+++ b/selfdrive/car/toyota/values.py
@@ -2,7 +2,7 @@ import re
 from collections import defaultdict
 from dataclasses import dataclass, field
 from enum import Enum, IntFlag
-from typing import Dict, List, Set, Tuple, Union
+from typing import Dict, List, Set, Union
 
 from cereal import car
 from openpilot.common.conversions import Conversions as CV