diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3bf8bcae8..f4b6fa993 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,10 +10,6 @@ jobs:
   test:
     runs-on: ubuntu-latest
     env:
-      DATABASE_HOST: localhost
-      DATABASE_USER: postgres
-      DATABASE_PASSWORD: password
-      DATABASE_PORT: 5432
       TZ: Asia/Tokyo
       SCRIVITO_EMAIL: test@example.com
       SCRIVITO_PASSWORD: testpassword
diff --git a/config/database.yml b/config/database.yml
index 1320279da..6956ee452 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -20,10 +20,10 @@ default: &default
   # For details on connection pooling, see Rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  username: <%= ENV.fetch('DATABASE_USER') { '' } %>
-  password: <%= ENV.fetch('DATABASE_PASSWORD') { '' } %>
-  host: <%= ENV.fetch('DATABASE_HOST') { '' } %>
-  port: <%= ENV.fetch('DATABASE_PORT') { '' } %>
+  username: <%= ENV.fetch('DATABASE_USER') { 'postgres' } %>
+  password: <%= ENV.fetch('DATABASE_PASSWORD') { 'password' } %>
+  host: <%= ENV.fetch('DATABASE_HOST') { 'localhost' } %>
+  port: <%= ENV.fetch('DATABASE_PORT') { '5432' } %>
 
 development:
   <<: *default