diff --git a/selfdrive/athena/tests/test_athenad.py b/selfdrive/athena/tests/test_athenad.py
index 8829ebfbf1..5f7f510299 100755
--- a/selfdrive/athena/tests/test_athenad.py
+++ b/selfdrive/athena/tests/test_athenad.py
@@ -34,6 +34,8 @@ class TestAthenadMethods(unittest.TestCase):
     athenad.LOCAL_PORT_WHITELIST = {cls.SOCKET_PORT}
 
   def setUp(self):
+    dispatcher["listUploadQueue"]() # ensure queue is empty at start
+
     MockParams.restore_defaults()
     athenad.upload_queue = queue.Queue()
     athenad.cur_upload_items.clear()
@@ -46,7 +48,6 @@ class TestAthenadMethods(unittest.TestCase):
       else:
         os.unlink(p)
 
-    dispatcher["listUploadQueue"]() # ensure queue is empty at start
 
   # *** test helpers ***