diff --git a/config/test.exs b/config/test.exs
index 9d752bdf8..80b01932c 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -49,7 +49,7 @@ config :pleroma, Pleroma.Repo,
   hostname: System.get_env("DB_HOST") || "localhost",
   port: System.get_env("DB_PORT") || "5432",
   pool: Ecto.Adapters.SQL.Sandbox,
-  pool_size: 50
+  pool_size: System.schedulers_online() * 2
 
 config :pleroma, :dangerzone, override_repo_pool_size: true
 
diff --git a/test/test_helper.exs b/test/test_helper.exs
index e65f7c1d1..4de50483c 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -4,6 +4,8 @@
 
 Code.put_compiler_option(:warnings_as_errors, true)
 
+ExUnit.configure(max_cases: System.schedulers_online() * 2)
+
 ExUnit.start(exclude: [:federated, :erratic])
 
 if match?({:unix, :darwin}, :os.type()) do