diff --git a/Makefile b/Makefile
index 7f2d40aba..c8b79d041 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ stop:
 	@bash docker/message.sh "Mobilizon is stopped"
 test: stop
 	@bash docker/message.sh "Running tests"
+	docker-compose -f docker-compose.yml -f docker-compose.test.yml run api mix prepare_test
 	docker-compose -f docker-compose.yml -f docker-compose.test.yml run api mix test $(only)
 	@bash docker/message.sh "Done running tests"
 format: 
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index d597638a3..b65956505 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -11,7 +11,7 @@ services:
       MIX_ENV: "test"
       MOBILIZON_DATABASE_DBNAME: mobilizon_test
       MOBILIZON_INSTANCE_HOST: mobilizon.test
-    command: "mix test"
+    command: "mix prepare_test && mix test"
 volumes:
   pgdata:
   .:
diff --git a/mix.exs b/mix.exs
index cf3ddeeb2..72aade5e7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -258,10 +258,12 @@ defmodule Mobilizon.Mixfile do
         "ecto.drop",
         "ecto.setup"
       ],
-      test: [
+      prepare_test: [
         "ecto.create",
         "ecto.migrate",
-        "tz_world.update",
+        "tz_world.update"
+      ],
+      test: [
         &run_test/1
       ],
       "phx.deps_migrate_serve": [