diff --git a/.gitignore b/.gitignore
index b091d8846..b61a4a34a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,8 +19,8 @@ dump.rdb
 /cache
 /coverage/*
 
-/config/database.yml
-/config/redis.yml
+config/database.yml
+config/redis.yml
 
 # Ignore the default SQLite database and db dumps
 /db/*.sqlite3
diff --git a/config/database.yml b/config/database.yml
deleted file mode 100644
index 1fd6a466e..000000000
--- a/config/database.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-development:
-  adapter: postgresql
-  database: discourse_development
-  host: localhost
-  pool: 5
-  timeout: 5000
-  host_names:
-    - "localhost"
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: postgresql
-  database: discourse_test
-  host: localhost
-  pool: 5
-  timeout: 5000
-  host_names:
-    - test.localhost
-
-# using the test db, so jenkins can run this config
-# we need it to be in production so it minifies assets
-production:
-  adapter: postgresql
-  database: discourse_development
-  pool: 5
-  timeout: 5000
-  host_names:
-    - production.localhost
diff --git a/config/redis.yml b/config/redis.yml
deleted file mode 100644
index 68d138b5f..000000000
--- a/config/redis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-defaults: &defaults
-  host: localhost
-  port: 6379
-  db: 0
-  cache_db: 2
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults 
-  db: 1
-
-staging:
-  <<: *defaults
-
-production:
-  <<: *defaults