diff --git a/selfdrive/car/tests/routes.py b/selfdrive/car/tests/routes.py
index 667a7acf62..056a3484a7 100644
--- a/selfdrive/car/tests/routes.py
+++ b/selfdrive/car/tests/routes.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from collections import namedtuple
+from typing import NamedTuple, Optional
 
 from selfdrive.car.chrysler.values import CAR as CHRYSLER
 from selfdrive.car.gm.values import CAR as GM
@@ -30,7 +30,12 @@ non_tested_cars = [
   TOYOTA.RAV4H_TSS2_2023,
 ]
 
-CarTestRoute = namedtuple('CarTestRoute', ['route', 'car_model', 'segment'], defaults=(None,))
+
+class CarTestRoute(NamedTuple):
+  route: str
+  car_model: str
+  segment: Optional[int] = None
+
 
 routes = [
   CarTestRoute("efdf9af95e71cd84|2022-05-13--19-03-31", COMMA.BODY),
diff --git a/selfdrive/car/tests/test_models.py b/selfdrive/car/tests/test_models.py
index 103ee36273..195b537378 100755
--- a/selfdrive/car/tests/test_models.py
+++ b/selfdrive/car/tests/test_models.py
@@ -35,9 +35,9 @@ ignore_addr_checks_valid = [
 ]
 
 
-def get_test_cases():
+def get_test_cases() -> List[Tuple[str, Optional[CarTestRoute]]]:
   # build list of test cases
-  test_cases: List[Tuple[str, Optional[CarTestRoute]]] = []
+  test_cases = []
   if not len(INTERNAL_SEG_LIST):
     routes_by_car = defaultdict(set)
     for r in routes:
@@ -52,11 +52,11 @@ def get_test_cases():
       seg_list = f.read().splitlines()
 
     cnt = INTERNAL_SEG_CNT or len(seg_list)
-    seg_list = iter(seg_list[:cnt])
+    seg_list_iter = iter(seg_list[:cnt])
 
-    for platform in seg_list:
+    for platform in seg_list_iter:
       platform = platform[2:]  # get rid of comment
-      segment_name = SegmentName(next(seg_list))
+      segment_name = SegmentName(next(seg_list_iter))
       test_cases.append((platform, CarTestRoute(segment_name.route_name.canonical_name, platform,
                                                 segment=segment_name.segment_num)))
   return test_cases