diff --git a/test/pinchflat/boot/pre_job_startup_tasks_test.exs b/test/pinchflat/boot/pre_job_startup_tasks_test.exs
index 2aca8cf..99818a1 100644
--- a/test/pinchflat/boot/pre_job_startup_tasks_test.exs
+++ b/test/pinchflat/boot/pre_job_startup_tasks_test.exs
@@ -1,7 +1,6 @@
 defmodule Pinchflat.Boot.PreJobStartupTasksTest do
   use Pinchflat.DataCase
 
-  import Mox
   import Pinchflat.JobFixtures
 
   alias Pinchflat.Settings
diff --git a/test/pinchflat/downloading/downloading_helpers_test.exs b/test/pinchflat/downloading/downloading_helpers_test.exs
index 1c3c95b..5148e50 100644
--- a/test/pinchflat/downloading/downloading_helpers_test.exs
+++ b/test/pinchflat/downloading/downloading_helpers_test.exs
@@ -1,7 +1,6 @@
 defmodule Pinchflat.Downloading.DownloadingHelpersTest do
   use Pinchflat.DataCase
 
-  import Mox
   import Pinchflat.MediaFixtures
   import Pinchflat.SourcesFixtures
   import Pinchflat.ProfilesFixtures
@@ -10,8 +9,6 @@ defmodule Pinchflat.Downloading.DownloadingHelpersTest do
   alias Pinchflat.Downloading.DownloadingHelpers
   alias Pinchflat.Downloading.MediaDownloadWorker
 
-  setup :verify_on_exit!
-
   describe "enqueue_pending_download_tasks/1" do
     test "it enqueues a job for each pending media item" do
       source = source_fixture()
diff --git a/test/pinchflat/downloading/media_download_worker_test.exs b/test/pinchflat/downloading/media_download_worker_test.exs
index f937bce..ea055ce 100644
--- a/test/pinchflat/downloading/media_download_worker_test.exs
+++ b/test/pinchflat/downloading/media_download_worker_test.exs
@@ -1,7 +1,6 @@
 defmodule Pinchflat.Downloading.MediaDownloadWorkerTest do
   use Pinchflat.DataCase
 
-  import Mox
   import Pinchflat.MediaFixtures
 
   alias Pinchflat.Media
@@ -9,8 +8,6 @@ defmodule Pinchflat.Downloading.MediaDownloadWorkerTest do
   alias Pinchflat.Utils.FilesystemUtils
   alias Pinchflat.Downloading.MediaDownloadWorker
 
-  setup :verify_on_exit!
-
   setup do
     stub(UserScriptRunnerMock, :run, fn _event_type, _data -> :ok end)
     stub(HTTPClientMock, :get, fn _url, _headers, _opts -> {:ok, ""} end)
diff --git a/test/pinchflat/downloading/media_downloader_test.exs b/test/pinchflat/downloading/media_downloader_test.exs
index 2af69bb..387a335 100644
--- a/test/pinchflat/downloading/media_downloader_test.exs
+++ b/test/pinchflat/downloading/media_downloader_test.exs
@@ -1,14 +1,12 @@
 defmodule Pinchflat.Downloading.MediaDownloaderTest do
   use Pinchflat.DataCase
-  import Mox
+
   import Pinchflat.MediaFixtures
   import Pinchflat.SourcesFixtures
   import Pinchflat.ProfilesFixtures
 
   alias Pinchflat.Downloading.MediaDownloader
 
