diff --git a/.drone.yml b/.drone.yml
index 1dbc9fd..3a81264 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -40,7 +40,7 @@ steps:
       # Wait for postgres to become available
       - |
         for i in {1..20}; do
-          if pg_isready -h postgres -U postgres; then
+          if pg_isready -h postgres -U postgres -p 5000; then
             exit 0
           else
             true
@@ -55,6 +55,7 @@ steps:
     environment:
       MIX_ENV: test
       TEST_POSTGRES_HOST: postgres
+      TEST_POSTGRES_PORT: 5000
     commands:
       # Install hex package manager
       - mix local.hex --force
diff --git a/config/test.exs b/config/test.exs
index 68beeb0..9d6784e 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -9,7 +9,7 @@ config :mv, Mv.Repo,
   username: "postgres",
   password: "postgres",
   hostname: System.get_env("TEST_POSTGRES_HOST", "localhost"),
-  port: 5000,
+  port: System.get_env("TEST_POSTGRES_PORT", 5000),
   database: "mv_test#{System.get_env("MIX_TEST_PARTITION")}",
   pool: Ecto.Adapters.SQL.Sandbox,
   pool_size: System.schedulers_online() * 2