diff --git a/selfdrive/locationd/test/test_locationd_scenarios.py b/selfdrive/locationd/test/test_locationd_scenarios.py
index 363472818df322..166d715c347475 100644
--- a/selfdrive/locationd/test/test_locationd_scenarios.py
+++ b/selfdrive/locationd/test/test_locationd_scenarios.py
@@ -73,6 +73,7 @@ def run_scenarios(scenario, logs):
   return get_select_fields_data(logs), get_select_fields_data(replayed_logs)
 
 
+@pytest.mark.xdist_group("test_locationd_scenarios")
 @pytest.mark.shared_download_cache
 class TestLocationdScenarios:
   """
diff --git a/tools/lib/url_file.py b/tools/lib/url_file.py
index fe8bd3ea84adc2..2d3d14ce8a456a 100644
--- a/tools/lib/url_file.py
+++ b/tools/lib/url_file.py
@@ -82,7 +82,7 @@ def get_length(self) -> int:
 
     self._length = self.get_length_online()
     if not self._force_download and self._length != -1:
-      with atomic_write_in_dir(file_length_path, mode="w", overwrite=True) as file_length:
+      with atomic_write_in_dir(file_length_path, mode="w") as file_length:
         file_length.write(str(self._length))
     return self._length
 
@@ -105,7 +105,7 @@ def read(self, ll: int|None=None) -> bytes:
       #  If we don't have a file, download it
       if not os.path.exists(full_path):
         data = self.read_aux(ll=CHUNK_SIZE)
-        with atomic_write_in_dir(full_path, mode="wb", overwrite=True) as new_cached_file:
+        with atomic_write_in_dir(full_path, mode="wb") as new_cached_file:
           new_cached_file.write(data)
       else:
         with open(full_path, "rb") as cached_file: