diff --git a/selfdrive/car/tests/test_models.py b/selfdrive/car/tests/test_models.py
index fc70a5b343..acafafbab5 100755
--- a/selfdrive/car/tests/test_models.py
+++ b/selfdrive/car/tests/test_models.py
@@ -136,14 +136,12 @@ class TestCarModelBase(unittest.TestCase):
         # Log which can frame the panda safety mode left ELM327, for CAN validity checks
         if msg.which() == 'pandaStates':
           for ps in msg.pandaStates:
-            if ps.safetyModel != SafetyModel.elm327:
-              if cls.elm_frame is None:
-                cls.elm_frame = len(can_msgs)
+            if cls.elm_frame is None and ps.safetyModel != SafetyModel.elm327:
+              cls.elm_frame = len(can_msgs)
 
         elif msg.which() == 'pandaStateDEPRECATED':
-          if msg.pandaStateDEPRECATED.safetyModel != SafetyModel.elm327:
-            if cls.elm_frame is None:
-              cls.elm_frame = len(can_msgs)
+          if cls.elm_frame is None and msg.pandaStateDEPRECATED.safetyModel != SafetyModel.elm327:
+            cls.elm_frame = len(can_msgs)
 
       if len(can_msgs) > int(50 / DT_CTRL):
         break