diff --git a/selfdrive/debug/test_fw_query_on_routes.py b/selfdrive/debug/test_fw_query_on_routes.py
index f1e789a0de..8eeacd277d 100755
--- a/selfdrive/debug/test_fw_query_on_routes.py
+++ b/selfdrive/debug/test_fw_query_on_routes.py
@@ -8,18 +8,20 @@ import traceback
 from tqdm import tqdm
 from tools.lib.logreader import LogReader
 from tools.lib.route import Route
+from selfdrive.car.car_helpers import interface_names
 from selfdrive.car.fw_versions import match_fw_to_car_exact, match_fw_to_car_fuzzy, build_fw_dict
 from selfdrive.car.toyota.values import FW_VERSIONS as TOYOTA_FW_VERSIONS
 from selfdrive.car.honda.values import FW_VERSIONS as HONDA_FW_VERSIONS
 from selfdrive.car.hyundai.values import FW_VERSIONS as HYUNDAI_FW_VERSIONS
 from selfdrive.car.volkswagen.values import FW_VERSIONS as VW_FW_VERSIONS
 
-from selfdrive.car.toyota.values import FINGERPRINTS as TOYOTA_FINGERPRINTS
-from selfdrive.car.honda.values import FINGERPRINTS as HONDA_FINGERPRINTS
-from selfdrive.car.hyundai.values import FINGERPRINTS as HYUNDAI_FINGERPRINTS
 
 NO_API = "NO_API" in os.environ
-SUPPORTED_CARS = list(TOYOTA_FINGERPRINTS.keys()) + list(HONDA_FINGERPRINTS.keys()) + list(HYUNDAI_FINGERPRINTS.keys())
+SUPPORTED_CARS = set(interface_names['toyota'])
+SUPPORTED_CARS |= set(interface_names['honda'])
+SUPPORTED_CARS |= set(interface_names['hyundai'])
+SUPPORTED_CARS |= set(interface_names['volkswagen'])
+
 
 try:
   from xx.pipeline.c.CarState import migration