diff --git a/config/database.yml.dist b/config/database.yml.dist
index 70dc993dc..4f3ef68f3 100644
--- a/config/database.yml.dist
+++ b/config/database.yml.dist
@@ -17,17 +17,3 @@ development:
   username: some_user
   password: some_pass
   host: 127.0.0.1
-
-# 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: mysql2
-  database: zammad_test
-  pool: 50
-  timeout: 5000
-  encoding: utf8
-  username: some_user
-  password: some_pass
-  host: 127.0.0.1
-
diff --git a/config/database.yml.test-mysql b/config/database.yml.test-mysql
new file mode 100644
index 000000000..f6b525b4c
--- /dev/null
+++ b/config/database.yml.test-mysql
@@ -0,0 +1,11 @@
+# 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: mysql2
+  database: zammad_test
+  pool: 50
+  timeout: 5000
+  encoding: utf8
+  username: some_user
+  password: some_pass
diff --git a/config/database.yml.test-postgresql b/config/database.yml.test-postgresql
new file mode 100644
index 000000000..bda094235
--- /dev/null
+++ b/config/database.yml.test-postgresql
@@ -0,0 +1,11 @@
+# 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: zammad_test
+  pool: 50
+  timeout: 5000
+  encoding: utf8
+  username: postgres
+  password: