[from now] 2013/03/30 22:11:27

diff --git a/.travis.yml b/.travis.yml
index 8a213d1..e43643c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ jdk:
 before_script:
   - mysql -e 'create database bookshelf;'
 script:
-  - mv conf/application.conf conf/application.conf.bak
+  - mv conf/application.conf conf/ci.application.conf
   - mv conf/ci.conf conf/application.conf
   - sbt -DapplyEvolutions.default=true test
 before_install:
diff --git a/conf/ci.conf b/conf/ci.conf
index fb4d441..9408b6c 100644
--- a/conf/ci.conf
+++ b/conf/ci.conf
@@ -1,4 +1,4 @@
-include "application.conf.bak"
+include "ci.application.conf"

 db.default.url="jdbc:mysql://127.0.0.1:3306/bookshelf?useUnicode=yes&characterEncoding=UTF-8"
 db.default.user=root