diff --git a/.travis.yml b/.travis.yml
index c78cc7b..e4053a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ before_script:
   - postgres --version
   - redis-server --version
   - npm run lint
+  - psql -c "CREATE USER nolan CREATE_DB;"
 script: npm run test-browser
 env:
   global:
diff --git a/bin/run-mastodon.js b/bin/run-mastodon.js
index 2e0ad1f..53e10d7 100644
--- a/bin/run-mastodon.js
+++ b/bin/run-mastodon.js
@@ -20,6 +20,8 @@ const envFile = `
 PAPERCLIP_SECRET=foo
 SECRET_KEY_BASE=bar
 OTP_SECRET=foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar
+DB_PORT=${process.env.PG_PORT || 5432}
+DB_USER=nolan
 `
 
 const mastodonDir = path.join(dir, '../mastodon')