-  setup :verify_on_exit!
-
   setup do
     media_item =
       Repo.preload(
diff --git a/test/pinchflat/downloading/media_retention_worker_test.exs b/test/pinchflat/downloading/media_retention_worker_test.exs
index 3ae1eaa..85ffdd9 100644
--- a/test/pinchflat/downloading/media_retention_worker_test.exs
+++ b/test/pinchflat/downloading/media_retention_worker_test.exs
@@ -1,15 +1,12 @@
 defmodule Pinchflat.Downloading.MediaRetentionWorkerTest do
   use Pinchflat.DataCase
 
-  import Mox
   import Pinchflat.MediaFixtures
   import Pinchflat.SourcesFixtures
 
   alias Pinchflat.Media
   alias Pinchflat.Downloading.MediaRetentionWorker
 
-  setup :verify_on_exit!
-
   describe "perform/1" do
     setup do
       stub(UserScriptRunnerMock, :run, fn _event_type, _data -> :ok end)
diff --git a/test/pinchflat/fast_indexing/fast_indexing_helpers_test.exs b/test/pinchflat/fast_indexing/fast_indexing_helpers_test.exs
index de51abb..94d12aa 100644
--- a/test/pinchflat/fast_indexing/fast_indexing_helpers_test.exs
+++ b/test/pinchflat/fast_indexing/fast_indexing_helpers_test.exs
@@ -1,7 +1,6 @@
 defmodule Pinchflat.FastIndexing.FastIndexingHelpersTest do
   use Pinchflat.DataCase
 
-  import Mox
   import Pinchflat.MediaFixtures
   import Pinchflat.SourcesFixtures
   import Pinchflat.ProfilesFixtures
@@ -11,8 +10,6 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpersTest do
   alias Pinchflat.Downloading.MediaDownloadWorker
   alias Pinchflat.FastIndexing.FastIndexingHelpers
 
-  setup :verify_on_exit!
-
   describe "kickoff_download_tasks_from_youtube_rss_feed/1" do
     setup do
       stub(YtDlpRunnerMock, :run, fn _url, _opts, _ot ->
diff --git a/test/pinchflat/fast_indexing/fast_indexing_worker_test.exs b/test/pinchflat/fast_indexing/fast_indexing_worker_test.exs
index d2772d7..40e3805 100644
--- a/test/pinchflat/fast_indexing/fast_indexing_worker_test.exs
+++ b/test/pinchflat/fast_indexing/fast_indexing_worker_test.exs
@@ -1,15 +1,12 @@
 defmodule Pinchflat.FastIndexing.FastIndexingWorkerTest do
   use Pinchflat.DataCase
 
-  import Mox
   import Pinchflat.SourcesFixtures
 
   alias Pinchflat.Settings
   alias Pinchflat.Sources.Source
   alias Pinchflat.FastIndexing.FastIndexingWorker
 
-  setup :verify_on_exit!
-
   describe "kickoff_with_task/2" do
     test "starts the worker" do
       source = source_fixture(fast_index: true)
diff --git a/test/pinchflat/fast_indexing/youtube_rss_test.exs b/test/pinchflat/fast_indexing/youtube_rss_test.exs
index 811b0ab..a769498 100644
--- a/test/pinchflat/fast_indexing/youtube_rss_test.exs
+++ b/test/pinchflat/fast_indexing/youtube_rss_test.exs
@@ -1,12 +1,10 @@
 defmodule Pinchflat.FastIndexing.YoutubeRssTest do
   use Pinchflat.DataCase
-  import Mox
+
   import Pinchflat.SourcesFixtures
 
   alias Pinchflat.FastIndexing.YoutubeRss
 
-  setup :verify_on_exit!
-
   setup do
     source = source_fixture()
 
diff --git a/test/pinchflat/lifecycle/notifications/source_notifications_test.exs b/test/pinchflat/lifecycle/notifications/source_notifications_test.exs
index 42bbd7f..8a46fa6 100644
--- a/test/pinchflat/lifecycle/notifications/source_notifications_test.exs
+++ b/test/pinchflat/lifecycle/notifications/source_notifications_test.exs
@@ -1,7 +1,6 @@
 defmodule Pinchflat.Lifecycle.Notifications.SourceNotificationsTest do
   use Pinchflat.DataCase
 
-  import Mox
   import Pinchflat.MediaFixtures
   import Pinchflat.SourcesFixtures
 
@@ -9,8 +8,6 @@ defmodule Pinchflat.Lifecycle.Notifications.SourceNotificationsTest do
 
   @apprise_servers ["server_1", "server_2"]
 
-  setup :verify_on_exit!
-
   describe "wrap_new_media_notification/3" do
     test "sends a notification when the pending count changes" do
       source = source_fixture()
diff --git a/test/pinchflat/media_test.exs b/test/pinchflat/media_test.exs
index a6468e0..412b9e3 100644
--- a/test/pinchflat/media_test.exs
+++ b/test/pinchflat/media_test.exs
@@ -1,7 +1,6 @@
 defmodule Pinchflat.MediaTest do
   use Pinchflat.DataCase
 
-  import Mox
   import Pinchflat.TasksFixtures
   import Pinchflat.MediaFixtures
   import Pinchflat.ProfilesFixtures
@@ -13,8 +12,6 @@ defmodule Pinchflat.MediaTest do
 
   alias Pinchflat.YtDlp.Media, as: YtDlpMedia
 
-  setup :verify_on_exit!
-
   @invalid_attrs %{title: nil, media_id: nil, media_filepath: nil}
 
   describe "schema" do
diff --git a/test/pinchflat/metadata/metadata_file_helpers_test.exs b/test/pinchflat/metadata/metadata_file_helpers_test.exs
index 75428a9..530c3fa 100644
--- a/test/pinchflat/metadata/metadata_file_helpers_test.exs
+++ b/test/pinchflat/metadata/metadata_file_helpers_test.exs
@@ -1,6 +1,6 @@
 defmodule Pinchflat.Metadata.MetadataFileHelpersTest do
   use Pinchflat.DataCase
-  import Mox
+
   import Pinchflat.MediaFixtures
 
   alias Pinchflat.Metadata.MetadataFileHelpers, as: Helpers
@@ -11,8 +11,6 @@ defmodule Pinchflat.Metadata.MetadataFileHelpersTest do
     {:ok, %{media_item: media_item}}
   end
 
-  setup :verify_on_exit!
-
   describe "compress_and_store_metadata_for/2" do
     test "returns the filepath", %{media_item: media_item} do
       metadata_map = %{"foo" => "bar"}
diff --git a/test/pinchflat/metadata/source_metadata_storage_worker_test.exs b/test/pinchflat/metadata/source_metadata_storage_worker_test.exs
index 06e6959..503d0f3 100644
--- a/test/pinchflat/metadata/source_metadata_storage_worker_test.exs
+++ b/test/pinchflat/metadata/source_metadata_storage_worker_test.exs
@@ -1,6 +1,6 @@
 defmodule Pinchflat.Metadata.SourceMetadataStorageWorkerTest do
   use Pinchflat.DataCase
-  import Mox
+
   import Pinchflat.SourcesFixtures
   import Pinchflat.ProfilesFixtures
 
@@ -11,8 +11,6 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorkerTest do
   @source_details_ot "%(.{channel,channel_id,playlist_id,playlist_title,filename})j"
   @metadata_ot "playlist:%()j"
 
-  setup :verify_on_exit!
-
   describe "kickoff_with_task/1" do
     test "enqueues a new worker for the source" do
       source = source_fixture()
diff --git a/test/pinchflat/profiles_test.exs b/test/pinchflat/profiles_test.exs
index e81ad58..4cf6437 100644
--- a/test/pinchflat/profiles_test.exs
+++ b/test/pinchflat/profiles_test.exs
@@ -1,7 +1,6 @@
 defmodule Pinchflat.ProfilesTest do
   use Pinchflat.DataCase
 
-  import Mox
   import Pinchflat.MediaFixtures
   import Pinchflat.SourcesFixtures
   import Pinchflat.ProfilesFixtures
@@ -11,8 +10,6 @@ defmodule Pinchflat.ProfilesTest do
 
   @invalid_attrs %{name: nil, output_path_template: nil}
 
-  setup :verify_on_exit!
-
   describe "schema" do
     test "can be JSON encoded without error" do
       profile = media_profile_fixture()
diff --git a/test/pinchflat/slow_indexing/media_collection_indexing_worker_test.exs b/test/pinchflat/slow_indexing/media_collection_indexing_worker_test.exs
index 0830435..321c8c9 100644
--- a/test/pinchflat/slow_indexing/media_collection_indexing_worker_test.exs
+++ b/test/pinchflat/slow_indexing/media_collection_indexing_worker_test.exs
@@ -1,7 +1,6 @@
 defmodule Pinchflat.SlowIndexing.MediaCollectionIndexingWorkerTest do
   use Pinchflat.DataCase
 
-  import Mox
   import Pinchflat.TasksFixtures
   import Pinchflat.MediaFixtures
   import Pinchflat.SourcesFixtures
@@ -13,8 +12,6 @@ defmodule Pinchflat.SlowIndexing.MediaCollectionIndexingWorkerTest do
   alias Pinchflat.Downloading.MediaDownloadWorker
   alias Pinchflat.SlowIndexing.MediaCollectionIndexingWorker
 
-  setup :verify_on_exit!
-
   describe "kickoff_with_task/3" do
     setup do
       source = source_fixture(index_frequency_minutes: 10)
diff --git a/test/pinchflat/slow_indexing/slow_indexing_helpers_test.exs b/test/pinchflat/slow_indexing/slow_indexing_helpers_test.exs
index 4bc72ee..bdd721f 100644
--- a/test/pinchflat/slow_indexing/slow_indexing_helpers_test.exs
+++ b/test/pinchflat/slow_indexing/slow_indexing_helpers_test.exs
@@ -1,7 +1,6 @@
 defmodule Pinchflat.SlowIndexing.SlowIndexingHelpersTest do
   use Pinchflat.DataCase
 
-  import Mox
   import Pinchflat.TasksFixtures
   import Pinchflat.MediaFixtures
   import Pinchflat.SourcesFixtures
@@ -15,8 +14,6 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpersTest do
   alias Pinchflat.SlowIndexing.SlowIndexingHelpers
   alias Pinchflat.SlowIndexing.MediaCollectionIndexingWorker
 
-  setup :verify_on_exit!
-
   describe "kickoff_indexing_task/3" do
     test "it schedules a job" do
       source = source_fixture(index_frequency_minutes: 1)
diff --git a/test/pinchflat/sources_test.exs b/test/pinchflat/sources_test.exs
index 4703450..a63c049 100644
--- a/test/pinchflat/sources_test.exs
+++ b/test/pinchflat/sources_test.exs
@@ -1,6 +1,6 @@
 defmodule Pinchflat.SourcesTest do
   use Pinchflat.DataCase
-  import Mox
+
   import Pinchflat.TasksFixtures
   import Pinchflat.MediaFixtures
   import Pinchflat.ProfilesFixtures
@@ -18,8 +18,6 @@ defmodule Pinchflat.SourcesTest do
 
   @invalid_source_attrs %{name: nil, collection_id: nil}
 
-  setup :verify_on_exit!
-
   describe "schema" do
     test "source_metadata is deleted when the source is deleted" do
       source =
diff --git a/test/pinchflat/yt_dlp/media_collection_test.exs b/test/pinchflat/yt_dlp/media_collection_test.exs
index bc4974e..03e5679 100644
--- a/test/pinchflat/yt_dlp/media_collection_test.exs
+++ b/test/pinchflat/yt_dlp/media_collection_test.exs
@@ -1,6 +1,6 @@
 defmodule Pinchflat.YtDlp.MediaCollectionTest do
   use Pinchflat.DataCase
-  import Mox
+
   import Pinchflat.SourcesFixtures
 
   alias Pinchflat.YtDlp.Media
@@ -8,8 +8,6 @@ defmodule Pinchflat.YtDlp.MediaCollectionTest do
 
   @channel_url "https://www.youtube.com/c/PinchflatTestChannel"
 
-  setup :verify_on_exit!
-
   describe "get_media_attributes_for_collection/2" do
     test "returns a list of video attributes with no blank elements" do
       expect(YtDlpRunnerMock, :run, fn _url, _opts, _ot, _addl_opts ->
diff --git a/test/pinchflat/yt_dlp/media_test.exs b/test/pinchflat/yt_dlp/media_test.exs
index 8aa24c4..1c4c999 100644
--- a/test/pinchflat/yt_dlp/media_test.exs
+++ b/test/pinchflat/yt_dlp/media_test.exs
@@ -1,14 +1,12 @@
 defmodule Pinchflat.YtDlp.MediaTest do
   use Pinchflat.DataCase
-  import Mox
+
   import Pinchflat.MediaFixtures
 
   alias Pinchflat.YtDlp.Media
 
   @media_url "https://www.youtube.com/watch?v=TiZPUDkDYbk"
 
-  setup :verify_on_exit!
-
   describe "download/2" do
     test "it calls the backend runner with the expected arguments" do
       expect(YtDlpRunnerMock, :run, fn @media_url, opts, ot, addl ->
diff --git a/test/pinchflat_web/controllers/media_item_controller_test.exs b/test/pinchflat_web/controllers/media_item_controller_test.exs
index bd22f59..0bc9b88 100644
--- a/test/pinchflat_web/controllers/media_item_controller_test.exs
+++ b/test/pinchflat_web/controllers/media_item_controller_test.exs
@@ -1,14 +1,11 @@
 defmodule PinchflatWeb.MediaItemControllerTest do
   use PinchflatWeb.ConnCase
 
-  import Mox
   import Pinchflat.MediaFixtures
 
   alias Pinchflat.Repo
   alias Pinchflat.Downloading.MediaDownloadWorker
 
-  setup :verify_on_exit!
-
   describe "show media" do
     setup [:create_media_item]
 
diff --git a/test/pinchflat_web/controllers/media_profile_controller_test.exs b/test/pinchflat_web/controllers/media_profile_controller_test.exs
index 40879f3..af174ca 100644
--- a/test/pinchflat_web/controllers/media_profile_controller_test.exs
+++ b/test/pinchflat_web/controllers/media_profile_controller_test.exs
@@ -1,7 +1,6 @@
 defmodule PinchflatWeb.MediaProfileControllerTest do
   use PinchflatWeb.ConnCase
 
-  import Mox
   import Pinchflat.MediaFixtures
   import Pinchflat.SourcesFixtures
   import Pinchflat.ProfilesFixtures
@@ -16,8 +15,6 @@ defmodule PinchflatWeb.MediaProfileControllerTest do
   }
   @invalid_attrs %{name: nil, output_path_template: nil}
 
-  setup :verify_on_exit!
-
   setup do
     Settings.set(onboarding: false)
 
diff --git a/test/pinchflat_web/controllers/settings/apprise_server_live_test.exs b/test/pinchflat_web/controllers/settings/apprise_server_live_test.exs
index e09265f..1fba6ce 100644
--- a/test/pinchflat_web/controllers/settings/apprise_server_live_test.exs
+++ b/test/pinchflat_web/controllers/settings/apprise_server_live_test.exs
@@ -1,13 +1,10 @@
 defmodule PinchflatWeb.Settings.AppriseServerLiveTest do
   use PinchflatWeb.ConnCase
 
-  import Mox
   import Phoenix.LiveViewTest
 
   alias Pinchflat.Settings.AppriseServerLive
 
-  setup :verify_on_exit!
-
   describe "initial rendering" do
     test "renders the input", %{conn: conn} do
       {:ok, _view, html} = live_isolated(conn, AppriseServerLive, session: create_session(""))
diff --git a/test/pinchflat_web/controllers/source_controller_test.exs b/test/pinchflat_web/controllers/source_controller_test.exs
index 02ec838..88cc772 100644
--- a/test/pinchflat_web/controllers/source_controller_test.exs
+++ b/test/pinchflat_web/controllers/source_controller_test.exs
@@ -1,6 +1,5 @@
 defmodule PinchflatWeb.SourceControllerTest do
   use PinchflatWeb.ConnCase
-  import Mox
 
   import Pinchflat.MediaFixtures
   import Pinchflat.SourcesFixtures
@@ -32,8 +31,6 @@ defmodule PinchflatWeb.SourceControllerTest do
     }
   end
 
-  setup :verify_on_exit!
-
   describe "index" do
     test "lists all sources", %{conn: conn} do
       conn = get(conn, ~p"/sources")
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index ebf9814..ff58fc7 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -17,6 +17,8 @@ defmodule PinchflatWeb.ConnCase do
 
   use ExUnit.CaseTemplate
 
+  alias Pinchflat.TestingHelperMethods
+
   using do
     quote do
       # The default endpoint for testing
@@ -27,14 +29,19 @@ defmodule PinchflatWeb.ConnCase do
       use Oban.Testing, repo: Repo
 
       # Import conveniences for testing with connections
+
+      import Mox
       import Plug.Conn
       import Phoenix.ConnTest
       import PinchflatWeb.ConnCase
       import Pinchflat.TestingHelperMethods
+
+      setup :verify_on_exit!
     end
   end
 
   setup tags do
+    TestingHelperMethods.create_platform_directories()
     Pinchflat.DataCase.setup_sandbox(tags)
 
     conn = Phoenix.ConnTest.build_conn()
diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index 5cb802b..baf72b3 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -23,17 +23,20 @@ defmodule Pinchflat.DataCase do
 
       use Oban.Testing, repo: Repo
 
+      import Mox
       import Ecto
       import Ecto.Changeset
       import Ecto.Query
       import Pinchflat.DataCase
       import Pinchflat.TestingHelperMethods
+
+      setup :verify_on_exit!
     end
   end
 
   setup tags do
-    Pinchflat.DataCase.setup_sandbox(tags)
     TestingHelperMethods.create_platform_directories()
+    Pinchflat.DataCase.setup_sandbox(tags)
 
     :ok
   end