diff --git a/tubesync/sync/tests/test_frontend.py b/tubesync/sync/tests/test_frontend.py
index 21331799..1e88293a 100644
--- a/tubesync/sync/tests/test_frontend.py
+++ b/tubesync/sync/tests/test_frontend.py
@@ -7,6 +7,7 @@ from django.utils import timezone
 from django_huey import DJANGO_HUEY, get_queue
 from common.models import TaskHistory
 from sync.models import Source, Media
+from .fixtures import all_test_metadata
 from sync.tasks import (
     check_source_directory_exists,
     get_media_download_task, get_media_thumbnail_task,
@@ -346,7 +347,6 @@ class FrontEndTestCase(TestCase):
             fallback=Val(Fallback.FAIL)
         )
         # Add some media
-        from .fixtures import all_test_metadata
         test_minimal_metadata = all_test_metadata['minimal']
         before_dt = timezone.now()
         past_date = timezone.make_aware(datetime(year=2000, month=1, day=1))
diff --git a/tubesync/sync/tests/test_media.py b/tubesync/sync/tests/test_media.py
index 68f0ca08..24e7a1d4 100644
--- a/tubesync/sync/tests/test_media.py
+++ b/tubesync/sync/tests/test_media.py
@@ -1,5 +1,4 @@
 import logging
-import shutil
 from datetime import datetime
 from xml.etree import ElementTree
 from django.conf import settings
@@ -50,7 +49,6 @@ class MediaTestCase(TestCase):
                                       minute=1, second=1)
 
     def test_nfo(self):
-        from .fixtures import all_test_metadata
         expected_tree = ElementTree.fromstring(all_test_metadata['expected_nfo'])
         nfo_tree = ElementTree.fromstring(self.media.nfoxml)
         # Check each node with attribs in expected_tree is present in test_nfo
@@ -237,7 +235,7 @@ class MediaFilterTestCase(TestCase):
     def test_download_finished_clears_stale_video_fields_for_audio(self):
         filepath = self.media.filepath.parent / 'downloaded-audio.ogg'
         filepath.parent.mkdir(parents=True, exist_ok=True)
-        self.addCleanup(lambda: shutil.rmtree(self.media.source.directory_path, ignore_errors=True))
+        self.addCleanup(lambda: filepath.unlink(missing_ok=True))
         filepath.write_bytes(b'test-audio')
 
         self.media.downloaded_format = '1080p'