diff --git a/selfdrive/debug/test_car_model.py b/selfdrive/debug/test_car_model.py
index 4de5b26762..c2f51c9355 100755
--- a/selfdrive/debug/test_car_model.py
+++ b/selfdrive/debug/test_car_model.py
@@ -6,6 +6,7 @@ import unittest
 
 from selfdrive.car.tests.routes import CarTestRoute
 from selfdrive.car.tests.test_models import TestCarModel
+from tools.lib.route import SegmentName
 
 
 def create_test_models_suite(routes: List[Tuple[str, CarTestRoute]], ci=False) -> unittest.TestSuite:
@@ -21,16 +22,17 @@ def create_test_models_suite(routes: List[Tuple[str, CarTestRoute]], ci=False) -
 if __name__ == "__main__":
   parser = argparse.ArgumentParser(description="Test any route against common issues with a new car port. " +
                                                "Uses selfdrive/car/tests/test_models.py")
-  parser.add_argument("route", help="Specify route to run tests on")
+  parser.add_argument("route_or_segment_name", help="Specify route to run tests on")
   parser.add_argument("--car", help="Specify car model for test route")
-  parser.add_argument("--segment", type=int, nargs="?", help="Specify segment of route to test")
   parser.add_argument("--ci", action="store_true", help="Attempt to get logs using openpilotci, need to specify car")
   args = parser.parse_args()
   if len(sys.argv) == 1:
     parser.print_help()
     sys.exit()
 
-  test_route = CarTestRoute(args.route, args.car, segment=args.segment)
+  route_or_segment_name = SegmentName(args.route_or_segment_name.strip(), allow_route_name=True)
+  segment_num = route_or_segment_name.segment_num if route_or_segment_name.segment_num != -1 else None
+  test_route = CarTestRoute(route_or_segment_name.route_name.canonical_name, args.car, segment=segment_num)
   test_suite = create_test_models_suite([(args.car, test_route)], ci=args.ci)
 
   unittest.TextTestRunner().run(test_suite)