diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 8c7f8b68f..cb0e639e8 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -69,7 +69,7 @@ file 'config/database.yml' do
     test_conf = dev_conf.merge('database' => test_db_name)
   when /postgresql/
     dev_conf =  {'adapter' => 'postgresql', 'database' => dev_db_name,
-                 'host' => 'localhost'}
+                 'host' => (ENV['CI_PG_HOST'] || 'localhost')}
     if ENV['RUN_ON_NOT_OFFICIAL']
       dev_conf['username'] = 'postgres'
     else