diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
index 90ad204f..b171d8f1 100644
--- a/.github/workflows/test_and_deploy.yml
+++ b/.github/workflows/test_and_deploy.yml
@@ -148,7 +148,7 @@ jobs:
           # See https://docs.github.com/en/actions/reference/runners/github-hosted-runners#standard-github-hosted-runners-for-public-repositories
           MIX_OS_DEPS_COMPILE_PARTITION_COUNT: 2
       - name: 🧪 Run tests
-        run: mix test
+        run: mix test --max-cases 8
         env:
           CLOAK_ENCRYPTION_KEY: f5ol1dJROsm9yi/tvtHiblN8aLH1FUN/obEvUcASx3U=
 
diff --git a/config/test.exs b/config/test.exs
index 60b2a88c..77ba0b02 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -11,7 +11,7 @@ config :music_library, MusicLibrary.Repo,
   # Double the amount of concurrent tests
   pool_size: 32,
   pool: Ecto.Adapters.SQL.Sandbox,
-  busy_timeout: 10_000
+  busy_timeout: 20_000
 
 config :music_library, MusicLibrary.BackgroundRepo,
   database: