diff --git a/.travis.yml b/.travis.yml
index 84491defd..2a17ebebb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,9 @@ language: bash
 
 env:
   global:
-    - DOCKER_COMPOSE_VERSION=1.21.1 
+    - DOCKER_COMPOSE_VERSION=1.21.1
+    - PGHOST
+    - PGPORT
 
 before_install:
   - sudo rm /usr/local/bin/docker-compose
@@ -13,10 +15,10 @@ before_install:
   - sudo mv docker-compose /usr/local/bin
 
 install:
-  - env | egrep 'DANBOORU|RAILS|DATABASE_URL|SECRET' > .env.test
+  - env | egrep 'DEBUG|DANBOORU|RAILS|DATABASE_URL|SECRET' > .env.test
   - docker-compose -f config/docker/compose.yml up -d web
-  - docker-compose -f config/docker/compose.yml exec archives dockerize -wait tcp://db:5432 bash -l -c 'cd /app ; bundle exec rake db:create ; bundle exec rake db:migrate'
-  - docker-compose -f config/docker/compose.yml exec web dockerize -wait tcp://db:5432 bash -l -c 'cd /app ; bin/rake db:create ; bin/rake db:migrate'
+  - docker-compose -f config/docker/compose.yml exec archives dockerize -wait tcp://$PGHOST:$PGPORT bash -l -c 'cd /app ; bundle exec rake db:create ; bundle exec rake db:migrate'
+  - docker-compose -f config/docker/compose.yml exec web dockerize -wait tcp://$PGHOST:$PGPORT bash -l -c 'cd /app ; bin/rake db:create ; bin/rake db:migrate'
 
 script:
   - docker-compose -f config/docker/compose.yml exec web bin/rake test
diff --git a/config/docker/compose.yml b/config/docker/compose.yml
index 6759a0e30..3a50c601d 100644
--- a/config/docker/compose.yml
+++ b/config/docker/compose.yml
@@ -5,7 +5,7 @@ services:
     ports:
       - "5432:5432"
     environment:
-      - POSTGRES_PASSWORD=73e1ac2e91eb52a9981d09fca561aac3
+      - POSTGRES_PASSWORD
   memcached:
     image: memcached:alpine
     ports:
@@ -15,9 +15,9 @@ services:
     image: r888888888/archives
     command: sleep 1d
     environment:
-      - POSTGRES_HOST=db
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=73e1ac2e91eb52a9981d09fca561aac3
+      - POSTGRES_HOST
+      - POSTGRES_USER
+      - POSTGRES_PASSWORD
       - RAILS_ENV
       - AMAZON_KEY
       - AMAZON_SQS_REGION
@@ -28,11 +28,12 @@ services:
       - db
   web:
     environment:
-      - SECRET_TOKEN=73e1ac2e91eb52a9981d09fca561aac3
-      - SESSION_SECRET_KEY=73e1ac2e91eb52a9981d09fca561aac3
+      - SECRET_TOKEN
+      - SESSION_SECRET_KEY
       - RAILS_ENV
       - DATABASE_URL
       - RO_DATABASE_URL
+      - DEBUG
       - ARCHIVE_DATABASE_URL
       - DANBOORU_MEMCACHED_SERVERS
       - DANBOORU_AWS_SQS_ARCHIVE_URL