diff --git a/selfdrive/car/__init__.py b/selfdrive/car/__init__.py
index c77e40daaf..f2d198338d 100644
--- a/selfdrive/car/__init__.py
+++ b/selfdrive/car/__init__.py
@@ -38,7 +38,7 @@ def create_button_enable_events(buttonEvents: capnp.lib.capnp._DynamicListBuilde
 
 
 def gen_empty_fingerprint():
-  return {i: {} for i in range(0, 4)}
+  return {i: {} for i in range(0, 8)}
 
 
 # FIXME: hardcoding honda civic 2016 touring params so they can be used to
diff --git a/selfdrive/car/tests/test_car_interfaces.py b/selfdrive/car/tests/test_car_interfaces.py
index 412874c813..aabf652c8c 100755
--- a/selfdrive/car/tests/test_car_interfaces.py
+++ b/selfdrive/car/tests/test_car_interfaces.py
@@ -5,6 +5,7 @@ import importlib
 from parameterized import parameterized
 
 from cereal import car
+from selfdrive.car import gen_empty_fingerprint
 from selfdrive.car.fingerprints import all_known_cars
 from selfdrive.car.car_helpers import interfaces
 from selfdrive.car.fingerprints import _FINGERPRINTS as FINGERPRINTS
@@ -19,11 +20,8 @@ class TestCarInterfaces(unittest.TestCase):
       fingerprint = {}
 
     CarInterface, CarController, CarState = interfaces[car_name]
-    fingerprints = {
-      0: fingerprint,
-      1: fingerprint,
-      2: fingerprint,
-    }
+    fingerprints = gen_empty_fingerprint()
+    fingerprints.update({k: fingerprint for k in fingerprints.keys()})
 
     car_fw = []