diff --git a/config/config.exs b/config/config.exs
index cf20e45d..48c1663a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -7,3 +7,4 @@ config :coherence, Coherence.Mailer,
   api_key: ""
 
 import_config "#{Mix.env()}.exs"
+import_config "#{Mix.env}.*.exs"
diff --git a/config/test.exs b/config/test.exs
index ffafa43b..6470a2ee 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -17,6 +17,7 @@ config :coherence, TestCoherence.Repo,
   password: System.get_env("DB_PASSWORD") || "postgres",
   database: "coherence_test",
   hostname: System.get_env("DB_HOSTNAME") || "localhost",
+  port: System.get_env("DB_PORT") || 5432,
   pool: Ecto.Adapters.SQL.Sandbox
 
 config :coherence,
diff --git a/config/test.secret.exs b/config/test.secret.exs
new file mode 100644
index 00000000..98688965
--- /dev/null
+++ b/config/test.secret.exs
@@ -0,0 +1,4 @@
+use Mix.Config
+
+config :coherence, TestCoherence.Repo,
+  port: 5200
diff --git a/mix.exs b/mix.exs
index 9c1175ab..aa75c15a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -49,7 +49,7 @@ defmodule Coherence.Mixfile do
     [
       {:ecto, "~> 2.0"},
       {:comeonin, "~> 4.0"},
-      {:bcrypt_elixir, "~> 1.1"},
+      {:bcrypt_elixir, "~> 0.12.1"},
       {:phoenix, "~> 1.3"},
       {:phoenix_html, "~> 2.10"},
       {:gettext, "~> 0.14"},
diff --git a/mix.lock b/mix.lock
index 852a963f..ffa65757 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,5 +1,5 @@
 %{
-  "bcrypt_elixir": {:hex, :bcrypt_elixir, "1.1.1", "6b5560e47a02196ce5f0ab3f1d8265db79a23868c137e973b27afef928ed8006", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
+  "bcrypt_elixir": {:hex, :bcrypt_elixir, "0.12.1", "41ff5a4739fcff365fe840637462dc9e22beac07a9dcf3cb5e79b127f5b3a099", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
   "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"},
   "certifi": {:hex, :certifi, "2.3.1", "d0f424232390bf47d82da8478022301c561cf6445b5b5fb6a84d49a9e76d2639", [:rebar3], [{:parse_trans, "3.2.0", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm"},
   "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm"},