diff --git a/.env.sample b/.env.sample
index 8e4662aeffec..c3a6e365cbcd 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,7 +1,7 @@
 # The database to use when testing against Postgres.
-PG_DATABASE_URL=postgresql://postgres@localhost:5432/diesel_test
+PG_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/diesel_test
 # The database to use when running the Postgres examples during testing.
-PG_EXAMPLE_DATABASE_URL=postgresql://postgres@localhost:5432/diesel_example
+PG_EXAMPLE_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/diesel_example
 
 # The database to use when testing against MySQL.
 MYSQL_DATABASE_URL=mysql://root@127.0.0.1:3306/diesel_test
diff --git a/.travis.yml b/.travis.yml
index 030239d45789..c3ecfc043dad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,7 +67,7 @@ matrix:
     script:
     - (cd diesel_cli && cargo test --no-default-features --features "sqlite-bundled")
   - rust: 1.37.0
-     name: "Minimal supported rust version == 1.37.0"
+    name: "Minimal supported rust version == 1.37.0"
     script:
     - cargo check --all
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2709ae927b69..c0d35c2e8f3b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -93,7 +93,7 @@ Thank you! We'll try to respond as quickly as possible.
      ! echo 'CREATE DATABASE diesel_test; CREATE DATABASE diesel_unit_test;' | docker exec -i diesel.mysql mysql
    do sleep 1; done
 
-   docker run -d --name diesel.postgres -p 5432:5432 postgres
+   docker run -d --name diesel.postgres -p 5432:5432 -e POSTGRES_PASSWORD=postgres postgres
    while
      sleep 1;
      ! echo 'CREATE DATABASE diesel_test;' | docker exec -i diesel.postgres psql -U postgres
diff --git a/docker-compose.yml b/docker-compose.yml
index 80bd7b1a6457..81427481fa3f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,8 @@ services:
   postgres:
     image: postgres
     container_name: diesel.postgres
+    environment:
+      POSTGRES_PASSWORD: "postgres"
     volumes:
       - "postgres-data:/var/lib/postgres/:delegated"
       - "./docker/postgres/init:/docker-entrypoint-initdb.d"