diff --git a/.travis.yml b/.travis.yml
index 316927f57..e2afb59a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,8 @@ before_install:
   - mysql -u root -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';"
   - mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'some_user'@'localhost';"
   - export RAILS_ENV=development
-  - cp config/database.yml.dist config/database.yml
+  - export EMAILHELPER_MAILBOX_1='unittestemailhelper01@znuny.com:somepass'
+  - cp config/database.yml.test config/database.yml
 install:
 - bundle install --without postgres
 script:
diff --git a/config/database.yml.test b/config/database.yml.test
new file mode 100644
index 000000000..5d77943fe
--- /dev/null
+++ b/config/database.yml.test
@@ -0,0 +1,13 @@
+# 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
+